diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index 6ae211c85ba..ecc0a05ba0d 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -311,7 +311,7 @@
       - src/panfrost/vulkan/*
       when: on_success
     - changes:
-      - src/panfrost/bifrost/**/*
+      - src/panfrost/compiler/**/*
       when: on_success
 
 .broadcom-common-rules:
diff --git a/docs/sourcetree.rst b/docs/sourcetree.rst
index 5e196492682..a1c7209b69a 100644
--- a/docs/sourcetree.rst
+++ b/docs/sourcetree.rst
@@ -168,7 +168,7 @@ each directory.
    -  **loader** - Used by libGL.so to find and load the appropriate DRI driver.
    -  **panfrost** - Panfrost-specific sources
 
-         -  **bifrost** - shader compiler for the Bifrost generation GPUs
+         -  **compiler** - shader compiler for Bifrost and newer GPUs
          -  **lib** - GPU data structures (command stream) support code
          -  **midgard** - shader compiler for the Midgard generation GPUs
          -  **shared** - shared Mali code between Lima and Panfrost
diff --git a/src/panfrost/bifrost/ISA.xml b/src/panfrost/compiler/ISA.xml
similarity index 100%
rename from src/panfrost/bifrost/ISA.xml
rename to src/panfrost/compiler/ISA.xml
diff --git a/src/panfrost/bifrost/Notes.txt b/src/panfrost/compiler/Notes.txt
similarity index 100%
rename from src/panfrost/bifrost/Notes.txt
rename to src/panfrost/compiler/Notes.txt
diff --git a/src/panfrost/bifrost/README.md b/src/panfrost/compiler/README.md
similarity index 100%
rename from src/panfrost/bifrost/README.md
rename to src/panfrost/compiler/README.md
diff --git a/src/panfrost/bifrost/bi_builder.h.py b/src/panfrost/compiler/bi_builder.h.py
similarity index 100%
rename from src/panfrost/bifrost/bi_builder.h.py
rename to src/panfrost/compiler/bi_builder.h.py
diff --git a/src/panfrost/bifrost/bi_helper_invocations.c b/src/panfrost/compiler/bi_helper_invocations.c
similarity index 100%
rename from src/panfrost/bifrost/bi_helper_invocations.c
rename to src/panfrost/compiler/bi_helper_invocations.c
diff --git a/src/panfrost/bifrost/bi_layout.c b/src/panfrost/compiler/bi_layout.c
similarity index 100%
rename from src/panfrost/bifrost/bi_layout.c
rename to src/panfrost/compiler/bi_layout.c
diff --git a/src/panfrost/bifrost/bi_liveness.c b/src/panfrost/compiler/bi_liveness.c
similarity index 100%
rename from src/panfrost/bifrost/bi_liveness.c
rename to src/panfrost/compiler/bi_liveness.c
diff --git a/src/panfrost/bifrost/bi_lower_divergent_indirects.c b/src/panfrost/compiler/bi_lower_divergent_indirects.c
similarity index 100%
rename from src/panfrost/bifrost/bi_lower_divergent_indirects.c
rename to src/panfrost/compiler/bi_lower_divergent_indirects.c
diff --git a/src/panfrost/bifrost/bi_lower_swizzle.c b/src/panfrost/compiler/bi_lower_swizzle.c
similarity index 100%
rename from src/panfrost/bifrost/bi_lower_swizzle.c
rename to src/panfrost/compiler/bi_lower_swizzle.c
diff --git a/src/panfrost/bifrost/bi_opcodes.c.py b/src/panfrost/compiler/bi_opcodes.c.py
similarity index 100%
rename from src/panfrost/bifrost/bi_opcodes.c.py
rename to src/panfrost/compiler/bi_opcodes.c.py
diff --git a/src/panfrost/bifrost/bi_opcodes.h.py b/src/panfrost/compiler/bi_opcodes.h.py
similarity index 100%
rename from src/panfrost/bifrost/bi_opcodes.h.py
rename to src/panfrost/compiler/bi_opcodes.h.py
diff --git a/src/panfrost/bifrost/bi_opt_constant_fold.c b/src/panfrost/compiler/bi_opt_constant_fold.c
similarity index 100%
rename from src/panfrost/bifrost/bi_opt_constant_fold.c
rename to src/panfrost/compiler/bi_opt_constant_fold.c
diff --git a/src/panfrost/bifrost/bi_opt_copy_prop.c b/src/panfrost/compiler/bi_opt_copy_prop.c
similarity index 100%
rename from src/panfrost/bifrost/bi_opt_copy_prop.c
rename to src/panfrost/compiler/bi_opt_copy_prop.c
diff --git a/src/panfrost/bifrost/bi_opt_cse.c b/src/panfrost/compiler/bi_opt_cse.c
similarity index 100%
rename from src/panfrost/bifrost/bi_opt_cse.c
rename to src/panfrost/compiler/bi_opt_cse.c
diff --git a/src/panfrost/bifrost/bi_opt_dce.c b/src/panfrost/compiler/bi_opt_dce.c
similarity index 100%
rename from src/panfrost/bifrost/bi_opt_dce.c
rename to src/panfrost/compiler/bi_opt_dce.c
diff --git a/src/panfrost/bifrost/bi_opt_dual_tex.c b/src/panfrost/compiler/bi_opt_dual_tex.c
similarity index 100%
rename from src/panfrost/bifrost/bi_opt_dual_tex.c
rename to src/panfrost/compiler/bi_opt_dual_tex.c
diff --git a/src/panfrost/bifrost/bi_opt_message_preload.c b/src/panfrost/compiler/bi_opt_message_preload.c
similarity index 100%
rename from src/panfrost/bifrost/bi_opt_message_preload.c
rename to src/panfrost/compiler/bi_opt_message_preload.c
diff --git a/src/panfrost/bifrost/bi_opt_mod_props.c b/src/panfrost/compiler/bi_opt_mod_props.c
similarity index 100%
rename from src/panfrost/bifrost/bi_opt_mod_props.c
rename to src/panfrost/compiler/bi_opt_mod_props.c
diff --git a/src/panfrost/bifrost/bi_opt_push_ubo.c b/src/panfrost/compiler/bi_opt_push_ubo.c
similarity index 100%
rename from src/panfrost/bifrost/bi_opt_push_ubo.c
rename to src/panfrost/compiler/bi_opt_push_ubo.c
diff --git a/src/panfrost/bifrost/bi_pack.c b/src/panfrost/compiler/bi_pack.c
similarity index 100%
rename from src/panfrost/bifrost/bi_pack.c
rename to src/panfrost/compiler/bi_pack.c
diff --git a/src/panfrost/bifrost/bi_packer.c.py b/src/panfrost/compiler/bi_packer.c.py
similarity index 100%
rename from src/panfrost/bifrost/bi_packer.c.py
rename to src/panfrost/compiler/bi_packer.c.py
diff --git a/src/panfrost/bifrost/bi_pressure_schedule.c b/src/panfrost/compiler/bi_pressure_schedule.c
similarity index 100%
rename from src/panfrost/bifrost/bi_pressure_schedule.c
rename to src/panfrost/compiler/bi_pressure_schedule.c
diff --git a/src/panfrost/bifrost/bi_print.c b/src/panfrost/compiler/bi_print.c
similarity index 100%
rename from src/panfrost/bifrost/bi_print.c
rename to src/panfrost/compiler/bi_print.c
diff --git a/src/panfrost/bifrost/bi_print_common.c b/src/panfrost/compiler/bi_print_common.c
similarity index 100%
rename from src/panfrost/bifrost/bi_print_common.c
rename to src/panfrost/compiler/bi_print_common.c
diff --git a/src/panfrost/bifrost/bi_print_common.h b/src/panfrost/compiler/bi_print_common.h
similarity index 100%
rename from src/panfrost/bifrost/bi_print_common.h
rename to src/panfrost/compiler/bi_print_common.h
diff --git a/src/panfrost/bifrost/bi_printer.c.py b/src/panfrost/compiler/bi_printer.c.py
similarity index 100%
rename from src/panfrost/bifrost/bi_printer.c.py
rename to src/panfrost/compiler/bi_printer.c.py
diff --git a/src/panfrost/bifrost/bi_quirks.h b/src/panfrost/compiler/bi_quirks.h
similarity index 100%
rename from src/panfrost/bifrost/bi_quirks.h
rename to src/panfrost/compiler/bi_quirks.h
diff --git a/src/panfrost/bifrost/bi_ra.c b/src/panfrost/compiler/bi_ra.c
similarity index 100%
rename from src/panfrost/bifrost/bi_ra.c
rename to src/panfrost/compiler/bi_ra.c
diff --git a/src/panfrost/bifrost/bi_schedule.c b/src/panfrost/compiler/bi_schedule.c
similarity index 100%
rename from src/panfrost/bifrost/bi_schedule.c
rename to src/panfrost/compiler/bi_schedule.c
diff --git a/src/panfrost/bifrost/bi_scoreboard.c b/src/panfrost/compiler/bi_scoreboard.c
similarity index 100%
rename from src/panfrost/bifrost/bi_scoreboard.c
rename to src/panfrost/compiler/bi_scoreboard.c
diff --git a/src/panfrost/bifrost/bi_test.h b/src/panfrost/compiler/bi_test.h
similarity index 100%
rename from src/panfrost/bifrost/bi_test.h
rename to src/panfrost/compiler/bi_test.h
diff --git a/src/panfrost/bifrost/bi_validate.c b/src/panfrost/compiler/bi_validate.c
similarity index 100%
rename from src/panfrost/bifrost/bi_validate.c
rename to src/panfrost/compiler/bi_validate.c
diff --git a/src/panfrost/bifrost/bifrost.h b/src/panfrost/compiler/bifrost.h
similarity index 100%
rename from src/panfrost/bifrost/bifrost.h
rename to src/panfrost/compiler/bifrost.h
diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/compiler/bifrost_compile.c
similarity index 100%
rename from src/panfrost/bifrost/bifrost_compile.c
rename to src/panfrost/compiler/bifrost_compile.c
diff --git a/src/panfrost/bifrost/bifrost_compile.h b/src/panfrost/compiler/bifrost_compile.h
similarity index 100%
rename from src/panfrost/bifrost/bifrost_compile.h
rename to src/panfrost/compiler/bifrost_compile.h
diff --git a/src/panfrost/bifrost/bifrost_isa.py b/src/panfrost/compiler/bifrost_isa.py
similarity index 100%
rename from src/panfrost/bifrost/bifrost_isa.py
rename to src/panfrost/compiler/bifrost_isa.py
diff --git a/src/panfrost/bifrost/bifrost_nir.h b/src/panfrost/compiler/bifrost_nir.h
similarity index 100%
rename from src/panfrost/bifrost/bifrost_nir.h
rename to src/panfrost/compiler/bifrost_nir.h
diff --git a/src/panfrost/bifrost/bifrost_nir_algebraic.py b/src/panfrost/compiler/bifrost_nir_algebraic.py
similarity index 100%
rename from src/panfrost/bifrost/bifrost_nir_algebraic.py
rename to src/panfrost/compiler/bifrost_nir_algebraic.py
diff --git a/src/panfrost/bifrost/bir.c b/src/panfrost/compiler/bir.c
similarity index 100%
rename from src/panfrost/bifrost/bir.c
rename to src/panfrost/compiler/bir.c
diff --git a/src/panfrost/bifrost/cmdline.c b/src/panfrost/compiler/cmdline.c
similarity index 100%
rename from src/panfrost/bifrost/cmdline.c
rename to src/panfrost/compiler/cmdline.c
diff --git a/src/panfrost/bifrost/compiler.h b/src/panfrost/compiler/compiler.h
similarity index 100%
rename from src/panfrost/bifrost/compiler.h
rename to src/panfrost/compiler/compiler.h
diff --git a/src/panfrost/bifrost/disassemble.c b/src/panfrost/compiler/disassemble.c
similarity index 100%
rename from src/panfrost/bifrost/disassemble.c
rename to src/panfrost/compiler/disassemble.c
diff --git a/src/panfrost/bifrost/disassemble.h b/src/panfrost/compiler/disassemble.h
similarity index 100%
rename from src/panfrost/bifrost/disassemble.h
rename to src/panfrost/compiler/disassemble.h
diff --git a/src/panfrost/bifrost/gen_disasm.py b/src/panfrost/compiler/gen_disasm.py
similarity index 100%
rename from src/panfrost/bifrost/gen_disasm.py
rename to src/panfrost/compiler/gen_disasm.py
diff --git a/src/panfrost/bifrost/meson.build b/src/panfrost/compiler/meson.build
similarity index 100%
rename from src/panfrost/bifrost/meson.build
rename to src/panfrost/compiler/meson.build
diff --git a/src/panfrost/bifrost/nodearray.h b/src/panfrost/compiler/nodearray.h
similarity index 100%
rename from src/panfrost/bifrost/nodearray.h
rename to src/panfrost/compiler/nodearray.h
diff --git a/src/panfrost/bifrost/test/test-constant-fold.cpp b/src/panfrost/compiler/test/test-constant-fold.cpp
similarity index 100%
rename from src/panfrost/bifrost/test/test-constant-fold.cpp
rename to src/panfrost/compiler/test/test-constant-fold.cpp
diff --git a/src/panfrost/bifrost/test/test-dual-texture.cpp b/src/panfrost/compiler/test/test-dual-texture.cpp
similarity index 100%
rename from src/panfrost/bifrost/test/test-dual-texture.cpp
rename to src/panfrost/compiler/test/test-dual-texture.cpp
diff --git a/src/panfrost/bifrost/test/test-lower-swizzle.cpp b/src/panfrost/compiler/test/test-lower-swizzle.cpp
similarity index 100%
rename from src/panfrost/bifrost/test/test-lower-swizzle.cpp
rename to src/panfrost/compiler/test/test-lower-swizzle.cpp
diff --git a/src/panfrost/bifrost/test/test-message-preload.cpp b/src/panfrost/compiler/test/test-message-preload.cpp
similarity index 100%
rename from src/panfrost/bifrost/test/test-message-preload.cpp
rename to src/panfrost/compiler/test/test-message-preload.cpp
diff --git a/src/panfrost/bifrost/test/test-optimizer.cpp b/src/panfrost/compiler/test/test-optimizer.cpp
similarity index 100%
rename from src/panfrost/bifrost/test/test-optimizer.cpp
rename to src/panfrost/compiler/test/test-optimizer.cpp
diff --git a/src/panfrost/bifrost/test/test-pack-formats.cpp b/src/panfrost/compiler/test/test-pack-formats.cpp
similarity index 100%
rename from src/panfrost/bifrost/test/test-pack-formats.cpp
rename to src/panfrost/compiler/test/test-pack-formats.cpp
diff --git a/src/panfrost/bifrost/test/test-packing.cpp b/src/panfrost/compiler/test/test-packing.cpp
similarity index 100%
rename from src/panfrost/bifrost/test/test-packing.cpp
rename to src/panfrost/compiler/test/test-packing.cpp
diff --git a/src/panfrost/bifrost/test/test-scheduler-predicates.cpp b/src/panfrost/compiler/test/test-scheduler-predicates.cpp
similarity index 100%
rename from src/panfrost/bifrost/test/test-scheduler-predicates.cpp
rename to src/panfrost/compiler/test/test-scheduler-predicates.cpp
diff --git a/src/panfrost/bifrost/valhall/ISA.xml b/src/panfrost/compiler/valhall/ISA.xml
similarity index 100%
rename from src/panfrost/bifrost/valhall/ISA.xml
rename to src/panfrost/compiler/valhall/ISA.xml
diff --git a/src/panfrost/bifrost/valhall/asm.py b/src/panfrost/compiler/valhall/asm.py
similarity index 100%
rename from src/panfrost/bifrost/valhall/asm.py
rename to src/panfrost/compiler/valhall/asm.py
diff --git a/src/panfrost/bifrost/valhall/disasm.py b/src/panfrost/compiler/valhall/disasm.py
similarity index 100%
rename from src/panfrost/bifrost/valhall/disasm.py
rename to src/panfrost/compiler/valhall/disasm.py
diff --git a/src/panfrost/bifrost/valhall/disassemble.h b/src/panfrost/compiler/valhall/disassemble.h
similarity index 100%
rename from src/panfrost/bifrost/valhall/disassemble.h
rename to src/panfrost/compiler/valhall/disassemble.h
diff --git a/src/panfrost/bifrost/valhall/meson.build b/src/panfrost/compiler/valhall/meson.build
similarity index 100%
rename from src/panfrost/bifrost/valhall/meson.build
rename to src/panfrost/compiler/valhall/meson.build
diff --git a/src/panfrost/bifrost/valhall/test-assembly.py b/src/panfrost/compiler/valhall/test-assembly.py
similarity index 100%
rename from src/panfrost/bifrost/valhall/test-assembly.py
rename to src/panfrost/compiler/valhall/test-assembly.py
diff --git a/src/panfrost/bifrost/valhall/test/assembler-cases.txt b/src/panfrost/compiler/valhall/test/assembler-cases.txt
similarity index 100%
rename from src/panfrost/bifrost/valhall/test/assembler-cases.txt
rename to src/panfrost/compiler/valhall/test/assembler-cases.txt
diff --git a/src/panfrost/bifrost/valhall/test/negative-cases.txt b/src/panfrost/compiler/valhall/test/negative-cases.txt
similarity index 100%
rename from src/panfrost/bifrost/valhall/test/negative-cases.txt
rename to src/panfrost/compiler/valhall/test/negative-cases.txt
diff --git a/src/panfrost/bifrost/valhall/test/test-add-imm.cpp b/src/panfrost/compiler/valhall/test/test-add-imm.cpp
similarity index 100%
rename from src/panfrost/bifrost/valhall/test/test-add-imm.cpp
rename to src/panfrost/compiler/valhall/test/test-add-imm.cpp
diff --git a/src/panfrost/bifrost/valhall/test/test-disassembler.c b/src/panfrost/compiler/valhall/test/test-disassembler.c
similarity index 100%
rename from src/panfrost/bifrost/valhall/test/test-disassembler.c
rename to src/panfrost/compiler/valhall/test/test-disassembler.c
diff --git a/src/panfrost/bifrost/valhall/test/test-insert-flow.cpp b/src/panfrost/compiler/valhall/test/test-insert-flow.cpp
similarity index 100%
rename from src/panfrost/bifrost/valhall/test/test-insert-flow.cpp
rename to src/panfrost/compiler/valhall/test/test-insert-flow.cpp
diff --git a/src/panfrost/bifrost/valhall/test/test-lower-constants.cpp b/src/panfrost/compiler/valhall/test/test-lower-constants.cpp
similarity index 100%
rename from src/panfrost/bifrost/valhall/test/test-lower-constants.cpp
rename to src/panfrost/compiler/valhall/test/test-lower-constants.cpp
diff --git a/src/panfrost/bifrost/valhall/test/test-lower-isel.cpp b/src/panfrost/compiler/valhall/test/test-lower-isel.cpp
similarity index 100%
rename from src/panfrost/bifrost/valhall/test/test-lower-isel.cpp
rename to src/panfrost/compiler/valhall/test/test-lower-isel.cpp
diff --git a/src/panfrost/bifrost/valhall/test/test-mark-last.cpp b/src/panfrost/compiler/valhall/test/test-mark-last.cpp
similarity index 100%
rename from src/panfrost/bifrost/valhall/test/test-mark-last.cpp
rename to src/panfrost/compiler/valhall/test/test-mark-last.cpp
diff --git a/src/panfrost/bifrost/valhall/test/test-merge-flow.cpp b/src/panfrost/compiler/valhall/test/test-merge-flow.cpp
similarity index 100%
rename from src/panfrost/bifrost/valhall/test/test-merge-flow.cpp
rename to src/panfrost/compiler/valhall/test/test-merge-flow.cpp
diff --git a/src/panfrost/bifrost/valhall/test/test-packing.cpp b/src/panfrost/compiler/valhall/test/test-packing.cpp
similarity index 100%
rename from src/panfrost/bifrost/valhall/test/test-packing.cpp
rename to src/panfrost/compiler/valhall/test/test-packing.cpp
diff --git a/src/panfrost/bifrost/valhall/test/test-validate-fau.cpp b/src/panfrost/compiler/valhall/test/test-validate-fau.cpp
similarity index 100%
rename from src/panfrost/bifrost/valhall/test/test-validate-fau.cpp
rename to src/panfrost/compiler/valhall/test/test-validate-fau.cpp
diff --git a/src/panfrost/bifrost/valhall/va_compiler.h b/src/panfrost/compiler/valhall/va_compiler.h
similarity index 100%
rename from src/panfrost/bifrost/valhall/va_compiler.h
rename to src/panfrost/compiler/valhall/va_compiler.h
diff --git a/src/panfrost/bifrost/valhall/va_insert_flow.c b/src/panfrost/compiler/valhall/va_insert_flow.c
similarity index 100%
rename from src/panfrost/bifrost/valhall/va_insert_flow.c
rename to src/panfrost/compiler/valhall/va_insert_flow.c
diff --git a/src/panfrost/bifrost/valhall/va_lower_constants.c b/src/panfrost/compiler/valhall/va_lower_constants.c
similarity index 100%
rename from src/panfrost/bifrost/valhall/va_lower_constants.c
rename to src/panfrost/compiler/valhall/va_lower_constants.c
diff --git a/src/panfrost/bifrost/valhall/va_lower_isel.c b/src/panfrost/compiler/valhall/va_lower_isel.c
similarity index 100%
rename from src/panfrost/bifrost/valhall/va_lower_isel.c
rename to src/panfrost/compiler/valhall/va_lower_isel.c
diff --git a/src/panfrost/bifrost/valhall/va_lower_split_64bit.c b/src/panfrost/compiler/valhall/va_lower_split_64bit.c
similarity index 100%
rename from src/panfrost/bifrost/valhall/va_lower_split_64bit.c
rename to src/panfrost/compiler/valhall/va_lower_split_64bit.c
diff --git a/src/panfrost/bifrost/valhall/va_mark_last.c b/src/panfrost/compiler/valhall/va_mark_last.c
similarity index 100%
rename from src/panfrost/bifrost/valhall/va_mark_last.c
rename to src/panfrost/compiler/valhall/va_mark_last.c
diff --git a/src/panfrost/bifrost/valhall/va_merge_flow.c b/src/panfrost/compiler/valhall/va_merge_flow.c
similarity index 100%
rename from src/panfrost/bifrost/valhall/va_merge_flow.c
rename to src/panfrost/compiler/valhall/va_merge_flow.c
diff --git a/src/panfrost/bifrost/valhall/va_optimize.c b/src/panfrost/compiler/valhall/va_optimize.c
similarity index 100%
rename from src/panfrost/bifrost/valhall/va_optimize.c
rename to src/panfrost/compiler/valhall/va_optimize.c
diff --git a/src/panfrost/bifrost/valhall/va_pack.c b/src/panfrost/compiler/valhall/va_pack.c
similarity index 100%
rename from src/panfrost/bifrost/valhall/va_pack.c
rename to src/panfrost/compiler/valhall/va_pack.c
diff --git a/src/panfrost/bifrost/valhall/va_perf.c b/src/panfrost/compiler/valhall/va_perf.c
similarity index 100%
rename from src/panfrost/bifrost/valhall/va_perf.c
rename to src/panfrost/compiler/valhall/va_perf.c
diff --git a/src/panfrost/bifrost/valhall/va_validate.c b/src/panfrost/compiler/valhall/va_validate.c
similarity index 100%
rename from src/panfrost/bifrost/valhall/va_validate.c
rename to src/panfrost/compiler/valhall/va_validate.c
diff --git a/src/panfrost/bifrost/valhall/valhall.c.py b/src/panfrost/compiler/valhall/valhall.c.py
similarity index 100%
rename from src/panfrost/bifrost/valhall/valhall.c.py
rename to src/panfrost/compiler/valhall/valhall.c.py
diff --git a/src/panfrost/bifrost/valhall/valhall.h b/src/panfrost/compiler/valhall/valhall.h
similarity index 100%
rename from src/panfrost/bifrost/valhall/valhall.h
rename to src/panfrost/compiler/valhall/valhall.h
diff --git a/src/panfrost/bifrost/valhall/valhall.py b/src/panfrost/compiler/valhall/valhall.py
similarity index 100%
rename from src/panfrost/bifrost/valhall/valhall.py
rename to src/panfrost/compiler/valhall/valhall.py
diff --git a/src/panfrost/bifrost/valhall/valhall_enums.h.py b/src/panfrost/compiler/valhall/valhall_enums.h.py
similarity index 100%
rename from src/panfrost/bifrost/valhall/valhall_enums.h.py
rename to src/panfrost/compiler/valhall/valhall_enums.h.py
diff --git a/src/panfrost/lib/genxml/decode.c b/src/panfrost/lib/genxml/decode.c
index aa92af16d2e..db214f31b88 100644
--- a/src/panfrost/lib/genxml/decode.c
+++ b/src/panfrost/lib/genxml/decode.c
@@ -33,8 +33,8 @@
 #include <stdlib.h>
 #include <genxml/gen_macros.h>
 
-#include "bifrost/disassemble.h"
-#include "bifrost/valhall/disassemble.h"
+#include "compiler/disassemble.h"
+#include "compiler/valhall/disassemble.h"
 #include "midgard/disassemble.h"
 #include "util/set.h"
 
diff --git a/src/panfrost/lib/pan_shader.c b/src/panfrost/lib/pan_shader.c
index b956183ce7b..4386eddc598 100644
--- a/src/panfrost/lib/pan_shader.c
+++ b/src/panfrost/lib/pan_shader.c
@@ -29,7 +29,7 @@
 #if PAN_ARCH <= 5
 #include "panfrost/midgard/midgard_compile.h"
 #else
-#include "panfrost/bifrost/bifrost_compile.h"
+#include "panfrost/compiler/bifrost_compile.h"
 #endif
 
 const nir_shader_compiler_options *
diff --git a/src/panfrost/meson.build b/src/panfrost/meson.build
index 66847f64569..c3b9e651276 100644
--- a/src/panfrost/meson.build
+++ b/src/panfrost/meson.build
@@ -24,7 +24,7 @@ inc_panfrost_hw = include_directories([
 ])
 
 inc_panfrost = include_directories([
-   '.', 'include', 'shared', 'midgard', 'bifrost', 'lib'
+   '.', 'include', 'shared', 'midgard', 'compiler', 'lib'
 ])
 
 compile_args_panfrost = [
@@ -34,7 +34,7 @@ compile_args_panfrost = [
 subdir('shared')
 subdir('util')
 subdir('midgard')
-subdir('bifrost')
+subdir('compiler')
 
 if with_gallium_panfrost or with_panfrost_vk
    subdir('lib')
@@ -42,7 +42,7 @@ if with_gallium_panfrost or with_panfrost_vk
 endif
 
 files_bifrost = files(
-  'bifrost/cmdline.c',
+  'compiler/cmdline.c',
 )
 
 bifrost_compiler = executable(