intel/elk: Don't include elk_eu_defines.h in elk_nir.h

Those definitions are not needed by the drivers (client code), so
reduce the exposure.  This will help when using both brw and elk in
Iris later.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>

src/intel/compiler/elk/elk_fs_nir.cpp

@@ -24,6 +24,7 @@
 #include "elk_fs.h"
 #include "elk_fs_builder.h"
 #include "elk_nir.h"
+#include "elk_nir_private.h"
 #include "elk_eu.h"
 #include "nir.h"
 #include "nir_intrinsics.h"

src/intel/compiler/elk/elk_nir.c

@@ -23,6 +23,7 @@
 
 #include "../intel_nir.h"
 #include "elk_nir.h"
+#include "elk_nir_private.h"
 #include "elk_shader.h"
 #include "dev/intel_debug.h"
 #include "compiler/glsl_types.h"

src/intel/compiler/elk/elk_nir.h

@@ -24,7 +24,6 @@
 #ifndef ELK_NIR_H
 #define ELK_NIR_H
 
-#include "elk_reg.h"
 #include "compiler/nir/nir.h"
 #include "elk_compiler.h"
 #include "nir_builder.h"
@@ -252,11 +251,6 @@ void elk_nir_apply_key(nir_shader *nir,
 unsigned elk_nir_api_subgroup_size(const nir_shader *nir,
                                    unsigned hw_subgroup_size);
 
-enum elk_conditional_mod elk_cmod_for_nir_comparison(nir_op op);
-enum elk_lsc_opcode elk_lsc_aop_for_nir_intrinsic(const nir_intrinsic_instr *atomic);
-enum elk_reg_type elk_type_for_nir_type(const struct intel_device_info *devinfo,
-                                        nir_alu_type type);
-
 bool elk_nir_should_vectorize_mem(unsigned align_mul, unsigned align_offset,
                                   unsigned bit_size,
                                   unsigned num_components,

src/intel/compiler/elk/elk_nir_private.h

@@ -0,0 +1,25 @@
+/*
+ * Copyright © 2015 Intel Corporation
+ * SPDX-License-Identifier: MIT
+ */
+
+#ifndef ELK_NIR_PRIVATE_H
+#define ELK_NIR_PRIVATE_H
+
+#include "elk_reg.h"
+#include "nir.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum elk_conditional_mod elk_cmod_for_nir_comparison(nir_op op);
+enum elk_lsc_opcode elk_lsc_aop_for_nir_intrinsic(const nir_intrinsic_instr *atomic);
+enum elk_reg_type elk_type_for_nir_type(const struct intel_device_info *devinfo,
+                                        nir_alu_type type);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

src/intel/compiler/elk/elk_vec4_nir.cpp

@@ -22,6 +22,7 @@
  */
 
 #include "elk_nir.h"
+#include "elk_nir_private.h"
 #include "elk_vec4.h"
 #include "elk_vec4_builder.h"
 #include "elk_vec4_surface_builder.h"

src/intel/compiler/elk/meson.build

@@ -87,6 +87,7 @@ libintel_compiler_elk_files = files(
   'elk_nir_lower_alpha_to_coverage.c',
   'elk_nir_lower_cs_intrinsics.c',
   'elk_nir_lower_storage_image.c',
+  'elk_nir_private.h',
   'elk_packed_float.c',
   'elk_predicated_break.cpp',
   'elk_prim.h',