amd/common: use generated register header

2019-05-07 01:08:43 +02:00
parent 853ef5ccba
commit f480b8aaa4
26 changed files with 26 additions and 16362 deletions
--- a/src/amd/Android.common.mk
+++ b/src/amd/Android.common.mk
@@ -47,6 +47,9 @@ $(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@
 $(intermediates)/common/sid_tables.h: $(LOCAL_PATH)/common/sid_tables.py $(LOCAL_PATH)/common/sid.h $(LOCAL_PATH)/registers/amdgfxregs.json $(LOCAL_PATH)/registers/pkt3.json
 	$(transform-generated-source)

+$(intermediates)/common/amdgfxregs.h: $(LOCAL_PATH)/registers/makeregheader.py $(LOCAL_PATH)/registers/amdgfxregs.json $(LOCAL_PATH)/registers/pkt3.json
+	$(transform-generated-source) --sort address --guard AMDGFXREGS_H
+
 LOCAL_C_INCLUDES := \
 	$(MESA_TOP)/include \
 	$(MESA_TOP)/src \
--- a/src/amd/Makefile.sources
+++ b/src/amd/Makefile.sources
@@ -1,5 +1,4 @@
 COMMON_HEADER_FILES = \
-	common/gfx9d.h \
 	common/sid.h \
 	common/amd_family.h \
 	common/amd_kernel_code_t.h
@@ -64,4 +63,5 @@ AMD_DEBUG_FILES = \
 	common/ac_debug.h

 AMD_GENERATED_FILES = \
+	common/amdgfxregs.h \
 	common/sid_tables.h
--- a/src/amd/common/ac_debug.c
+++ b/src/amd/common/ac_debug.c
@@ -34,7 +34,6 @@
 #include <inttypes.h>

 #include "sid.h"
-#include "gfx9d.h"
 #include "sid_tables.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
--- a/src/amd/common/ac_gpu_info.c
+++ b/src/amd/common/ac_gpu_info.c
@@ -25,7 +25,6 @@

 #include "ac_gpu_info.h"
 #include "sid.h"
-#include "gfx9d.h"

 #include "util/u_math.h"

--- a/src/amd/common/gfx9d.h
+++ b/src/amd/common/gfx9d.h
--- a/src/amd/common/meson.build
+++ b/src/amd/common/meson.build
@@ -26,6 +26,14 @@ sid_tables_h = custom_target(
  capture : true,
 )

+amdgfxregs_h = custom_target(
+  'amdgfxregs_h',
+  input : ['../registers/makeregheader.py', '../registers/amdgfxregs.json', '../registers/pkt3.json'],
+  output : 'amdgfxregs.h',
+  command : [prog_python, '@INPUT@', '--sort', 'address', '--guard', 'AMDGFXREGS_H'],
+  capture : true,
+)
+
 amd_common_files = files(
  'ac_binary.c',
  'ac_binary.h',
@@ -52,7 +60,7 @@ amd_common_files = files(

 libamd_common = static_library(
  'amd_common',
-  [amd_common_files, sid_tables_h],
+  [amd_common_files, sid_tables_h, amdgfxregs_h],
  include_directories : [
    inc_common, inc_compiler, inc_mesa, inc_mapi, inc_amd,
  ],
@@ -63,3 +71,5 @@ libamd_common = static_library(
  c_args : [c_vis_args],
  cpp_args : [cpp_vis_args],
 )
+
+idep_amdgfxregs_h = declare_dependency(sources : [amdgfxregs_h])
--- a/src/amd/common/sid.h
+++ b/src/amd/common/sid.h
--- a/src/amd/vulkan/meson.build
+++ b/src/amd/vulkan/meson.build
@@ -142,7 +142,7 @@ libvulkan_radeon = shared_library(
  dependencies : [
    dep_llvm, dep_libdrm_amdgpu, dep_thread, dep_elf, dep_dl, dep_m,
    dep_valgrind, radv_deps,
-    idep_nir, idep_vulkan_util,
+    idep_nir, idep_vulkan_util, idep_amdgfxregs_h,
  ],
  c_args : [c_vis_args, no_override_init_args, radv_flags],
  cpp_args : [cpp_vis_args, radv_flags],
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -30,7 +30,6 @@
 #include "radv_shader.h"
 #include "radv_cs.h"
 #include "sid.h"
-#include "gfx9d.h"
 #include "vk_format.h"
 #include "radv_debug.h"
 #include "radv_meta.h"
--- a/src/amd/vulkan/radv_debug.c
+++ b/src/amd/vulkan/radv_debug.c
@@ -31,7 +31,6 @@

 #include "util/mesa-sha1.h"
 #include "sid.h"
-#include "gfx9d.h"
 #include "ac_debug.h"
 #include "radv_debug.h"
 #include "radv_shader.h"
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -44,7 +44,6 @@
 #include "vk_format.h"
 #include "sid.h"
 #include "git_sha1.h"
-#include "gfx9d.h"
 #include "util/build_id.h"
 #include "util/debug.h"
 #include "util/mesa-sha1.h"
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -31,9 +31,9 @@
 #include "vk_util.h"
 #include "radv_radeon_winsys.h"
 #include "sid.h"
-#include "gfx9d.h"
 #include "util/debug.h"
 #include "util/u_atomic.h"
+
 static unsigned
 radv_choose_tiling(struct radv_device *device,
 		   const struct radv_image_create_info *create_info)
--- a/src/amd/vulkan/radv_nir_to_llvm.c
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
@@ -36,7 +36,6 @@
 #include <llvm-c/Transforms/Utils.h>

 #include "sid.h"
-#include "gfx9d.h"
 #include "ac_binary.h"
 #include "ac_llvm_util.h"
 #include "ac_llvm_build.h"
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -40,7 +40,6 @@
 #include <llvm-c/TargetMachine.h>

 #include "sid.h"
-#include "gfx9d.h"
 #include "ac_binary.h"
 #include "ac_llvm_util.h"
 #include "ac_nir_to_llvm.h"
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -40,7 +40,6 @@
 #include <llvm-c/Support.h>

 #include "sid.h"
-#include "gfx9d.h"
 #include "ac_binary.h"
 #include "ac_llvm_util.h"
 #include "ac_nir_to_llvm.h"
--- a/src/amd/vulkan/si_cmd_buffer.c
+++ b/src/amd/vulkan/si_cmd_buffer.c
@@ -31,7 +31,6 @@
 #include "radv_shader.h"
 #include "radv_cs.h"
 #include "sid.h"
-#include "gfx9d.h"
 #include "radv_util.h"
 #include "main/macros.h"

--- a/src/gallium/drivers/radeonsi/meson.build
+++ b/src/gallium/drivers/radeonsi/meson.build
@@ -107,7 +107,7 @@ libradeonsi = static_library(
  ],
  c_args : ['-Wstrict-overflow=0', c_vis_args],
  cpp_args : [cpp_vis_args],
-  dependencies : [dep_llvm, dep_clock, dep_libdrm_radeon, idep_nir_headers],
+  dependencies : [dep_llvm, dep_clock, dep_libdrm_radeon, idep_nir_headers, idep_amdgfxregs_h],
 )

 driver_radeonsi = declare_dependency(
--- a/src/gallium/drivers/radeonsi/si_debug.c
+++ b/src/gallium/drivers/radeonsi/si_debug.c
@@ -25,7 +25,6 @@
 #include "si_pipe.h"
 #include "si_compute.h"
 #include "sid.h"
-#include "gfx9d.h"
 #include "sid_tables.h"
 #include "driver_ddebug/dd_util.h"
 #include "util/u_dump.h"
--- a/src/gallium/drivers/radeonsi/si_descriptors.c
+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
@@ -55,7 +55,6 @@

 #include "si_pipe.h"
 #include "sid.h"
-#include "gfx9d.h"

 #include "util/hash_table.h"
 #include "util/u_idalloc.h"
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -23,7 +23,7 @@
 */

 #include "si_build_pm4.h"
-#include "gfx9d.h"
+#include "sid.h"
 #include "si_query.h"

 #include "util/u_dual_blend.h"
--- a/src/gallium/drivers/radeonsi/si_state_binning.c
+++ b/src/gallium/drivers/radeonsi/si_state_binning.c
@@ -25,7 +25,7 @@
 /* This file handles register programming of primitive binning. */

 #include "si_build_pm4.h"
-#include "gfx9d.h"
+#include "sid.h"

 struct uvec2 {
 	unsigned x, y;
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -23,7 +23,7 @@
 */

 #include "si_build_pm4.h"
-#include "gfx9d.h"
+#include "sid.h"

 #include "util/u_index_modify.h"
 #include "util/u_log.h"
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -23,7 +23,7 @@
 */

 #include "si_build_pm4.h"
-#include "gfx9d.h"
+#include "sid.h"

 #include "compiler/nir/nir_serialize.h"
 #include "tgsi/tgsi_parse.h"
--- a/src/gallium/drivers/radeonsi/si_texture.c
+++ b/src/gallium/drivers/radeonsi/si_texture.c
@@ -36,8 +36,7 @@
 #include <errno.h>
 #include <inttypes.h>
 #include "state_tracker/drm_driver.h"
-#include "amd/common/sid.h"
-#include "amd/common/gfx9d.h"
+#include "sid.h"

 static enum radeon_surf_mode
 si_choose_tiling(struct si_screen *sscreen,
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
@@ -40,7 +40,6 @@
 #include <sys/stat.h>
 #include "amd/common/ac_llvm_util.h"
 #include "amd/common/sid.h"
-#include "amd/common/gfx9d.h"

 #ifndef AMDGPU_INFO_NUM_VRAM_CPU_PAGE_FAULTS
 #define AMDGPU_INFO_NUM_VRAM_CPU_PAGE_FAULTS	0x1E
--- a/src/gallium/winsys/amdgpu/drm/meson.build
+++ b/src/gallium/winsys/amdgpu/drm/meson.build
@@ -31,5 +31,5 @@ libamdgpuwinsys = static_library(
  c_args : [c_vis_args],
  cpp_args : [cpp_vis_args],
  link_with : libamdgpu_addrlib,
-  dependencies : [dep_llvm, dep_libdrm_amdgpu],
+  dependencies : [dep_llvm, dep_libdrm_amdgpu, idep_amdgfxregs_h],
 )