From f06db4d54c1a83005e4e0e00a9d2fdeb5bface29 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Wed, 11 Mar 2020 20:08:03 -0400 Subject: [PATCH] panfrost: Move lcra to panfrost/util We'll want to use it for the Bifrost RA as well. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/panfrost/Makefile.sources | 1 - src/panfrost/midgard/compiler.h | 2 +- src/panfrost/midgard/meson.build | 1 - src/panfrost/midgard/midgard_ra.c | 1 - src/panfrost/{midgard => util}/lcra.c | 0 src/panfrost/{midgard => util}/lcra.h | 0 src/panfrost/util/meson.build | 2 ++ 7 files changed, 3 insertions(+), 4 deletions(-) rename src/panfrost/{midgard => util}/lcra.c (100%) rename src/panfrost/{midgard => util}/lcra.h (100%) diff --git a/src/panfrost/Makefile.sources b/src/panfrost/Makefile.sources index fd58252345a..212a1d7e540 100644 --- 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 6614439fbfb..bc43309c7a1 100644 --- 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 ba69b3fe55a..8b93b4fa128 100644 --- 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 ae6d0efc6d2..48122c4967a 100644 --- 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 76e2249b60e..a39ad5130bb 100644 --- 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', -- 2.30.2