intel/elk: Rename files to use elk prefix

Acked-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_asm.h

@@ -29,11 +29,11 @@
 #include <stdbool.h>
 #include <assert.h>
 
-#include "brw_reg.h"
-#include "brw_reg_type.h"
-#include "brw_eu_defines.h"
-#include "brw_inst.h"
-#include "brw_eu.h"
+#include "elk_reg.h"
+#include "elk_reg_type.h"
+#include "elk_eu_defines.h"
+#include "elk_inst.h"
+#include "elk_eu.h"
 #include "dev/intel_device_info.h"
 #include "util/list.h"
 

src/intel/compiler/elk/elk_asm_tool.c

@@ -24,8 +24,8 @@
 
 #include <stdio.h>
 #include <getopt.h>
-#include "brw_asm.h"
-#include "intel/compiler/brw_disasm_info.h"
+#include "elk_asm.h"
+#include "elk_disasm_info.h"
 
 enum opt_output_type {
    OPT_OUTPUT_HEX,

src/intel/compiler/elk/elk_cfg.cpp

@@ -25,9 +25,9 @@
  *
  */
 
-#include "brw_cfg.h"
+#include "elk_cfg.h"
 #include "util/u_dynarray.h"
-#include "brw_shader.h"
+#include "elk_shader.h"
 
 /** @file brw_cfg.cpp
  *

src/intel/compiler/elk/elk_cfg.h

@@ -28,9 +28,9 @@
 #ifndef BRW_CFG_H
 #define BRW_CFG_H
 
-#include "brw_ir.h"
+#include "elk_ir.h"
 #ifdef __cplusplus
-#include "brw_ir_analysis.h"
+#include "elk_ir_analysis.h"
 #endif
 
 struct bblock_t;

src/intel/compiler/elk/elk_clip.h

@@ -32,8 +32,8 @@
 #ifndef BRW_CLIP_H
 #define BRW_CLIP_H
 
-#include "brw_compiler.h"
-#include "brw_eu.h"
+#include "elk_compiler.h"
+#include "elk_eu.h"
 
 /* Initial 3 verts, plus at most 6 additional verts from intersections
  * with fixed planes, plus at most 8 additional verts from intersections

src/intel/compiler/elk/elk_clip_line.c

@@ -29,8 +29,8 @@
   *   Keith Whitwell <keithw@vmware.com>
   */
 
-#include "brw_clip.h"
-#include "brw_prim.h"
+#include "elk_clip.h"
+#include "elk_prim.h"
 
 static void brw_clip_line_alloc_regs( struct brw_clip_compile *c )
 {

src/intel/compiler/elk/elk_clip_point.c

@@ -29,7 +29,7 @@
   *   Keith Whitwell <keithw@vmware.com>
   */
 
-#include "brw_clip.h"
+#include "elk_clip.h"
 
 
 /* Point clipping, nothing to do?

src/intel/compiler/elk/elk_clip_tri.c

@@ -29,8 +29,8 @@
   *   Keith Whitwell <keithw@vmware.com>
   */
 
-#include "brw_clip.h"
-#include "brw_prim.h"
+#include "elk_clip.h"
+#include "elk_prim.h"
 
 static void release_tmps( struct brw_clip_compile *c )
 {

src/intel/compiler/elk/elk_clip_unfilled.c

@@ -29,8 +29,8 @@
   *   Keith Whitwell <keithw@vmware.com>
   */
 
-#include "brw_clip.h"
-#include "brw_prim.h"
+#include "elk_clip.h"
+#include "elk_prim.h"
 
 
 /* This is performed against the original triangles, so no indirection

src/intel/compiler/elk/elk_clip_util.c

@@ -29,7 +29,7 @@
   *   Keith Whitwell <keithw@vmware.com>
   */
 
-#include "brw_clip.h"
+#include "elk_clip.h"
 
 
 struct brw_reg get_tmp( struct brw_clip_compile *c )

src/intel/compiler/elk/elk_compile_clip.c

@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_clip.h"
-#include "brw_disasm.h"
+#include "elk_clip.h"
+#include "elk_disasm.h"
 
 #include "dev/intel_debug.h"
 

src/intel/compiler/elk/elk_compile_ff_gs.c

@@ -29,10 +29,10 @@
   *   Keith Whitwell <keithw@vmware.com>
   */
 
-#include "brw_compiler.h"
-#include "brw_disasm.h"
-#include "brw_eu.h"
-#include "brw_prim.h"
+#include "elk_compiler.h"
+#include "elk_disasm.h"
+#include "elk_eu.h"
+#include "elk_prim.h"
 
 #include "dev/intel_debug.h"
 

src/intel/compiler/elk/elk_compile_sf.c

@@ -21,10 +21,10 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_compiler.h"
-#include "brw_disasm.h"
-#include "brw_eu.h"
-#include "brw_prim.h"
+#include "elk_compiler.h"
+#include "elk_disasm.h"
+#include "elk_eu.h"
+#include "elk_prim.h"
 
 #include "dev/intel_debug.h"
 

src/intel/compiler/elk/elk_compiler.c

@@ -21,10 +21,10 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_compiler.h"
-#include "brw_shader.h"
-#include "brw_eu.h"
-#include "brw_nir.h"
+#include "elk_compiler.h"
+#include "elk_shader.h"
+#include "elk_eu.h"
+#include "elk_nir.h"
 #include "dev/intel_debug.h"
 #include "compiler/nir/nir.h"
 #include "util/u_debug.h"

src/intel/compiler/elk/elk_compiler.h

@@ -33,7 +33,7 @@
 #include "util/enum_operators.h"
 #include "util/ralloc.h"
 #include "util/u_math.h"
-#include "brw_isa_info.h"
+#include "elk_isa_info.h"
 #include "../intel_shader_enums.h"
 
 #ifdef __cplusplus

src/intel/compiler/elk/elk_dead_control_flow.cpp

@@ -26,8 +26,8 @@
  * This file implements the dead control flow elimination optimization pass.
  */
 
-#include "brw_shader.h"
-#include "brw_cfg.h"
+#include "elk_shader.h"
+#include "elk_cfg.h"
 
 using namespace brw;
 

src/intel/compiler/elk/elk_dead_control_flow.h

@@ -24,7 +24,7 @@
 #ifndef BRW_DEAD_CONTROL_FLOW_H
 #define BRW_DEAD_CONTROL_FLOW_H
 
-#include "brw_shader.h"
+#include "elk_shader.h"
 
 bool dead_control_flow_eliminate(backend_shader *s);
 

src/intel/compiler/elk/elk_debug_recompile.c

@@ -26,7 +26,7 @@
 
 #include <stdio.h>
 
-#include "brw_compiler.h"
+#include "elk_compiler.h"
 
 static bool
 key_debug(const struct brw_compiler *c, void *log,

src/intel/compiler/elk/elk_disasm.c

@@ -26,14 +26,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "brw_disasm.h"
-#include "brw_disasm_info.h"
-#include "brw_eu_defines.h"
-#include "brw_eu.h"
-#include "brw_inst.h"
-#include "brw_isa_info.h"
-#include "brw_reg.h"
-#include "brw_shader.h"
+#include "elk_disasm.h"
+#include "elk_disasm_info.h"
+#include "elk_eu_defines.h"
+#include "elk_eu.h"
+#include "elk_inst.h"
+#include "elk_isa_info.h"
+#include "elk_reg.h"
+#include "elk_shader.h"
 #include "util/half_float.h"
 
 bool

src/intel/compiler/elk/elk_disasm_info.c

@@ -21,10 +21,10 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_cfg.h"
-#include "brw_eu.h"
-#include "brw_disasm.h"
-#include "brw_disasm_info.h"
+#include "elk_cfg.h"
+#include "elk_eu.h"
+#include "elk_disasm.h"
+#include "elk_disasm_info.h"
 #include "dev/intel_debug.h"
 #include "compiler/nir/nir.h"
 

src/intel/compiler/elk/elk_disasm_tool.c

@@ -26,8 +26,8 @@
 #include <string.h>
 #include <getopt.h>
 
-#include "compiler/brw_disasm.h"
-#include "compiler/brw_isa_info.h"
+#include "elk_disasm.h"
+#include "elk_isa_info.h"
 #include "dev/intel_device_info.h"
 #include "util/u_dynarray.h"
 

src/intel/compiler/elk/elk_eu.c

@@ -32,10 +32,10 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "brw_disasm.h"
-#include "brw_eu_defines.h"
-#include "brw_eu.h"
-#include "brw_shader.h"
+#include "elk_disasm.h"
+#include "elk_eu_defines.h"
+#include "elk_eu.h"
+#include "elk_shader.h"
 #include "../intel_gfx_ver_enum.h"
 #include "dev/intel_debug.h"
 

src/intel/compiler/elk/elk_eu.h

@@ -35,11 +35,11 @@
 
 #include <stdbool.h>
 #include <stdio.h>
-#include "brw_inst.h"
-#include "brw_compiler.h"
-#include "brw_eu_defines.h"
-#include "brw_isa_info.h"
-#include "brw_reg.h"
+#include "elk_inst.h"
+#include "elk_compiler.h"
+#include "elk_eu_defines.h"
+#include "elk_isa_info.h"
+#include "elk_reg.h"
 
 #include "util/bitset.h"
 

src/intel/compiler/elk/elk_eu_compact.c

@@ -78,10 +78,10 @@
  * the mantissa.
  */
 
-#include "brw_eu.h"
-#include "brw_disasm.h"
-#include "brw_shader.h"
-#include "brw_disasm_info.h"
+#include "elk_eu.h"
+#include "elk_disasm.h"
+#include "elk_shader.h"
+#include "elk_disasm_info.h"
 #include "dev/intel_debug.h"
 
 static const uint32_t g45_control_index_table[32] = {

src/intel/compiler/elk/elk_eu_emit.c

@@ -30,8 +30,8 @@
   */
 
 
-#include "brw_eu_defines.h"
-#include "brw_eu.h"
+#include "elk_eu_defines.h"
+#include "elk_eu.h"
 
 #include "util/ralloc.h"
 

src/intel/compiler/elk/elk_eu_util.c

@@ -30,8 +30,8 @@
   */
 
 
-#include "brw_eu_defines.h"
-#include "brw_eu.h"
+#include "elk_eu_defines.h"
+#include "elk_eu.h"
 
 
 void brw_math_invert( struct brw_codegen *p,

src/intel/compiler/elk/elk_eu_validate.c

@@ -39,8 +39,8 @@
  */
 
 #include <stdlib.h>
-#include "brw_eu.h"
-#include "brw_disasm_info.h"
+#include "elk_eu.h"
+#include "elk_disasm_info.h"
 
 /* We're going to do lots of string concatenation, so this should help. */
 struct string {

src/intel/compiler/elk/elk_fs.cpp

@@ -28,15 +28,15 @@
  * from the LIR.
  */
 
-#include "brw_eu.h"
-#include "brw_fs.h"
-#include "brw_fs_builder.h"
-#include "brw_fs_live_variables.h"
-#include "brw_nir.h"
-#include "brw_vec4_gs_visitor.h"
-#include "brw_cfg.h"
-#include "brw_dead_control_flow.h"
-#include "brw_private.h"
+#include "elk_eu.h"
+#include "elk_fs.h"
+#include "elk_fs_builder.h"
+#include "elk_fs_live_variables.h"
+#include "elk_nir.h"
+#include "elk_vec4_gs_visitor.h"
+#include "elk_cfg.h"
+#include "elk_dead_control_flow.h"
+#include "elk_private.h"
 #include "../intel_nir.h"
 #include "shader_enums.h"
 #include "dev/intel_debug.h"

src/intel/compiler/elk/elk_fs.h

@@ -28,10 +28,10 @@
 #ifndef BRW_FS_H
 #define BRW_FS_H
 
-#include "brw_shader.h"
-#include "brw_ir_fs.h"
-#include "brw_fs_live_variables.h"
-#include "brw_ir_performance.h"
+#include "elk_shader.h"
+#include "elk_ir_fs.h"
+#include "elk_fs_live_variables.h"
+#include "elk_ir_performance.h"
 #include "compiler/nir/nir.h"
 
 struct bblock_t;

src/intel/compiler/elk/elk_fs_bank_conflicts.cpp

@@ -48,8 +48,8 @@
  * cubic term within reasonable bounds for m close to its theoretical maximum.
  */
 
-#include "brw_fs.h"
-#include "brw_cfg.h"
+#include "elk_fs.h"
+#include "elk_cfg.h"
 
 #ifdef __SSE2__
 

src/intel/compiler/elk/elk_fs_builder.h

@@ -25,10 +25,10 @@
 #ifndef BRW_FS_BUILDER_H
 #define BRW_FS_BUILDER_H
 
-#include "brw_ir_fs.h"
-#include "brw_shader.h"
-#include "brw_eu.h"
-#include "brw_fs.h"
+#include "elk_ir_fs.h"
+#include "elk_shader.h"
+#include "elk_eu.h"
+#include "elk_fs.h"
 
 namespace brw {
    /**

src/intel/compiler/elk/elk_fs_cmod_propagation.cpp

@@ -21,9 +21,9 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_fs.h"
-#include "brw_cfg.h"
-#include "brw_eu.h"
+#include "elk_fs.h"
+#include "elk_cfg.h"
+#include "elk_eu.h"
 
 /** @file brw_fs_cmod_propagation.cpp
  *

src/intel/compiler/elk/elk_fs_combine_constants.cpp

@@ -34,9 +34,9 @@
  * cannot use immediate values.
  */
 
-#include "brw_fs.h"
-#include "brw_fs_builder.h"
-#include "brw_cfg.h"
+#include "elk_fs.h"
+#include "elk_fs_builder.h"
+#include "elk_cfg.h"
 #include "util/half_float.h"
 
 using namespace brw;

src/intel/compiler/elk/elk_fs_copy_propagation.cpp

@@ -35,10 +35,10 @@
 #include "util/bitset.h"
 #include "util/u_math.h"
 #include "util/rb_tree.h"
-#include "brw_fs.h"
-#include "brw_fs_live_variables.h"
-#include "brw_cfg.h"
-#include "brw_eu.h"
+#include "elk_fs.h"
+#include "elk_fs_live_variables.h"
+#include "elk_cfg.h"
+#include "elk_eu.h"
 
 using namespace brw;
 

src/intel/compiler/elk/elk_fs_cse.cpp

@@ -21,9 +21,9 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_fs.h"
-#include "brw_fs_builder.h"
-#include "brw_cfg.h"
+#include "elk_fs.h"
+#include "elk_fs_builder.h"
+#include "elk_cfg.h"
 
 /** @file brw_fs_cse.cpp
  *

src/intel/compiler/elk/elk_fs_dead_code_eliminate.cpp

@@ -21,9 +21,9 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_fs.h"
-#include "brw_fs_live_variables.h"
-#include "brw_cfg.h"
+#include "elk_fs.h"
+#include "elk_fs_live_variables.h"
+#include "elk_cfg.h"
 
 /** @file brw_fs_dead_code_eliminate.cpp
  *

src/intel/compiler/elk/elk_fs_generator.cpp

@@ -27,10 +27,10 @@
  * native instructions.
  */
 
-#include "brw_eu.h"
-#include "brw_disasm_info.h"
-#include "brw_fs.h"
-#include "brw_cfg.h"
+#include "elk_eu.h"
+#include "elk_disasm_info.h"
+#include "elk_fs.h"
+#include "elk_cfg.h"
 #include "dev/intel_debug.h"
 #include "util/mesa-sha1.h"
 #include "util/half_float.h"

src/intel/compiler/elk/elk_fs_live_variables.cpp

@@ -25,8 +25,8 @@
  *
  */
 
-#include "brw_fs.h"
-#include "brw_fs_live_variables.h"
+#include "elk_fs.h"
+#include "elk_fs_live_variables.h"
 
 using namespace brw;
 

src/intel/compiler/elk/elk_fs_live_variables.h

@@ -28,8 +28,8 @@
 #ifndef BRW_FS_LIVE_VARIABLES_H
 #define BRW_FS_LIVE_VARIABLES_H
 
-#include "brw_ir_analysis.h"
-#include "brw_ir_fs.h"
+#include "elk_ir_analysis.h"
+#include "elk_ir_fs.h"
 #include "util/bitset.h"
 
 struct cfg_t;

src/intel/compiler/elk/elk_fs_lower_pack.cpp

@@ -22,9 +22,9 @@
  */
 
 #include "util/half_float.h"
-#include "brw_fs.h"
-#include "brw_cfg.h"
-#include "brw_fs_builder.h"
+#include "elk_fs.h"
+#include "elk_cfg.h"
+#include "elk_fs_builder.h"
 
 using namespace brw;
 

src/intel/compiler/elk/elk_fs_lower_regioning.cpp

@@ -21,9 +21,9 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_fs.h"
-#include "brw_cfg.h"
-#include "brw_fs_builder.h"
+#include "elk_fs.h"
+#include "elk_cfg.h"
+#include "elk_fs_builder.h"
 
 using namespace brw;
 

src/intel/compiler/elk/elk_fs_nir.cpp

@@ -21,10 +21,10 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_fs.h"
-#include "brw_fs_builder.h"
-#include "brw_nir.h"
-#include "brw_eu.h"
+#include "elk_fs.h"
+#include "elk_fs_builder.h"
+#include "elk_nir.h"
+#include "elk_eu.h"
 #include "nir.h"
 #include "nir_intrinsics.h"
 #include "nir_search_helpers.h"

src/intel/compiler/elk/elk_fs_reg_allocate.cpp

@@ -25,10 +25,10 @@
  *
  */
 
-#include "brw_eu.h"
-#include "brw_fs.h"
-#include "brw_fs_builder.h"
-#include "brw_cfg.h"
+#include "elk_eu.h"
+#include "elk_fs.h"
+#include "elk_fs_builder.h"
+#include "elk_cfg.h"
 #include "util/set.h"
 #include "util/register_allocate.h"
 

src/intel/compiler/elk/elk_fs_register_coalesce.cpp

@@ -40,9 +40,9 @@
  * mul vgrf5:F, vgrf5:F, vgrf4:F
  */
 
-#include "brw_fs.h"
-#include "brw_cfg.h"
-#include "brw_fs_live_variables.h"
+#include "elk_fs.h"
+#include "elk_cfg.h"
+#include "elk_fs_live_variables.h"
 
 using namespace brw;
 

src/intel/compiler/elk/elk_fs_saturate_propagation.cpp

@@ -21,9 +21,9 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_fs.h"
-#include "brw_fs_live_variables.h"
-#include "brw_cfg.h"
+#include "elk_fs.h"
+#include "elk_fs_live_variables.h"
+#include "elk_cfg.h"
 
 using namespace brw;
 

src/intel/compiler/elk/elk_fs_sel_peephole.cpp

@@ -21,9 +21,9 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_fs.h"
-#include "brw_fs_builder.h"
-#include "brw_cfg.h"
+#include "elk_fs.h"
+#include "elk_fs_builder.h"
+#include "elk_cfg.h"
 
 /** @file brw_fs_sel_peephole.cpp
  *

src/intel/compiler/elk/elk_fs_thread_payload.cpp

@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "elk_fs.h"
+#include "elk_fs_builder.h"
 
 using namespace brw;
 

src/intel/compiler/elk/elk_fs_validate.cpp

@@ -27,8 +27,8 @@
  * pass only validates that GRF's uses are sane.  More can be added later.
  */
 
-#include "brw_fs.h"
-#include "brw_cfg.h"
+#include "elk_fs.h"
+#include "elk_cfg.h"
 
 #define fsv_assert(assertion)                                           \
    {                                                                    \

src/intel/compiler/elk/elk_fs_visitor.cpp

@@ -27,10 +27,10 @@
  * makes it easier to do backend-specific optimizations than doing so
  * in the GLSL IR or in the native code.
  */
-#include "brw_eu.h"
-#include "brw_fs.h"
-#include "brw_fs_builder.h"
-#include "brw_nir.h"
+#include "elk_eu.h"
+#include "elk_fs.h"
+#include "elk_fs_builder.h"
+#include "elk_nir.h"
 #include "compiler/glsl_types.h"
 
 using namespace brw;

src/intel/compiler/elk/elk_gfx6_gs_visitor.cpp

@@ -29,9 +29,9 @@
  * Gfx6 geometry shader implementation
  */
 
-#include "gfx6_gs_visitor.h"
-#include "brw_eu.h"
-#include "brw_prim.h"
+#include "elk_gfx6_gs_visitor.h"
+#include "elk_eu.h"
+#include "elk_prim.h"
 
 namespace brw {
 

src/intel/compiler/elk/elk_gfx6_gs_visitor.h

@@ -25,8 +25,8 @@
 #ifndef GFX6_GS_VISITOR_H
 #define GFX6_GS_VISITOR_H
 
-#include "brw_vec4.h"
-#include "brw_vec4_gs_visitor.h"
+#include "elk_vec4.h"
+#include "elk_vec4_gs_visitor.h"
 
 #ifdef __cplusplus
 

src/intel/compiler/elk/elk_gram.y

@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include "brw_asm.h"
+#include "elk_asm.h"
 
 #undef yyerror
 #ifdef YYBYACC

src/intel/compiler/elk/elk_inst.h

@@ -34,9 +34,9 @@
 #include <assert.h>
 #include <stdint.h>
 
-#include "brw_eu_defines.h"
-#include "brw_isa_info.h"
-#include "brw_reg_type.h"
+#include "elk_eu_defines.h"
+#include "elk_isa_info.h"
+#include "elk_reg_type.h"
 #include "dev/intel_device_info.h"
 
 #ifdef __cplusplus

src/intel/compiler/elk/elk_interpolation_map.c

@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_compiler.h"
+#include "elk_compiler.h"
 #include "compiler/nir/nir.h"
 
 static char const *get_qual_name(int mode)

src/intel/compiler/elk/elk_ir.h

@@ -26,7 +26,7 @@
 #define BRW_IR_H
 
 #include <assert.h>
-#include "brw_reg.h"
+#include "elk_reg.h"
 #include "compiler/glsl/list.h"
 
 #define MAX_SAMPLER_MESSAGE_SIZE 11

src/intel/compiler/elk/elk_ir_fs.h

@@ -25,7 +25,7 @@
 #ifndef BRW_IR_FS_H
 #define BRW_IR_FS_H
 
-#include "brw_shader.h"
+#include "elk_shader.h"
 
 class fs_inst;
 

src/intel/compiler/elk/elk_ir_performance.cpp

@@ -21,10 +21,10 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_eu.h"
-#include "brw_fs.h"
-#include "brw_vec4.h"
-#include "brw_cfg.h"
+#include "elk_eu.h"
+#include "elk_fs.h"
+#include "elk_vec4.h"
+#include "elk_cfg.h"
 
 using namespace brw;
 

src/intel/compiler/elk/elk_ir_vec4.h

@@ -25,7 +25,7 @@
 #ifndef BRW_IR_VEC4_H
 #define BRW_IR_VEC4_H
 
-#include "brw_shader.h"
+#include "elk_shader.h"
 
 namespace brw {
 

src/intel/compiler/elk/elk_isa_info.h

@@ -24,7 +24,7 @@
 #define BRW_ISA_ENCODING_H
 
 #include "dev/intel_device_info.h"
-#include "brw_eu_defines.h"
+#include "elk_eu_defines.h"
 
 #ifdef __cplusplus
 extern "C" {

src/intel/compiler/elk/elk_lex.l

@@ -2,9 +2,9 @@
 %option nounput
 %{
 #include <string.h>
-#include "brw_asm.h"
+#include "elk_asm.h"
 #undef ALIGN16
-#include "brw_gram.tab.h"
+#include "elk_gram.tab.h"
 
 /* Locations */
 int yycolumn = 1;

src/intel/compiler/elk/elk_lower_logical_sends.cpp

@@ -25,9 +25,9 @@
  * @file brw_lower_logical_sends.cpp
  */
 
-#include "brw_eu.h"
-#include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "elk_eu.h"
+#include "elk_fs.h"
+#include "elk_fs_builder.h"
 
 using namespace brw;
 

src/intel/compiler/elk/elk_nir.c

@@ -22,8 +22,8 @@
  */
 
 #include "../intel_nir.h"
-#include "brw_nir.h"
-#include "brw_shader.h"
+#include "elk_nir.h"
+#include "elk_shader.h"
 #include "dev/intel_debug.h"
 #include "compiler/glsl_types.h"
 #include "compiler/nir/nir_builder.h"

src/intel/compiler/elk/elk_nir.h

@@ -24,9 +24,9 @@
 #ifndef BRW_NIR_H
 #define BRW_NIR_H
 
-#include "brw_reg.h"
+#include "elk_reg.h"
 #include "compiler/nir/nir.h"
-#include "brw_compiler.h"
+#include "elk_compiler.h"
 #include "nir_builder.h"
 
 #ifdef __cplusplus

src/intel/compiler/elk/elk_nir_analyze_boolean_resolves.c

@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_nir.h"
+#include "elk_nir.h"
 
 /*
  * This file implements an analysis pass that determines when we have to do

src/intel/compiler/elk/elk_nir_analyze_ubo_ranges.c

@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_nir.h"
+#include "elk_nir.h"
 #include "compiler/nir/nir.h"
 #include "util/u_dynarray.h"
 

src/intel/compiler/elk/elk_nir_attribute_workarounds.c

@@ -22,7 +22,7 @@
  */
 
 #include "compiler/nir/nir_builder.h"
-#include "brw_nir.h"
+#include "elk_nir.h"
 
 /**
  * Prior to Haswell, the hardware can't natively support GL_FIXED or

src/intel/compiler/elk/elk_nir_lower_alpha_to_coverage.c

@@ -22,7 +22,7 @@
  */
 
 #include "compiler/nir/nir_builder.h"
-#include "brw_nir.h"
+#include "elk_nir.h"
 
 /**
  * We need to compute alpha to coverage dithering manually in shader

src/intel/compiler/elk/elk_nir_lower_cs_intrinsics.c

@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_nir.h"
+#include "elk_nir.h"
 #include "compiler/nir/nir_builder.h"
 
 struct lower_intrinsics_state {

src/intel/compiler/elk/elk_nir_lower_storage_image.c

@@ -23,7 +23,7 @@
 
 #include "isl/isl.h"
 
-#include "brw_nir.h"
+#include "elk_nir.h"
 #include "compiler/nir/nir_builder.h"
 #include "compiler/nir/nir_format_convert.h"
 

src/intel/compiler/elk/elk_nir_trig_workarounds.py

@@ -56,7 +56,7 @@ def main():
 def run():
     import nir_algebraic  # pylint: disable=import-error
 
-    print('#include "brw_nir.h"')
+    print('#include "elk_nir.h"')
     print(nir_algebraic.AlgebraicPass("brw_nir_apply_trig_workarounds",
                                       TRIG_WORKAROUNDS).render())
     print(nir_algebraic.AlgebraicPass("brw_nir_limit_trig_input_range_workaround",

src/intel/compiler/elk/elk_packed_float.c

@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-#include "brw_reg.h"
+#include "elk_reg.h"
 
 union fu {
    float f;

src/intel/compiler/elk/elk_predicated_break.cpp

@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_shader.h"
+#include "elk_shader.h"
 
 using namespace brw;
 

src/intel/compiler/elk/elk_private.h

@@ -25,7 +25,7 @@
 #ifndef BRW_PRIVATE_H
 #define BRW_PRIVATE_H
 
-#include "brw_compiler.h"
+#include "elk_compiler.h"
 
 #include <variant>
 

src/intel/compiler/elk/elk_reg.h

@@ -48,8 +48,8 @@
 #include "util/macros.h"
 #include "util/rounding.h"
 #include "util/u_math.h"
-#include "brw_eu_defines.h"
-#include "brw_reg_type.h"
+#include "elk_eu_defines.h"
+#include "elk_reg_type.h"
 
 #ifdef __cplusplus
 extern "C" {

src/intel/compiler/elk/elk_reg_type.c

@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_reg.h"
-#include "brw_eu_defines.h"
+#include "elk_reg.h"
+#include "elk_eu_defines.h"
 #include "dev/intel_device_info.h"
 
 #define INVALID (-1)

src/intel/compiler/elk/elk_schedule_instructions.cpp

@@ -25,12 +25,12 @@
  *
  */
 
-#include "brw_eu.h"
-#include "brw_fs.h"
-#include "brw_fs_live_variables.h"
-#include "brw_vec4.h"
-#include "brw_cfg.h"
-#include "brw_shader.h"
+#include "elk_eu.h"
+#include "elk_fs.h"
+#include "elk_fs_live_variables.h"
+#include "elk_vec4.h"
+#include "elk_cfg.h"
+#include "elk_shader.h"
 #include <new>
 
 using namespace brw;

src/intel/compiler/elk/elk_shader.cpp

@@ -21,12 +21,12 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_cfg.h"
-#include "brw_eu.h"
-#include "brw_fs.h"
-#include "brw_nir.h"
-#include "brw_private.h"
-#include "brw_vec4_tes.h"
+#include "elk_cfg.h"
+#include "elk_eu.h"
+#include "elk_fs.h"
+#include "elk_nir.h"
+#include "elk_private.h"
+#include "elk_vec4_tes.h"
 #include "dev/intel_debug.h"
 #include "util/macros.h"
 #include "util/u_debug.h"

src/intel/compiler/elk/elk_shader.h

@@ -25,13 +25,13 @@
 #define BRW_SHADER_H
 
 #include <stdint.h>
-#include "brw_cfg.h"
-#include "brw_compiler.h"
+#include "elk_cfg.h"
+#include "elk_compiler.h"
 #include "compiler/nir/nir.h"
 
 #ifdef __cplusplus
-#include "brw_ir_analysis.h"
-#include "brw_ir_allocator.h"
+#include "elk_ir_analysis.h"
+#include "elk_ir_allocator.h"
 
 enum instruction_scheduler_mode {
    SCHEDULE_PRE,

src/intel/compiler/elk/elk_simd_selection.cpp

@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_private.h"
+#include "elk_private.h"
 #include "compiler/shader_info.h"
 #include "intel/dev/intel_debug.h"
 #include "intel/dev/intel_device_info.h"

src/intel/compiler/elk/elk_test_eu_compact.cpp

@@ -25,8 +25,8 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include "util/ralloc.h"
-#include "brw_disasm.h"
-#include "brw_eu.h"
+#include "elk_disasm.h"
+#include "elk_eu.h"
 
 #include <gtest/gtest.h>
 

src/intel/compiler/elk/elk_test_eu_validate.cpp

@@ -22,9 +22,9 @@
  */
 
 #include <gtest/gtest.h>
-#include "brw_disasm_info.h"
-#include "brw_eu.h"
-#include "brw_eu_defines.h"
+#include "elk_disasm_info.h"
+#include "elk_eu.h"
+#include "elk_eu_defines.h"
 #include "util/bitset.h"
 #include "util/ralloc.h"
 

src/intel/compiler/elk/elk_test_fs_cmod_propagation.cpp

@@ -22,9 +22,9 @@
  */
 
 #include <gtest/gtest.h>
-#include "brw_fs.h"
-#include "brw_fs_builder.h"
-#include "brw_cfg.h"
+#include "elk_fs.h"
+#include "elk_fs_builder.h"
+#include "elk_cfg.h"
 
 using namespace brw;
 

src/intel/compiler/elk/elk_test_fs_combine_constants.cpp

@@ -4,9 +4,9 @@
  */
 
 #include <gtest/gtest.h>
-#include "brw_fs.h"
-#include "brw_fs_builder.h"
-#include "brw_cfg.h"
+#include "elk_fs.h"
+#include "elk_fs_builder.h"
+#include "elk_cfg.h"
 
 using namespace brw;
 

src/intel/compiler/elk/elk_test_fs_copy_propagation.cpp

@@ -22,9 +22,9 @@
  */
 
 #include <gtest/gtest.h>
-#include "brw_fs.h"
-#include "brw_fs_builder.h"
-#include "brw_cfg.h"
+#include "elk_fs.h"
+#include "elk_fs_builder.h"
+#include "elk_cfg.h"
 
 using namespace brw;
 

src/intel/compiler/elk/elk_test_fs_saturate_propagation.cpp

@@ -22,9 +22,9 @@
  */
 
 #include <gtest/gtest.h>
-#include "brw_fs.h"
-#include "brw_fs_builder.h"
-#include "brw_cfg.h"
+#include "elk_fs.h"
+#include "elk_fs_builder.h"
+#include "elk_cfg.h"
 
 using namespace brw;
 

src/intel/compiler/elk/elk_test_predicated_break.cpp

@@ -4,9 +4,9 @@
  */
 
 #include <gtest/gtest.h>
-#include "brw_fs.h"
-#include "brw_fs_builder.h"
-#include "brw_cfg.h"
+#include "elk_fs.h"
+#include "elk_fs_builder.h"
+#include "elk_cfg.h"
 
 using namespace brw;
 

src/intel/compiler/elk/elk_test_simd_selection.cpp

@@ -22,7 +22,7 @@
  */
 
 
-#include "brw_private.h"
+#include "elk_private.h"
 #include "compiler/shader_info.h"
 #include "intel/dev/intel_debug.h"
 #include "intel/dev/intel_device_info.h"

src/intel/compiler/elk/elk_test_vec4_cmod_propagation.cpp

@@ -24,9 +24,9 @@
  */
 
 #include <gtest/gtest.h>
-#include "brw_vec4.h"
-#include "brw_vec4_builder.h"
-#include "brw_cfg.h"
+#include "elk_vec4.h"
+#include "elk_vec4_builder.h"
+#include "elk_cfg.h"
 
 using namespace brw;
 

src/intel/compiler/elk/elk_test_vec4_copy_propagation.cpp

@@ -22,7 +22,7 @@
  */
 
 #include <gtest/gtest.h>
-#include "brw_vec4.h"
+#include "elk_vec4.h"
 
 using namespace brw;
 

src/intel/compiler/elk/elk_test_vec4_dead_code_eliminate.cpp

@@ -22,7 +22,7 @@
  */
 
 #include <gtest/gtest.h>
-#include "brw_vec4.h"
+#include "elk_vec4.h"
 
 using namespace brw;
 

src/intel/compiler/elk/elk_test_vec4_register_coalesce.cpp

@@ -22,7 +22,7 @@
  */
 
 #include <gtest/gtest.h>
-#include "brw_vec4.h"
+#include "elk_vec4.h"
 
 using namespace brw;
 

src/intel/compiler/elk/elk_test_vf_float_conversions.cpp

@@ -23,7 +23,7 @@
 
 #include <gtest/gtest.h>
 #include <math.h>
-#include "brw_reg.h"
+#include "elk_reg.h"
 
 class vf_float_conversion_test : public ::testing::Test {
    virtual void SetUp();