diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp
index 00f22a4d1bd..6c7e5dc05c3 100644
--- a/src/intel/compiler/brw_fs.cpp
+++ b/src/intel/compiler/brw_fs.cpp
@@ -1588,7 +1588,7 @@ brw_shader_phase_update(fs_visitor &s, enum brw_shader_phase phase)
 {
    assert(phase == s.phase + 1);
    s.phase = phase;
-   brw_fs_validate(s);
+   brw_validate(s);
 }
 
 bool brw_should_print_shader(const nir_shader *shader, uint64_t debug_flag)
diff --git a/src/intel/compiler/brw_fs.h b/src/intel/compiler/brw_fs.h
index 37ea0ca9687..45cead11dd3 100644
--- a/src/intel/compiler/brw_fs.h
+++ b/src/intel/compiler/brw_fs.h
@@ -600,9 +600,9 @@ void nir_to_brw(fs_visitor *s);
 void brw_shader_phase_update(fs_visitor &s, enum brw_shader_phase phase);
 
 #ifndef NDEBUG
-void brw_fs_validate(const fs_visitor &s);
+void brw_validate(const fs_visitor &s);
 #else
-static inline void brw_fs_validate(const fs_visitor &s) {}
+static inline void brw_validate(const fs_visitor &s) {}
 #endif
 
 void brw_calculate_cfg(fs_visitor &s);
diff --git a/src/intel/compiler/brw_opt.cpp b/src/intel/compiler/brw_opt.cpp
index 4e2b56e16bf..3d883700bda 100644
--- a/src/intel/compiler/brw_opt.cpp
+++ b/src/intel/compiler/brw_opt.cpp
@@ -17,7 +17,7 @@ brw_optimize(fs_visitor &s)
    s.debug_optimizer(nir, "start", 0, 0);
 
    /* Start by validating the shader we currently have. */
-   brw_fs_validate(s);
+   brw_validate(s);
 
    /* Track how much non-SSA at this point. */
    {
@@ -37,7 +37,7 @@ brw_optimize(fs_visitor &s)
       if (this_progress)                                                \
          s.debug_optimizer(nir, #pass, iteration, pass_num);            \
                                                                         \
-      brw_fs_validate(s);                                               \
+      brw_validate(s);                                                  \
                                                                         \
       progress = progress || this_progress;                             \
       this_progress;                                                    \
diff --git a/src/intel/compiler/brw_fs_validate.cpp b/src/intel/compiler/brw_validate.cpp
similarity index 99%
rename from src/intel/compiler/brw_fs_validate.cpp
rename to src/intel/compiler/brw_validate.cpp
index 4796edfa449..822ba27ccfc 100644
--- a/src/intel/compiler/brw_fs_validate.cpp
+++ b/src/intel/compiler/brw_validate.cpp
@@ -271,7 +271,7 @@ brw_validate_instruction_phase(const fs_visitor &s, fs_inst *inst)
 }
 
 void
-brw_fs_validate(const fs_visitor &s)
+brw_validate(const fs_visitor &s)
 {
    const intel_device_info *devinfo = s.devinfo;
 
diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build
index 742baea4803..090cc406692 100644
--- a/src/intel/compiler/meson.build
+++ b/src/intel/compiler/meson.build
@@ -54,7 +54,6 @@ libintel_compiler_brw_files = files(
   'brw_fs_nir.cpp',
   'brw_fs_reg_allocate.cpp',
   'brw_fs_thread_payload.cpp',
-  'brw_fs_validate.cpp',
   'brw_fs_visitor.cpp',
   'brw_ir.h',
   'brw_ir_allocator.h',
@@ -112,6 +111,7 @@ libintel_compiler_brw_files = files(
   'brw_schedule_instructions.cpp',
   'brw_shader.cpp',
   'brw_simd_selection.cpp',
+  'brw_validate.cpp',
   'brw_vue_map.c',
   'brw_workaround.cpp',
 )
diff --git a/src/intel/compiler/test_opt_combine_constants.cpp b/src/intel/compiler/test_opt_combine_constants.cpp
index 5200965ffd8..3f398df9c36 100644
--- a/src/intel/compiler/test_opt_combine_constants.cpp
+++ b/src/intel/compiler/test_opt_combine_constants.cpp
@@ -125,6 +125,6 @@ TEST_F(FSCombineConstantsTest, DoContainingDo)
     * test is that the shader would be empty.
     */
    ASSERT_GE(shader->cfg->num_blocks, original_num_blocks);
-   brw_fs_validate(*shader);
+   brw_validate(*shader);
 }