panfrost: Move lcra to panfrost/util

We'll want to use it for the Bifrost RA as well.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4158>

diff --git a/src/panfrost/Makefile.sources b/src/panfrost/Makefile.sources
index fd58252..212a1d7 100644 (file)
--- a/src/panfrost/Makefile.sources
+++ b/src/panfrost/Makefile.sources
@@ -54,7 +54,6 @@ midgard_FILES := \
         midgard/mir_promote_uniforms.c \
         midgard/mir_squeeze.c \
         midgard/nir_undef_to_zero.c \
-        midgard/lcra.c
 
 shared_FILES := \
         shared/pan_minmax_cache.c \

diff --git a/src/panfrost/midgard/compiler.h b/src/panfrost/midgard/compiler.h
index 6614439..bc43309 100644 (file)
--- a/src/panfrost/midgard/compiler.h
+++ b/src/panfrost/midgard/compiler.h
@@ -28,7 +28,6 @@
 #include "helpers.h"
 #include "midgard_compile.h"
 #include "midgard_ops.h"
-#include "lcra.h"
 
 #include "util/hash_table.h"
 #include "util/u_dynarray.h"
@@ -39,6 +38,7 @@
 #include "compiler/nir_types.h"
 #include "compiler/nir/nir.h"
 #include "panfrost/util/pan_ir.h"
+#include "panfrost/util/lcra.h"
 
 /* Forward declare */
 struct midgard_block;

diff --git a/src/panfrost/midgard/meson.build b/src/panfrost/midgard/meson.build
index ba69b3f..8b93b4f 100644 (file)
--- a/src/panfrost/midgard/meson.build
+++ b/src/panfrost/midgard/meson.build
@@ -41,7 +41,6 @@ libpanfrost_midgard_files = files(
   'midgard_errata_lod.c',
   'nir_undef_to_zero.c',
   'disassemble.c',
-  'lcra.c'
 )
 
 midgard_nir_algebraic_c = custom_target(

diff --git a/src/panfrost/midgard/midgard_ra.c b/src/panfrost/midgard/midgard_ra.c
index ae6d0ef..48122c4 100644 (file)
--- a/src/panfrost/midgard/midgard_ra.c
+++ b/src/panfrost/midgard/midgard_ra.c
@@ -26,7 +26,6 @@
 #include "midgard_ops.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
-#include "lcra.h"
 #include "midgard_quirks.h"
 
 struct phys_reg {

diff --git a/src/panfrost/midgard/lcra.c b/src/panfrost/util/lcra.c
similarity index 100%
rename from src/panfrost/midgard/lcra.c
rename to src/panfrost/util/lcra.c

diff --git a/src/panfrost/midgard/lcra.h b/src/panfrost/util/lcra.h
similarity index 100%
rename from src/panfrost/midgard/lcra.h
rename to src/panfrost/util/lcra.h

diff --git a/src/panfrost/util/meson.build b/src/panfrost/util/meson.build
index 76e2249..a39ad51 100644 (file)
--- a/src/panfrost/util/meson.build
+++ b/src/panfrost/util/meson.build
@@ -20,6 +20,8 @@
 # SOFTWARE.
 
 libpanfrost_util_files = files(
+  'lcra.c',
+  'lcra.h',
   'pan_ir.c',
   'pan_ir.h',
   'pan_liveness.c',