freedreno: move a2xx disasm out of gallium

So that it can be reused by the decode tools.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6070>

.gitlab-ci/test-source-dep.yml

@@ -96,6 +96,7 @@
       - src/freedreno/common/**/*
       - src/freedreno/drm/**/*
       - src/freedreno/fdl/**/*
+      - src/freedreno/ir2/**/*
       - src/freedreno/ir3/**/*
       - src/freedreno/perfcntrs/**/*
       - src/freedreno/registers/**/*

src/freedreno/ir2/disasm-a2xx.c

@@ -425,6 +425,9 @@ static void print_fetch_tex(instr_fetch_t *fetch)
 		printf(" LOD(%u)", tex->use_comp_lod);
 		printf(" LOD_BIAS(%u)", tex->lod_bias);
 	}
+	if (tex->use_reg_lod) {
+		printf(" REG_LOD(%u)", tex->use_reg_lod);
+	}
 	if (tex->use_reg_gradients)
 		printf(" USE_REG_GRADIENTS");
 	printf(" LOCATION(%s)", sample_loc[tex->sample_location]);

src/freedreno/ir2/meson.build

@@ -0,0 +1,37 @@
+# Copyright © 2020 Google, Inc
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+libfreedreno_ir2 = static_library(
+  'freedreno_ir2',
+  [
+    'disasm-a2xx.c',
+    'instr-a2xx.h',
+    freedreno_xml_header_files,
+  ],
+  include_directories : [
+    inc_freedreno,
+    inc_include,
+    inc_src,
+  ],
+  c_args : [no_override_init_args],
+  gnu_symbol_visibility : 'hidden',
+  dependencies : [],
+  build_by_default : false,
+)

src/freedreno/meson.build

@@ -24,6 +24,7 @@ inc_freedreno_rnn = include_directories('rnn')
 subdir('common')
 subdir('registers')
 subdir('drm')
+subdir('ir2')
 subdir('ir3')
 subdir('fdl')
 subdir('perfcntrs')

src/gallium/drivers/freedreno/a2xx/fd2_gmem.c

@@ -40,7 +40,7 @@
 #include "fd2_util.h"
 #include "fd2_zsa.h"
 #include "fd2_draw.h"
-#include "instr-a2xx.h"
+#include "ir2/instr-a2xx.h"
 
 static uint32_t fmt2swap(enum pipe_format format)
 {

src/gallium/drivers/freedreno/a2xx/fd2_program.c

@@ -40,7 +40,7 @@
 #include "fd2_program.h"
 #include "fd2_texture.h"
 #include "fd2_util.h"
-#include "instr-a2xx.h"
+#include "ir2/instr-a2xx.h"
 
 static struct fd2_shader_stateobj *
 create_shader(struct pipe_context *pctx, gl_shader_stage type)

src/gallium/drivers/freedreno/a2xx/ir2_private.h

@@ -32,7 +32,7 @@
 
 #include "ir2.h"
 #include "fd2_program.h"
-#include "instr-a2xx.h"
+#include "ir2/instr-a2xx.h"
 
 enum ir2_src_type {
 	IR2_SRC_SSA,

src/gallium/drivers/freedreno/meson.build

@@ -57,7 +57,6 @@ files_libfreedreno = files(
   'freedreno_texture.h',
   'freedreno_util.c',
   'freedreno_util.h',
-  'a2xx/disasm-a2xx.c',
   'a2xx/fd2_blend.c',
   'a2xx/fd2_blend.h',
   'a2xx/fd2_context.c',
@@ -84,7 +83,6 @@ files_libfreedreno = files(
   'a2xx/fd2_util.h',
   'a2xx/fd2_zsa.c',
   'a2xx/fd2_zsa.h',
-  'a2xx/instr-a2xx.h',
   'a2xx/ir2.c',
   'a2xx/ir2.h',
   'a2xx/ir2_assemble.c',
@@ -251,6 +249,7 @@ driver_freedreno = declare_dependency(
     libfreedrenowinsys,
     libfreedreno,
     libfreedreno_drm,
+    libfreedreno_ir2,
     libfreedreno_ir3,
     libfreedreno_layout,
     libfreedreno_perfcntrs
@@ -289,6 +288,7 @@ gmemtool = executable(
   link_with : [
     libfreedreno,
     libfreedreno_drm,
+    libfreedreno_ir2,
     libfreedreno_ir3,
     libfreedreno_layout,
     libgallium,