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>

126 files changed, 434 insertions, 434 deletions

diff --git a/src/intel/compiler/elk/brw_asm.h b/src/intel/compiler/elk/elk_asm.h
index 7030c363e4a..6d5f9fdcc19 100644
--- a/src/intel/compiler/elk/brw_asm.h
+++ b/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"
 
diff --git a/src/intel/compiler/elk/brw_asm_tool.c b/src/intel/compiler/elk/elk_asm_tool.c
index 6e4a5fce52d..1ffab038111 100644
--- a/src/intel/compiler/elk/brw_asm_tool.c
+++ b/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,
diff --git a/src/intel/compiler/elk/brw_cfg.cpp b/src/intel/compiler/elk/elk_cfg.cpp
index 01cb42635c1..ec2b07747a8 100644
--- a/src/intel/compiler/elk/brw_cfg.cpp
+++ b/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
  *
diff --git a/src/intel/compiler/elk/brw_cfg.h b/src/intel/compiler/elk/elk_cfg.h
index 7784ab43784..676b5c85d63 100644
--- a/src/intel/compiler/elk/brw_cfg.h
+++ b/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;
diff --git a/src/intel/compiler/elk/brw_clip.h b/src/intel/compiler/elk/elk_clip.h
index 4ca89455963..76fd304ff55 100644
--- a/src/intel/compiler/elk/brw_clip.h
+++ b/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
diff --git a/src/intel/compiler/elk/brw_clip_line.c b/src/intel/compiler/elk/elk_clip_line.c
index b71173277d9..7e1e7976882 100644
--- a/src/intel/compiler/elk/brw_clip_line.c
+++ b/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 )
 {
diff --git a/src/intel/compiler/elk/brw_clip_point.c b/src/intel/compiler/elk/elk_clip_point.c
index 1cfb5f23357..04a8be61d1c 100644
--- a/src/intel/compiler/elk/brw_clip_point.c
+++ b/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?
diff --git a/src/intel/compiler/elk/brw_clip_tri.c b/src/intel/compiler/elk/elk_clip_tri.c
index a5bc2b85c12..f645776ef5c 100644
--- a/src/intel/compiler/elk/brw_clip_tri.c
+++ b/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 )
 {
diff --git a/src/intel/compiler/elk/brw_clip_unfilled.c b/src/intel/compiler/elk/elk_clip_unfilled.c
index c0e78acc7e8..74e0dbc3705 100644
--- a/src/intel/compiler/elk/brw_clip_unfilled.c
+++ b/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
diff --git a/src/intel/compiler/elk/brw_clip_util.c b/src/intel/compiler/elk/elk_clip_util.c
index 270a6dc3225..ac76f05afae 100644
--- a/src/intel/compiler/elk/brw_clip_util.c
+++ b/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 )
diff --git a/src/intel/compiler/elk/brw_compile_clip.c b/src/intel/compiler/elk/elk_compile_clip.c
index 25f476d4066..18fc4e6c23c 100644
--- a/src/intel/compiler/elk/brw_compile_clip.c
+++ b/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"
 
diff --git a/src/intel/compiler/elk/brw_compile_ff_gs.c b/src/intel/compiler/elk/elk_compile_ff_gs.c
index 200a1dd0415..73182aa1e58 100644
--- a/src/intel/compiler/elk/brw_compile_ff_gs.c
+++ b/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"
 
diff --git a/src/intel/compiler/elk/brw_compile_sf.c b/src/intel/compiler/elk/elk_compile_sf.c
index f9f23e3d2c9..306b8f47f24 100644
--- a/src/intel/compiler/elk/brw_compile_sf.c
+++ b/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"
 
diff --git a/src/intel/compiler/elk/brw_compiler.c b/src/intel/compiler/elk/elk_compiler.c
index 91aae481788..3cc2490bd7b 100644
--- a/src/intel/compiler/elk/brw_compiler.c
+++ b/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"
diff --git a/src/intel/compiler/elk/brw_compiler.h b/src/intel/compiler/elk/elk_compiler.h
index 830eec93291..ff59354894d 100644
--- a/src/intel/compiler/elk/brw_compiler.h
+++ b/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
diff --git a/src/intel/compiler/elk/brw_dead_control_flow.cpp b/src/intel/compiler/elk/elk_dead_control_flow.cpp
index 0d9253bab18..6fc4f45067b 100644
--- a/src/intel/compiler/elk/brw_dead_control_flow.cpp
+++ b/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;
 
diff --git a/src/intel/compiler/elk/brw_dead_control_flow.h b/src/intel/compiler/elk/elk_dead_control_flow.h
index 9732c2b9f3f..dfb80d69ed5 100644
--- a/src/intel/compiler/elk/brw_dead_control_flow.h
+++ b/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);
 
diff --git a/src/intel/compiler/elk/brw_debug_recompile.c b/src/intel/compiler/elk/elk_debug_recompile.c
index 6e055e09f7c..1e6a6d4cb71 100644
--- a/src/intel/compiler/elk/brw_debug_recompile.c
+++ b/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,
diff --git a/src/intel/compiler/elk/brw_disasm.c b/src/intel/compiler/elk/elk_disasm.c
index 748889aeec8..01bf11d99d2 100644
--- a/src/intel/compiler/elk/brw_disasm.c
+++ b/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
diff --git a/src/intel/compiler/elk/brw_disasm.h b/src/intel/compiler/elk/elk_disasm.h
index 3ebfcfd3051..3ebfcfd3051 100644
--- a/src/intel/compiler/elk/brw_disasm.h
+++ b/src/intel/compiler/elk/elk_disasm.h
diff --git a/src/intel/compiler/elk/brw_disasm_info.c b/src/intel/compiler/elk/elk_disasm_info.c
index cb9a2e42233..9fac62fd238 100644
--- a/src/intel/compiler/elk/brw_disasm_info.c
+++ b/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"
 
diff --git a/src/intel/compiler/elk/brw_disasm_info.h b/src/intel/compiler/elk/elk_disasm_info.h
index 937180b7e2e..937180b7e2e 100644
--- a/src/intel/compiler/elk/brw_disasm_info.h
+++ b/src/intel/compiler/elk/elk_disasm_info.h
diff --git a/src/intel/compiler/elk/brw_disasm_tool.c b/src/intel/compiler/elk/elk_disasm_tool.c
index 1771b2e369c..ca60e9c04f5 100644
--- a/src/intel/compiler/elk/brw_disasm_tool.c
+++ b/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"
 
diff --git a/src/intel/compiler/elk/brw_eu.c b/src/intel/compiler/elk/elk_eu.c
index 1e7ca88493e..89133e926f5 100644
--- a/src/intel/compiler/elk/brw_eu.c
+++ b/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"
 
diff --git a/src/intel/compiler/elk/brw_eu.h b/src/intel/compiler/elk/elk_eu.h
index e7fe0365ef6..66f7244a73f 100644
--- a/src/intel/compiler/elk/brw_eu.h
+++ b/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"
 
diff --git a/src/intel/compiler/elk/brw_eu_compact.c b/src/intel/compiler/elk/elk_eu_compact.c
index 3adaadb2a54..57066423730 100644
--- a/src/intel/compiler/elk/brw_eu_compact.c
+++ b/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] = {
diff --git a/src/intel/compiler/elk/brw_eu_defines.h b/src/intel/compiler/elk/elk_eu_defines.h
index 156e5236006..156e5236006 100644
--- a/src/intel/compiler/elk/brw_eu_defines.h
+++ b/src/intel/compiler/elk/elk_eu_defines.h
diff --git a/src/intel/compiler/elk/brw_eu_emit.c b/src/intel/compiler/elk/elk_eu_emit.c
index 74bd9c0ddbe..0549b57048c 100644
--- a/src/intel/compiler/elk/brw_eu_emit.c
+++ b/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"
 
diff --git a/src/intel/compiler/elk/brw_eu_util.c b/src/intel/compiler/elk/elk_eu_util.c
index 9fc8ff9c7c7..42f32bb0eb0 100644
--- a/src/intel/compiler/elk/brw_eu_util.c
+++ b/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,
diff --git a/src/intel/compiler/elk/brw_eu_validate.c b/src/intel/compiler/elk/elk_eu_validate.c
index ec22ef4fa03..4582092d120 100644
--- a/src/intel/compiler/elk/brw_eu_validate.c
+++ b/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 {
diff --git a/src/intel/compiler/elk/brw_fs.cpp b/src/intel/compiler/elk/elk_fs.cpp
index 77daed6b3a5..2287a6bc366 100644
--- a/src/intel/compiler/elk/brw_fs.cpp
+++ b/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"
diff --git a/src/intel/compiler/elk/brw_fs.h b/src/intel/compiler/elk/elk_fs.h
index 67691b657b0..2e3a6b2b3bd 100644
--- a/src/intel/compiler/elk/brw_fs.h
+++ b/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;
diff --git a/src/intel/compiler/elk/brw_fs_bank_conflicts.cpp b/src/intel/compiler/elk/elk_fs_bank_conflicts.cpp
index 8505748b0f8..827452109f2 100644
--- a/src/intel/compiler/elk/brw_fs_bank_conflicts.cpp
+++ b/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__
 
diff --git a/src/intel/compiler/elk/brw_fs_builder.h b/src/intel/compiler/elk/elk_fs_builder.h
index 63244f0b75b..f05703c8898 100644
--- a/src/intel/compiler/elk/brw_fs_builder.h
+++ b/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 {
    /**
diff --git a/src/intel/compiler/elk/brw_fs_cmod_propagation.cpp b/src/intel/compiler/elk/elk_fs_cmod_propagation.cpp
index 0fadb402172..0cbe91df4e9 100644
--- a/src/intel/compiler/elk/brw_fs_cmod_propagation.cpp
+++ b/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
  *
diff --git a/src/intel/compiler/elk/brw_fs_combine_constants.cpp b/src/intel/compiler/elk/elk_fs_combine_constants.cpp
index ed5176153da..cbbd82d59da 100644
--- a/src/intel/compiler/elk/brw_fs_combine_constants.cpp
+++ b/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;
diff --git a/src/intel/compiler/elk/brw_fs_copy_propagation.cpp b/src/intel/compiler/elk/elk_fs_copy_propagation.cpp
index 62c16be4e64..3fe70936fcf 100644
--- a/src/intel/compiler/elk/brw_fs_copy_propagation.cpp
+++ b/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;
 
diff --git a/src/intel/compiler/elk/brw_fs_cse.cpp b/src/intel/compiler/elk/elk_fs_cse.cpp
index 8fa1d281b06..154316fd873 100644
--- a/src/intel/compiler/elk/brw_fs_cse.cpp
+++ b/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
  *
diff --git a/src/intel/compiler/elk/brw_fs_dead_code_eliminate.cpp b/src/intel/compiler/elk/elk_fs_dead_code_eliminate.cpp
index 51e1bd549cd..97bcfb6ce9b 100644
--- a/src/intel/compiler/elk/brw_fs_dead_code_eliminate.cpp
+++ b/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
  *
diff --git a/src/intel/compiler/elk/brw_fs_generator.cpp b/src/intel/compiler/elk/elk_fs_generator.cpp
index aca88222886..11da4a6ee26 100644
--- a/src/intel/compiler/elk/brw_fs_generator.cpp
+++ b/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"
diff --git a/src/intel/compiler/elk/brw_fs_live_variables.cpp b/src/intel/compiler/elk/elk_fs_live_variables.cpp
index c6361d67d95..b0dc95aa69a 100644
--- a/src/intel/compiler/elk/brw_fs_live_variables.cpp
+++ b/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;
 
diff --git a/src/intel/compiler/elk/brw_fs_live_variables.h b/src/intel/compiler/elk/elk_fs_live_variables.h
index 1c77efa0c19..92c2540b3e8 100644
--- a/src/intel/compiler/elk/brw_fs_live_variables.h
+++ b/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;
diff --git a/src/intel/compiler/elk/brw_fs_lower_pack.cpp b/src/intel/compiler/elk/elk_fs_lower_pack.cpp
index 3a60989ecda..4cd25dcd622 100644
--- a/src/intel/compiler/elk/brw_fs_lower_pack.cpp
+++ b/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;
 
diff --git a/src/intel/compiler/elk/brw_fs_lower_regioning.cpp b/src/intel/compiler/elk/elk_fs_lower_regioning.cpp
index 3bff7770cd0..7ffdef700dc 100644
--- a/src/intel/compiler/elk/brw_fs_lower_regioning.cpp
+++ b/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;
 
diff --git a/src/intel/compiler/elk/brw_fs_nir.cpp b/src/intel/compiler/elk/elk_fs_nir.cpp
index 6bbf2d5862d..a9f44499967 100644
--- a/src/intel/compiler/elk/brw_fs_nir.cpp
+++ b/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"
diff --git a/src/intel/compiler/elk/brw_fs_reg_allocate.cpp b/src/intel/compiler/elk/elk_fs_reg_allocate.cpp
index cc0f4762bc6..b4497339560 100644
--- a/src/intel/compiler/elk/brw_fs_reg_allocate.cpp
+++ b/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"
 
diff --git a/src/intel/compiler/elk/brw_fs_register_coalesce.cpp b/src/intel/compiler/elk/elk_fs_register_coalesce.cpp
index 4c9bb3edba8..42aa1a54308 100644
--- a/src/intel/compiler/elk/brw_fs_register_coalesce.cpp
+++ b/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;
 
diff --git a/src/intel/compiler/elk/brw_fs_saturate_propagation.cpp b/src/intel/compiler/elk/elk_fs_saturate_propagation.cpp
index 50b05dd92b8..28bf6212470 100644
--- a/src/intel/compiler/elk/brw_fs_saturate_propagation.cpp
+++ b/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;
 
diff --git a/src/intel/compiler/elk/brw_fs_sel_peephole.cpp b/src/intel/compiler/elk/elk_fs_sel_peephole.cpp
index 1b7fd14e59e..29189d4032b 100644
--- a/src/intel/compiler/elk/brw_fs_sel_peephole.cpp
+++ b/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
  *
diff --git a/src/intel/compiler/elk/brw_fs_thread_payload.cpp b/src/intel/compiler/elk/elk_fs_thread_payload.cpp
index a55e68e17a9..c2e79e462cd 100644
--- a/src/intel/compiler/elk/brw_fs_thread_payload.cpp
+++ b/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;
 
diff --git a/src/intel/compiler/elk/brw_fs_validate.cpp b/src/intel/compiler/elk/elk_fs_validate.cpp
index 499bc8181c3..bdbcf76862c 100644
--- a/src/intel/compiler/elk/brw_fs_validate.cpp
+++ b/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)                                           \
    {                                                                    \
diff --git a/src/intel/compiler/elk/brw_fs_visitor.cpp b/src/intel/compiler/elk/elk_fs_visitor.cpp
index 9f7f1befd83..c8daf2bc16b 100644
--- a/src/intel/compiler/elk/brw_fs_visitor.cpp
+++ b/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;
diff --git a/src/intel/compiler/elk/gfx6_gs_visitor.cpp b/src/intel/compiler/elk/elk_gfx6_gs_visitor.cpp
index 5465094ed36..bdf1ed97288 100644
--- a/src/intel/compiler/elk/gfx6_gs_visitor.cpp
+++ b/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 {
 
diff --git a/src/intel/compiler/elk/gfx6_gs_visitor.h b/src/intel/compiler/elk/elk_gfx6_gs_visitor.h
index 61832a0cb6b..aef6025c8fd 100644
--- a/src/intel/compiler/elk/gfx6_gs_visitor.h
+++ b/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
 
diff --git a/src/intel/compiler/elk/brw_gram.y b/src/intel/compiler/elk/elk_gram.y
index c6d5d54c165..ea3d9238696 100644
--- a/src/intel/compiler/elk/brw_gram.y
+++ b/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
diff --git a/src/intel/compiler/elk/brw_inst.h b/src/intel/compiler/elk/elk_inst.h
index c3a324257cb..c8276127664 100644
--- a/src/intel/compiler/elk/brw_inst.h
+++ b/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
diff --git a/src/intel/compiler/elk/brw_interpolation_map.c b/src/intel/compiler/elk/elk_interpolation_map.c
index bdda1ad5d48..0fd65cce3c3 100644
--- a/src/intel/compiler/elk/brw_interpolation_map.c
+++ b/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)
diff --git a/src/intel/compiler/elk/brw_ir.h b/src/intel/compiler/elk/elk_ir.h
index 3b4b19c244a..45cde805d49 100644
--- a/src/intel/compiler/elk/brw_ir.h
+++ b/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
diff --git a/src/intel/compiler/elk/brw_ir_allocator.h b/src/intel/compiler/elk/elk_ir_allocator.h
index 4722ae4a4a5..4722ae4a4a5 100644
--- a/src/intel/compiler/elk/brw_ir_allocator.h
+++ b/src/intel/compiler/elk/elk_ir_allocator.h
diff --git a/src/intel/compiler/elk/brw_ir_analysis.h b/src/intel/compiler/elk/elk_ir_analysis.h
index 33b8f5178a6..33b8f5178a6 100644
--- a/src/intel/compiler/elk/brw_ir_analysis.h
+++ b/src/intel/compiler/elk/elk_ir_analysis.h
diff --git a/src/intel/compiler/elk/brw_ir_fs.h b/src/intel/compiler/elk/elk_ir_fs.h
index 169449bbab8..de537a7ef56 100644
--- a/src/intel/compiler/elk/brw_ir_fs.h
+++ b/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;
 
diff --git a/src/intel/compiler/elk/brw_ir_performance.cpp b/src/intel/compiler/elk/elk_ir_performance.cpp
index 6645d490e8b..4c9f8320388 100644
--- a/src/intel/compiler/elk/brw_ir_performance.cpp
+++ b/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;
 
diff --git a/src/intel/compiler/elk/brw_ir_performance.h b/src/intel/compiler/elk/elk_ir_performance.h
index c3cefe838aa..c3cefe838aa 100644
--- a/src/intel/compiler/elk/brw_ir_performance.h
+++ b/src/intel/compiler/elk/elk_ir_performance.h
diff --git a/src/intel/compiler/elk/brw_ir_vec4.h b/src/intel/compiler/elk/elk_ir_vec4.h
index 78d34729c0b..3572e103748 100644
--- a/src/intel/compiler/elk/brw_ir_vec4.h
+++ b/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 {
 
diff --git a/src/intel/compiler/elk/brw_isa_info.h b/src/intel/compiler/elk/elk_isa_info.h
index ae0ad3e2c2d..75ddf9a57f2 100644
--- a/src/intel/compiler/elk/brw_isa_info.h
+++ b/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" {
diff --git a/src/intel/compiler/elk/brw_lex.l b/src/intel/compiler/elk/elk_lex.l
index d230d997358..8a764e93627 100644
--- a/src/intel/compiler/elk/brw_lex.l
+++ b/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;
diff --git a/src/intel/compiler/elk/brw_lower_logical_sends.cpp b/src/intel/compiler/elk/elk_lower_logical_sends.cpp
index bf6f89ee2c6..723004a541f 100644
--- a/src/intel/compiler/elk/brw_lower_logical_sends.cpp
+++ b/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;
 
diff --git a/src/intel/compiler/elk/brw_nir.c b/src/intel/compiler/elk/elk_nir.c
index 17d08e96684..40a485a170b 100644
--- a/src/intel/compiler/elk/brw_nir.c
+++ b/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"
diff --git a/src/intel/compiler/elk/brw_nir.h b/src/intel/compiler/elk/elk_nir.h
index 891d139cb3f..58a0a93d0ad 100644
--- a/src/intel/compiler/elk/brw_nir.h
+++ b/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
diff --git a/src/intel/compiler/elk/brw_nir_analyze_boolean_resolves.c b/src/intel/compiler/elk/elk_nir_analyze_boolean_resolves.c
index be9b79aa4b0..32bf27b4129 100644
--- a/src/intel/compiler/elk/brw_nir_analyze_boolean_resolves.c
+++ b/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
diff --git a/src/intel/compiler/elk/brw_nir_analyze_ubo_ranges.c b/src/intel/compiler/elk/elk_nir_analyze_ubo_ranges.c
index ab7c8323c85..737eac61d1c 100644
--- a/src/intel/compiler/elk/brw_nir_analyze_ubo_ranges.c
+++ b/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"
 
diff --git a/src/intel/compiler/elk/brw_nir_attribute_workarounds.c b/src/intel/compiler/elk/elk_nir_attribute_workarounds.c
index 12c30fd9561..1bb64f96520 100644
--- a/src/intel/compiler/elk/brw_nir_attribute_workarounds.c
+++ b/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
diff --git a/src/intel/compiler/elk/brw_nir_lower_alpha_to_coverage.c b/src/intel/compiler/elk/elk_nir_lower_alpha_to_coverage.c
index 92147f5bf39..d295d40e87a 100644
--- a/src/intel/compiler/elk/brw_nir_lower_alpha_to_coverage.c
+++ b/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
diff --git a/src/intel/compiler/elk/brw_nir_lower_cs_intrinsics.c b/src/intel/compiler/elk/elk_nir_lower_cs_intrinsics.c
index fdbe684aa02..cc1ac02fa82 100644
--- a/src/intel/compiler/elk/brw_nir_lower_cs_intrinsics.c
+++ b/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 {
diff --git a/src/intel/compiler/elk/brw_nir_lower_storage_image.c b/src/intel/compiler/elk/elk_nir_lower_storage_image.c
index aec06f36dce..fe610b2218c 100644
--- a/src/intel/compiler/elk/brw_nir_lower_storage_image.c
+++ b/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"
 
diff --git a/src/intel/compiler/elk/brw_nir_trig_workarounds.py b/src/intel/compiler/elk/elk_nir_trig_workarounds.py
index 5d6a7601d31..94a318f85e8 100644
--- a/src/intel/compiler/elk/brw_nir_trig_workarounds.py
+++ b/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",
diff --git a/src/intel/compiler/elk/brw_packed_float.c b/src/intel/compiler/elk/elk_packed_float.c
index a97a176665b..586a6458d0b 100644
--- a/src/intel/compiler/elk/brw_packed_float.c
+++ b/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;
diff --git a/src/intel/compiler/elk/brw_predicated_break.cpp b/src/intel/compiler/elk/elk_predicated_break.cpp
index 118d71b3773..c6a2f9cd21b 100644
--- a/src/intel/compiler/elk/brw_predicated_break.cpp
+++ b/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;
 
diff --git a/src/intel/compiler/elk/brw_prim.h b/src/intel/compiler/elk/elk_prim.h
index 28823089c1e..28823089c1e 100644
--- a/src/intel/compiler/elk/brw_prim.h
+++ b/src/intel/compiler/elk/elk_prim.h
diff --git a/src/intel/compiler/elk/brw_private.h b/src/intel/compiler/elk/elk_private.h
index 922ec8abc31..16efd885ed3 100644
--- a/src/intel/compiler/elk/brw_private.h
+++ b/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>
 
diff --git a/src/intel/compiler/elk/brw_reg.h b/src/intel/compiler/elk/elk_reg.h
index 7e2243c4625..eb8cb7c9f82 100644
--- a/src/intel/compiler/elk/brw_reg.h
+++ b/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" {
diff --git a/src/intel/compiler/elk/brw_reg_type.c b/src/intel/compiler/elk/elk_reg_type.c
index 93f1b55cadf..d2433ed7432 100644
--- a/src/intel/compiler/elk/brw_reg_type.c
+++ b/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)
diff --git a/src/intel/compiler/elk/brw_reg_type.h b/src/intel/compiler/elk/elk_reg_type.h
index e124bc1054d..e124bc1054d 100644
--- a/src/intel/compiler/elk/brw_reg_type.h
+++ b/src/intel/compiler/elk/elk_reg_type.h
diff --git a/src/intel/compiler/elk/brw_schedule_instructions.cpp b/src/intel/compiler/elk/elk_schedule_instructions.cpp
index 6a12d7e2668..5c603335383 100644
--- a/src/intel/compiler/elk/brw_schedule_instructions.cpp
+++ b/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;
diff --git a/src/intel/compiler/elk/brw_shader.cpp b/src/intel/compiler/elk/elk_shader.cpp
index 7b38b6f4235..77bc9cd64da 100644
--- a/src/intel/compiler/elk/brw_shader.cpp
+++ b/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"
diff --git a/src/intel/compiler/elk/brw_shader.h b/src/intel/compiler/elk/elk_shader.h
index ae789f665b0..dfe7eec3698 100644
--- a/src/intel/compiler/elk/brw_shader.h
+++ b/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,
diff --git a/src/intel/compiler/elk/brw_simd_selection.cpp b/src/intel/compiler/elk/elk_simd_selection.cpp
index 8cfd1dd69d2..30a87a8759d 100644
--- a/src/intel/compiler/elk/brw_simd_selection.cpp
+++ b/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"
diff --git a/src/intel/compiler/elk/test_eu_compact.cpp b/src/intel/compiler/elk/elk_test_eu_compact.cpp
index e3e22596028..09c760cac9e 100644
--- a/src/intel/compiler/elk/test_eu_compact.cpp
+++ b/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>
 
diff --git a/src/intel/compiler/elk/test_eu_validate.cpp b/src/intel/compiler/elk/elk_test_eu_validate.cpp
index 03a594c3b3e..39743e8f4cd 100644
--- a/src/intel/compiler/elk/test_eu_validate.cpp
+++ b/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"
 
diff --git a/src/intel/compiler/elk/test_fs_cmod_propagation.cpp b/src/intel/compiler/elk/elk_test_fs_cmod_propagation.cpp
index c82c55431f2..4b27df31640 100644
--- a/src/intel/compiler/elk/test_fs_cmod_propagation.cpp
+++ b/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;
 
diff --git a/src/intel/compiler/elk/test_fs_combine_constants.cpp b/src/intel/compiler/elk/elk_test_fs_combine_constants.cpp
index 805a78e0b50..7e39a0f442f 100644
--- a/src/intel/compiler/elk/test_fs_combine_constants.cpp
+++ b/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;
 
diff --git a/src/intel/compiler/elk/test_fs_copy_propagation.cpp b/src/intel/compiler/elk/elk_test_fs_copy_propagation.cpp
index 9b56601b404..f59998d8fb7 100644
--- a/src/intel/compiler/elk/test_fs_copy_propagation.cpp
+++ b/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;
 
diff --git a/src/intel/compiler/elk/test_fs_saturate_propagation.cpp b/src/intel/compiler/elk/elk_test_fs_saturate_propagation.cpp
index 110653fc58d..37af0d7aaee 100644
--- a/src/intel/compiler/elk/test_fs_saturate_propagation.cpp
+++ b/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;
 
diff --git a/src/intel/compiler/elk/test_predicated_break.cpp b/src/intel/compiler/elk/elk_test_predicated_break.cpp
index 6289867d037..7b6b4b29463 100644
--- a/src/intel/compiler/elk/test_predicated_break.cpp
+++ b/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;
 
diff --git a/src/intel/compiler/elk/test_simd_selection.cpp b/src/intel/compiler/elk/elk_test_simd_selection.cpp
index f3076b817a0..34b7847c292 100644
--- a/src/intel/compiler/elk/test_simd_selection.cpp
+++ b/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"
diff --git a/src/intel/compiler/elk/test_vec4_cmod_propagation.cpp b/src/intel/compiler/elk/elk_test_vec4_cmod_propagation.cpp
index 73de39d10fe..9fdf2545f49 100644
--- a/src/intel/compiler/elk/test_vec4_cmod_propagation.cpp
+++ b/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;
 
diff --git a/src/intel/compiler/elk/test_vec4_copy_propagation.cpp b/src/intel/compiler/elk/elk_test_vec4_copy_propagation.cpp
index 7690458b928..84ba4ea2120 100644
--- a/src/intel/compiler/elk/test_vec4_copy_propagation.cpp
+++ b/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;
 
diff --git a/src/intel/compiler/elk/test_vec4_dead_code_eliminate.cpp b/src/intel/compiler/elk/elk_test_vec4_dead_code_eliminate.cpp
index c3a07c1735b..ba7c1b745cf 100644
--- a/src/intel/compiler/elk/test_vec4_dead_code_eliminate.cpp
+++ b/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;
 
diff --git a/src/intel/compiler/elk/test_vec4_register_coalesce.cpp b/src/intel/compiler/elk/elk_test_vec4_register_coalesce.cpp
index 13d01c450d4..65e00af51a0 100644
--- a/src/intel/compiler/elk/test_vec4_register_coalesce.cpp
+++ b/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;
 
diff --git a/src/intel/compiler/elk/test_vf_float_conversions.cpp b/src/intel/compiler/elk/elk_test_vf_float_conversions.cpp
index 7af97d0d097..25252d4840f 100644
--- a/src/intel/compiler/elk/test_vf_float_conversions.cpp
+++ b/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();
diff --git a/src/intel/compiler/elk/brw_vec4.cpp b/src/intel/compiler/elk/elk_vec4.cpp
index cb93f3cc2c6..87a81bb943e 100644
--- a/src/intel/compiler/elk/brw_vec4.cpp
+++ b/src/intel/compiler/elk/elk_vec4.cpp
@@ -21,15 +21,15 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_vec4.h"
-#include "brw_fs.h"
-#include "brw_eu.h"
-#include "brw_cfg.h"
-#include "brw_nir.h"
-#include "brw_vec4_builder.h"
-#include "brw_vec4_vs.h"
-#include "brw_dead_control_flow.h"
-#include "brw_private.h"
+#include "elk_vec4.h"
+#include "elk_fs.h"
+#include "elk_eu.h"
+#include "elk_cfg.h"
+#include "elk_nir.h"
+#include "elk_vec4_builder.h"
+#include "elk_vec4_vs.h"
+#include "elk_dead_control_flow.h"
+#include "elk_private.h"
 #include "dev/intel_debug.h"
 #include "util/u_math.h"
 
diff --git a/src/intel/compiler/elk/brw_vec4.h b/src/intel/compiler/elk/elk_vec4.h
index ca803386309..065c3298536 100644
--- a/src/intel/compiler/elk/brw_vec4.h
+++ b/src/intel/compiler/elk/elk_vec4.h
@@ -24,13 +24,13 @@
 #ifndef BRW_VEC4_H
 #define BRW_VEC4_H
 
-#include "brw_shader.h"
+#include "elk_shader.h"
 
 #ifdef __cplusplus
-#include "brw_ir_vec4.h"
-#include "brw_ir_performance.h"
-#include "brw_vec4_builder.h"
-#include "brw_vec4_live_variables.h"
+#include "elk_ir_vec4.h"
+#include "elk_ir_performance.h"
+#include "elk_vec4_builder.h"
+#include "elk_vec4_live_variables.h"
 #endif
 
 #include "compiler/glsl/ir.h"
diff --git a/src/intel/compiler/elk/brw_vec4_builder.h b/src/intel/compiler/elk/elk_vec4_builder.h
index 322a6aae20b..efbffa59e24 100644
--- a/src/intel/compiler/elk/brw_vec4_builder.h
+++ b/src/intel/compiler/elk/elk_vec4_builder.h
@@ -25,8 +25,8 @@
 #ifndef BRW_VEC4_BUILDER_H
 #define BRW_VEC4_BUILDER_H
 
-#include "brw_ir_vec4.h"
-#include "brw_ir_allocator.h"
+#include "elk_ir_vec4.h"
+#include "elk_ir_allocator.h"
 
 namespace brw {
    /**
diff --git a/src/intel/compiler/elk/brw_vec4_cmod_propagation.cpp b/src/intel/compiler/elk/elk_vec4_cmod_propagation.cpp
index a3d7f7e8558..8f0c89dfaa7 100644
--- a/src/intel/compiler/elk/brw_vec4_cmod_propagation.cpp
+++ b/src/intel/compiler/elk/elk_vec4_cmod_propagation.cpp
@@ -29,9 +29,9 @@
  * optimization.
  */
 
-#include "brw_vec4.h"
-#include "brw_cfg.h"
-#include "brw_eu.h"
+#include "elk_vec4.h"
+#include "elk_cfg.h"
+#include "elk_eu.h"
 
 namespace brw {
 
diff --git a/src/intel/compiler/elk/brw_vec4_copy_propagation.cpp b/src/intel/compiler/elk/elk_vec4_copy_propagation.cpp
index fd535fd88af..02c613058f8 100644
--- a/src/intel/compiler/elk/brw_vec4_copy_propagation.cpp
+++ b/src/intel/compiler/elk/elk_vec4_copy_propagation.cpp
@@ -29,9 +29,9 @@
  * propagation.
  */
 
-#include "brw_vec4.h"
-#include "brw_cfg.h"
-#include "brw_eu.h"
+#include "elk_vec4.h"
+#include "elk_cfg.h"
+#include "elk_eu.h"
 
 namespace brw {
 
diff --git a/src/intel/compiler/elk/brw_vec4_cse.cpp b/src/intel/compiler/elk/elk_vec4_cse.cpp
index c4c9ea68e15..4ab2ad19346 100644
--- a/src/intel/compiler/elk/brw_vec4_cse.cpp
+++ b/src/intel/compiler/elk/elk_vec4_cse.cpp
@@ -21,9 +21,9 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_vec4.h"
-#include "brw_vec4_live_variables.h"
-#include "brw_cfg.h"
+#include "elk_vec4.h"
+#include "elk_vec4_live_variables.h"
+#include "elk_cfg.h"
 
 using namespace brw;
 
diff --git a/src/intel/compiler/elk/brw_vec4_dead_code_eliminate.cpp b/src/intel/compiler/elk/elk_vec4_dead_code_eliminate.cpp
index 10a64a56143..9345c734c8f 100644
--- a/src/intel/compiler/elk/brw_vec4_dead_code_eliminate.cpp
+++ b/src/intel/compiler/elk/elk_vec4_dead_code_eliminate.cpp
@@ -21,9 +21,9 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_vec4.h"
-#include "brw_vec4_live_variables.h"
-#include "brw_cfg.h"
+#include "elk_vec4.h"
+#include "elk_vec4_live_variables.h"
+#include "elk_cfg.h"
 
 /** @file brw_vec4_dead_code_eliminate.cpp
  *
diff --git a/src/intel/compiler/elk/brw_vec4_generator.cpp b/src/intel/compiler/elk/elk_vec4_generator.cpp
index df414189f4b..542f3c6d909 100644
--- a/src/intel/compiler/elk/brw_vec4_generator.cpp
+++ b/src/intel/compiler/elk/elk_vec4_generator.cpp
@@ -20,10 +20,10 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_vec4.h"
-#include "brw_cfg.h"
-#include "brw_eu.h"
-#include "brw_disasm_info.h"
+#include "elk_vec4.h"
+#include "elk_cfg.h"
+#include "elk_eu.h"
+#include "elk_disasm_info.h"
 #include "dev/intel_debug.h"
 #include "util/mesa-sha1.h"
 
diff --git a/src/intel/compiler/elk/brw_vec4_gs_nir.cpp b/src/intel/compiler/elk/elk_vec4_gs_nir.cpp
index 60b42da87b9..956ef93f564 100644
--- a/src/intel/compiler/elk/brw_vec4_gs_nir.cpp
+++ b/src/intel/compiler/elk/elk_vec4_gs_nir.cpp
@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_vec4_gs_visitor.h"
+#include "elk_vec4_gs_visitor.h"
 
 namespace brw {
 
diff --git a/src/intel/compiler/elk/brw_vec4_gs_visitor.cpp b/src/intel/compiler/elk/elk_vec4_gs_visitor.cpp
index e5b48b6e2d6..7251967704b 100644
--- a/src/intel/compiler/elk/brw_vec4_gs_visitor.cpp
+++ b/src/intel/compiler/elk/elk_vec4_gs_visitor.cpp
@@ -27,14 +27,14 @@
  * Geometry-shader-specific code derived from the vec4_visitor class.
  */
 
-#include "brw_vec4_gs_visitor.h"
-#include "gfx6_gs_visitor.h"
-#include "brw_eu.h"
-#include "brw_cfg.h"
-#include "brw_fs.h"
-#include "brw_nir.h"
-#include "brw_prim.h"
-#include "brw_private.h"
+#include "elk_vec4_gs_visitor.h"
+#include "elk_gfx6_gs_visitor.h"
+#include "elk_eu.h"
+#include "elk_cfg.h"
+#include "elk_fs.h"
+#include "elk_nir.h"
+#include "elk_prim.h"
+#include "elk_private.h"
 #include "dev/intel_debug.h"
 
 namespace brw {
diff --git a/src/intel/compiler/elk/brw_vec4_gs_visitor.h b/src/intel/compiler/elk/elk_vec4_gs_visitor.h
index ec8b6f7fa8b..1614ba56054 100644
--- a/src/intel/compiler/elk/brw_vec4_gs_visitor.h
+++ b/src/intel/compiler/elk/elk_vec4_gs_visitor.h
@@ -30,7 +30,7 @@
 #ifndef BRW_VEC4_GS_VISITOR_H
 #define BRW_VEC4_GS_VISITOR_H
 
-#include "brw_vec4.h"
+#include "elk_vec4.h"
 
 #define MAX_GS_INPUT_VERTICES 6
 
diff --git a/src/intel/compiler/elk/brw_vec4_live_variables.cpp b/src/intel/compiler/elk/elk_vec4_live_variables.cpp
index 88fa179d0f5..14eb4fa9560 100644
--- a/src/intel/compiler/elk/brw_vec4_live_variables.cpp
+++ b/src/intel/compiler/elk/elk_vec4_live_variables.cpp
@@ -25,8 +25,8 @@
  *
  */
 
-#include "brw_vec4.h"
-#include "brw_vec4_live_variables.h"
+#include "elk_vec4.h"
+#include "elk_vec4_live_variables.h"
 
 using namespace brw;
 
diff --git a/src/intel/compiler/elk/brw_vec4_live_variables.h b/src/intel/compiler/elk/elk_vec4_live_variables.h
index 39d97c8a521..7e55e4e971b 100644
--- a/src/intel/compiler/elk/brw_vec4_live_variables.h
+++ b/src/intel/compiler/elk/elk_vec4_live_variables.h
@@ -28,8 +28,8 @@
 #ifndef BRW_VEC4_LIVE_VARIABLES_H
 #define BRW_VEC4_LIVE_VARIABLES_H
 
-#include "brw_ir_vec4.h"
-#include "brw_ir_analysis.h"
+#include "elk_ir_vec4.h"
+#include "elk_ir_analysis.h"
 #include "util/bitset.h"
 
 struct backend_shader;
diff --git a/src/intel/compiler/elk/brw_vec4_nir.cpp b/src/intel/compiler/elk/elk_vec4_nir.cpp
index 9121f8e10f2..2dc37090208 100644
--- a/src/intel/compiler/elk/brw_vec4_nir.cpp
+++ b/src/intel/compiler/elk/elk_vec4_nir.cpp
@@ -21,11 +21,11 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_nir.h"
-#include "brw_vec4.h"
-#include "brw_vec4_builder.h"
-#include "brw_vec4_surface_builder.h"
-#include "brw_eu.h"
+#include "elk_nir.h"
+#include "elk_vec4.h"
+#include "elk_vec4_builder.h"
+#include "elk_vec4_surface_builder.h"
+#include "elk_eu.h"
 #include "nir.h"
 #include "nir_intrinsics.h"
 #include "nir_intrinsics_indices.h"
diff --git a/src/intel/compiler/elk/brw_vec4_reg_allocate.cpp b/src/intel/compiler/elk/elk_vec4_reg_allocate.cpp
index 8ba1e80b9a5..a6e8191f94c 100644
--- a/src/intel/compiler/elk/brw_vec4_reg_allocate.cpp
+++ b/src/intel/compiler/elk/elk_vec4_reg_allocate.cpp
@@ -22,8 +22,8 @@
  */
 
 #include "util/register_allocate.h"
-#include "brw_vec4.h"
-#include "brw_cfg.h"
+#include "elk_vec4.h"
+#include "elk_cfg.h"
 
 using namespace brw;
 
diff --git a/src/intel/compiler/elk/brw_vec4_surface_builder.cpp b/src/intel/compiler/elk/elk_vec4_surface_builder.cpp
index fce3133bef8..34dd8cefee1 100644
--- a/src/intel/compiler/elk/brw_vec4_surface_builder.cpp
+++ b/src/intel/compiler/elk/elk_vec4_surface_builder.cpp
@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_vec4_surface_builder.h"
+#include "elk_vec4_surface_builder.h"
 
 using namespace brw;
 
diff --git a/src/intel/compiler/elk/brw_vec4_surface_builder.h b/src/intel/compiler/elk/elk_vec4_surface_builder.h
index 2821685a361..53f42e3fcb7 100644
--- a/src/intel/compiler/elk/brw_vec4_surface_builder.h
+++ b/src/intel/compiler/elk/elk_vec4_surface_builder.h
@@ -25,7 +25,7 @@
 #ifndef BRW_VEC4_SURFACE_BUILDER_H
 #define BRW_VEC4_SURFACE_BUILDER_H
 
-#include "brw_vec4_builder.h"
+#include "elk_vec4_builder.h"
 
 namespace brw {
    namespace surface_access {
diff --git a/src/intel/compiler/elk/brw_vec4_tcs.cpp b/src/intel/compiler/elk/elk_vec4_tcs.cpp
index 0441996e857..9b203270004 100644
--- a/src/intel/compiler/elk/brw_vec4_tcs.cpp
+++ b/src/intel/compiler/elk/elk_vec4_tcs.cpp
@@ -28,10 +28,10 @@
  */
 
 #include "../intel_nir.h"
-#include "brw_nir.h"
-#include "brw_vec4_tcs.h"
-#include "brw_fs.h"
-#include "brw_private.h"
+#include "elk_nir.h"
+#include "elk_vec4_tcs.h"
+#include "elk_fs.h"
+#include "elk_private.h"
 #include "dev/intel_debug.h"
 
 namespace brw {
diff --git a/src/intel/compiler/elk/brw_vec4_tcs.h b/src/intel/compiler/elk/elk_vec4_tcs.h
index e5de6c4945b..b8b0c837470 100644
--- a/src/intel/compiler/elk/brw_vec4_tcs.h
+++ b/src/intel/compiler/elk/elk_vec4_tcs.h
@@ -30,9 +30,9 @@
 #ifndef BRW_VEC4_TCS_H
 #define BRW_VEC4_TCS_H
 
-#include "brw_compiler.h"
-#include "brw_eu.h"
-#include "brw_vec4.h"
+#include "elk_compiler.h"
+#include "elk_eu.h"
+#include "elk_vec4.h"
 
 #ifdef __cplusplus
 namespace brw {
diff --git a/src/intel/compiler/elk/brw_vec4_tes.cpp b/src/intel/compiler/elk/elk_vec4_tes.cpp
index 7af5220be75..1f16906b827 100644
--- a/src/intel/compiler/elk/brw_vec4_tes.cpp
+++ b/src/intel/compiler/elk/elk_vec4_tes.cpp
@@ -27,8 +27,8 @@
  * Tessellaton evaluation shader specific code derived from the vec4_visitor class.
  */
 
-#include "brw_vec4_tes.h"
-#include "brw_cfg.h"
+#include "elk_vec4_tes.h"
+#include "elk_cfg.h"
 #include "dev/intel_debug.h"
 
 namespace brw {
diff --git a/src/intel/compiler/elk/brw_vec4_tes.h b/src/intel/compiler/elk/elk_vec4_tes.h
index 23a11956681..15a219f88af 100644
--- a/src/intel/compiler/elk/brw_vec4_tes.h
+++ b/src/intel/compiler/elk/elk_vec4_tes.h
@@ -30,7 +30,7 @@
 #ifndef BRW_VEC4_TES_H
 #define BRW_VEC4_TES_H
 
-#include "brw_vec4.h"
+#include "elk_vec4.h"
 
 #ifdef __cplusplus
 namespace brw {
diff --git a/src/intel/compiler/elk/brw_vec4_visitor.cpp b/src/intel/compiler/elk/elk_vec4_visitor.cpp
index 31a8814ac45..edfb881cffb 100644
--- a/src/intel/compiler/elk/brw_vec4_visitor.cpp
+++ b/src/intel/compiler/elk/elk_vec4_visitor.cpp
@@ -21,9 +21,9 @@
  * IN THE SOFTWARE.
  */
 
-#include "brw_vec4.h"
-#include "brw_cfg.h"
-#include "brw_eu.h"
+#include "elk_vec4.h"
+#include "elk_cfg.h"
+#include "elk_eu.h"
 #include "util/u_math.h"
 
 namespace brw {
diff --git a/src/intel/compiler/elk/brw_vec4_vs.h b/src/intel/compiler/elk/elk_vec4_vs.h
index 0929df5ff3d..035e1d1039d 100644
--- a/src/intel/compiler/elk/brw_vec4_vs.h
+++ b/src/intel/compiler/elk/elk_vec4_vs.h
@@ -24,7 +24,7 @@
 #ifndef BRW_VEC4_VS_VISITOR_H
 #define BRW_VEC4_VS_VISITOR_H
 
-#include "brw_vec4.h"
+#include "elk_vec4.h"
 
 namespace brw {
 
diff --git a/src/intel/compiler/elk/brw_vec4_vs_visitor.cpp b/src/intel/compiler/elk/elk_vec4_vs_visitor.cpp
index c30a3434451..71522e3e568 100644
--- a/src/intel/compiler/elk/brw_vec4_vs_visitor.cpp
+++ b/src/intel/compiler/elk/elk_vec4_vs_visitor.cpp
@@ -22,7 +22,7 @@
  */
 
 
-#include "brw_vec4_vs.h"
+#include "elk_vec4_vs.h"
 #include "dev/intel_debug.h"
 
 namespace brw {
diff --git a/src/intel/compiler/elk/brw_vue_map.c b/src/intel/compiler/elk/elk_vue_map.c
index 56cb560f1e4..1881db92340 100644
--- a/src/intel/compiler/elk/brw_vue_map.c
+++ b/src/intel/compiler/elk/elk_vue_map.c
@@ -40,7 +40,7 @@
  */
 
 
-#include "brw_compiler.h"
+#include "elk_compiler.h"
 #include "dev/intel_debug.h"
 
 static inline void
diff --git a/src/intel/compiler/elk/meson.build b/src/intel/compiler/elk/meson.build
index d9ea33b080e..8b71a7ef5a2 100644
--- a/src/intel/compiler/elk/meson.build
+++ b/src/intel/compiler/elk/meson.build
@@ -19,118 +19,118 @@
 # SOFTWARE.
 
 libintel_compiler_elk_files = files(
-  'brw_cfg.cpp',
-  'brw_cfg.h',
-  'brw_clip.h',
-  'brw_clip_line.c',
-  'brw_clip_point.c',
-  'brw_clip_tri.c',
-  'brw_clip_unfilled.c',
-  'brw_clip_util.c',
-  'brw_compile_clip.c',
-  'brw_compile_ff_gs.c',
-  'brw_compile_sf.c',
-  'brw_compiler.c',
-  'brw_compiler.h',
-  'brw_dead_control_flow.cpp',
-  'brw_dead_control_flow.h',
-  'brw_debug_recompile.c',
-  'brw_disasm.c',
-  'brw_disasm.h',
-  'brw_disasm_info.c',
-  'brw_disasm_info.h',
-  'brw_eu.c',
-  'brw_eu_compact.c',
-  'brw_eu_defines.h',
-  'brw_eu_emit.c',
-  'brw_eu.h',
-  'brw_eu_util.c',
-  'brw_eu_validate.c',
-  'brw_fs_bank_conflicts.cpp',
-  'brw_fs_builder.h',
-  'brw_fs_cmod_propagation.cpp',
-  'brw_fs_combine_constants.cpp',
-  'brw_fs_copy_propagation.cpp',
-  'brw_fs.cpp',
-  'brw_fs_cse.cpp',
-  'brw_fs_dead_code_eliminate.cpp',
-  'brw_fs_generator.cpp',
-  'brw_fs.h',
-  'brw_fs_live_variables.cpp',
-  'brw_fs_live_variables.h',
-  'brw_fs_lower_pack.cpp',
-  'brw_fs_lower_regioning.cpp',
-  'brw_fs_nir.cpp',
-  'brw_fs_reg_allocate.cpp',
-  'brw_fs_register_coalesce.cpp',
-  'brw_fs_saturate_propagation.cpp',
-  'brw_fs_sel_peephole.cpp',
-  'brw_fs_thread_payload.cpp',
-  'brw_fs_validate.cpp',
-  'brw_fs_visitor.cpp',
-  'brw_inst.h',
-  'brw_interpolation_map.c',
-  'brw_ir.h',
-  'brw_ir_allocator.h',
-  'brw_ir_analysis.h',
-  'brw_ir_fs.h',
-  'brw_ir_performance.h',
-  'brw_ir_performance.cpp',
-  'brw_ir_vec4.h',
-  'brw_isa_info.h',
-  'brw_lower_logical_sends.cpp',
-  'brw_nir.h',
-  'brw_nir.c',
-  'brw_nir_analyze_boolean_resolves.c',
-  'brw_nir_analyze_ubo_ranges.c',
-  'brw_nir_attribute_workarounds.c',
-  'brw_nir_lower_cs_intrinsics.c',
-  'brw_nir_lower_alpha_to_coverage.c',
-  'brw_nir_lower_storage_image.c',
-  'brw_packed_float.c',
-  'brw_predicated_break.cpp',
-  'brw_prim.h',
-  'brw_private.h',
-  'brw_reg.h',
-  'brw_reg_type.c',
-  'brw_reg_type.h',
-  'brw_schedule_instructions.cpp',
-  'brw_shader.cpp',
-  'brw_shader.h',
-  'brw_simd_selection.cpp',
-  'brw_vec4_builder.h',
-  'brw_vec4_cmod_propagation.cpp',
-  'brw_vec4_copy_propagation.cpp',
-  'brw_vec4.cpp',
-  'brw_vec4_cse.cpp',
-  'brw_vec4_dead_code_eliminate.cpp',
-  'brw_vec4_generator.cpp',
-  'brw_vec4_gs_visitor.cpp',
-  'brw_vec4_gs_visitor.h',
-  'brw_vec4.h',
-  'brw_vec4_live_variables.cpp',
-  'brw_vec4_live_variables.h',
-  'brw_vec4_nir.cpp',
-  'brw_vec4_gs_nir.cpp',
-  'brw_vec4_reg_allocate.cpp',
-  'brw_vec4_surface_builder.cpp',
-  'brw_vec4_surface_builder.h',
-  'brw_vec4_tcs.cpp',
-  'brw_vec4_tcs.h',
-  'brw_vec4_tes.cpp',
-  'brw_vec4_tes.h',
-  'brw_vec4_visitor.cpp',
-  'brw_vec4_vs_visitor.cpp',
-  'brw_vec4_vs.h',
-  'brw_vue_map.c',
-  'gfx6_gs_visitor.cpp',
-  'gfx6_gs_visitor.h',
+  'elk_cfg.cpp',
+  'elk_cfg.h',
+  'elk_clip.h',
+  'elk_clip_line.c',
+  'elk_clip_point.c',
+  'elk_clip_tri.c',
+  'elk_clip_unfilled.c',
+  'elk_clip_util.c',
+  'elk_compile_clip.c',
+  'elk_compile_ff_gs.c',
+  'elk_compile_sf.c',
+  'elk_compiler.c',
+  'elk_compiler.h',
+  'elk_dead_control_flow.cpp',
+  'elk_dead_control_flow.h',
+  'elk_debug_recompile.c',
+  'elk_disasm.c',
+  'elk_disasm.h',
+  'elk_disasm_info.c',
+  'elk_disasm_info.h',
+  'elk_eu.c',
+  'elk_eu_compact.c',
+  'elk_eu_defines.h',
+  'elk_eu_emit.c',
+  'elk_eu.h',
+  'elk_eu_util.c',
+  'elk_eu_validate.c',
+  'elk_fs_bank_conflicts.cpp',
+  'elk_fs_builder.h',
+  'elk_fs_cmod_propagation.cpp',
+  'elk_fs_combine_constants.cpp',
+  'elk_fs_copy_propagation.cpp',
+  'elk_fs.cpp',
+  'elk_fs_cse.cpp',
+  'elk_fs_dead_code_eliminate.cpp',
+  'elk_fs_generator.cpp',
+  'elk_fs.h',
+  'elk_fs_live_variables.cpp',
+  'elk_fs_live_variables.h',
+  'elk_fs_lower_pack.cpp',
+  'elk_fs_lower_regioning.cpp',
+  'elk_fs_nir.cpp',
+  'elk_fs_reg_allocate.cpp',
+  'elk_fs_register_coalesce.cpp',
+  'elk_fs_saturate_propagation.cpp',
+  'elk_fs_sel_peephole.cpp',
+  'elk_fs_thread_payload.cpp',
+  'elk_fs_validate.cpp',
+  'elk_fs_visitor.cpp',
+  'elk_inst.h',
+  'elk_interpolation_map.c',
+  'elk_ir.h',
+  'elk_ir_allocator.h',
+  'elk_ir_analysis.h',
+  'elk_ir_fs.h',
+  'elk_ir_performance.h',
+  'elk_ir_performance.cpp',
+  'elk_ir_vec4.h',
+  'elk_isa_info.h',
+  'elk_lower_logical_sends.cpp',
+  'elk_nir.h',
+  'elk_nir.c',
+  'elk_nir_analyze_boolean_resolves.c',
+  'elk_nir_analyze_ubo_ranges.c',
+  'elk_nir_attribute_workarounds.c',
+  'elk_nir_lower_alpha_to_coverage.c',
+  'elk_nir_lower_cs_intrinsics.c',
+  'elk_nir_lower_storage_image.c',
+  'elk_packed_float.c',
+  'elk_predicated_break.cpp',
+  'elk_prim.h',
+  'elk_private.h',
+  'elk_reg.h',
+  'elk_reg_type.c',
+  'elk_reg_type.h',
+  'elk_schedule_instructions.cpp',
+  'elk_shader.cpp',
+  'elk_shader.h',
+  'elk_simd_selection.cpp',
+  'elk_vec4_builder.h',
+  'elk_vec4_cmod_propagation.cpp',
+  'elk_vec4_copy_propagation.cpp',
+  'elk_vec4.cpp',
+  'elk_vec4_cse.cpp',
+  'elk_vec4_dead_code_eliminate.cpp',
+  'elk_vec4_generator.cpp',
+  'elk_vec4_gs_visitor.cpp',
+  'elk_vec4_gs_visitor.h',
+  'elk_vec4.h',
+  'elk_vec4_live_variables.cpp',
+  'elk_vec4_live_variables.h',
+  'elk_vec4_nir.cpp',
+  'elk_vec4_gs_nir.cpp',
+  'elk_vec4_reg_allocate.cpp',
+  'elk_vec4_surface_builder.cpp',
+  'elk_vec4_surface_builder.h',
+  'elk_vec4_tcs.cpp',
+  'elk_vec4_tcs.h',
+  'elk_vec4_tes.cpp',
+  'elk_vec4_tes.h',
+  'elk_vec4_visitor.cpp',
+  'elk_vec4_vs_visitor.cpp',
+  'elk_vec4_vs.h',
+  'elk_vue_map.c',
+  'elk_gfx6_gs_visitor.cpp',
+  'elk_gfx6_gs_visitor.h',
 )
 
 elk_nir_trig = custom_target(
-  'brw_nir_trig_workarounds.c',
-  input : 'brw_nir_trig_workarounds.py',
-  output : 'brw_nir_trig_workarounds.c',
+  'elk_nir_trig_workarounds.c',
+  input : 'elk_nir_trig_workarounds.py',
+  output : 'elk_nir_trig_workarounds.c',
   command : [
     prog_python, '@INPUT@', '-p', dir_compiler_nir,
   ],
@@ -154,19 +154,19 @@ if with_tests
     executable(
       'intel_compiler_elk_tests',
       files(
-        'test_predicated_break.cpp',
-        'test_eu_compact.cpp',
-        'test_eu_validate.cpp',
-        'test_fs_cmod_propagation.cpp',
-        'test_fs_combine_constants.cpp',
-        'test_fs_copy_propagation.cpp',
-        'test_fs_saturate_propagation.cpp',
-        'test_simd_selection.cpp',
-        'test_vec4_cmod_propagation.cpp',
-        'test_vec4_copy_propagation.cpp',
-        'test_vec4_dead_code_eliminate.cpp',
-        'test_vec4_register_coalesce.cpp',
-        'test_vf_float_conversions.cpp',
+        'elk_test_predicated_break.cpp',
+        'elk_test_eu_compact.cpp',
+        'elk_test_eu_validate.cpp',
+        'elk_test_fs_cmod_propagation.cpp',
+        'elk_test_fs_combine_constants.cpp',
+        'elk_test_fs_copy_propagation.cpp',
+        'elk_test_fs_saturate_propagation.cpp',
+        'elk_test_simd_selection.cpp',
+        'elk_test_vec4_cmod_propagation.cpp',
+        'elk_test_vec4_copy_propagation.cpp',
+        'elk_test_vec4_dead_code_eliminate.cpp',
+        'elk_test_vec4_register_coalesce.cpp',
+        'elk_test_vf_float_conversions.cpp',
       ),
       ir_expression_operation_h,
       include_directories : [inc_include, inc_src, inc_intel],
@@ -183,22 +183,22 @@ endif
 if with_intel_tools
 
 elk_gram_tab = custom_target(
-  'brw_gram.tab.[ch]',
-  input : 'brw_gram.y',
-  output : ['brw_gram.tab.c', 'brw_gram.tab.h'],
+  'elk_gram.tab.[ch]',
+  input : 'elk_gram.y',
+  output : ['elk_gram.tab.c', 'elk_gram.tab.h'],
   command : bison_command
 )
 
 elk_lex_yy_c = custom_target(
-  'brw_lex.yy.c',
-  input : 'brw_lex.l',
-  output : 'brw_lex.yy.c',
+  'elk_lex.yy.c',
+  input : 'elk_lex.l',
+  output : 'elk_lex.yy.c',
   command : [prog_flex, '-o', '@OUTPUT@', '@INPUT@']
 )
 
 elk_asm_tool = executable(
   'elk_asm',
-  ['brw_asm_tool.c', elk_gram_tab[0], elk_gram_tab[1], elk_lex_yy_c],
+  ['elk_asm_tool.c', elk_gram_tab[0], elk_gram_tab[1], elk_lex_yy_c],
   dependencies : [idep_mesautil, dep_thread, idep_intel_dev],
   include_directories : [inc_include, inc_src, inc_intel],
   link_with : [libintel_common, libintel_compiler_elk],
@@ -236,7 +236,7 @@ endforeach
 
 elk_disasm_tool = executable(
   'elk_disasm',
-  files('brw_disasm_tool.c'),
+  files('elk_disasm_tool.c'),
   dependencies : [idep_mesautil, dep_thread, idep_intel_dev],
   include_directories : [inc_include, inc_src, inc_intel],
   link_with : [libintel_common, libintel_compiler_elk],