OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

amd/common: use generated register header

Browse Source
This commit is contained in:
Nicolai Hähnle
2019-05-07 01:08:43 +02:00
committed by Marek Olšák
parent 853ef5ccba
commit f480b8aaa4
26 changed files with 26 additions and 16362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/amd/Android.common.mk
View File

@@ -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 $(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) $(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 := \ LOCAL_C_INCLUDES := \
$(MESA_TOP)/include \ $(MESA_TOP)/include \
$(MESA_TOP)/src \ $(MESA_TOP)/src \

2
src/amd/Makefile.sources
View File

@@ -1,5 +1,4 @@
COMMON_HEADER_FILES = \ COMMON_HEADER_FILES = \
common/gfx9d.h \
common/sid.h \ common/sid.h \
common/amd_family.h \ common/amd_family.h \
common/amd_kernel_code_t.h common/amd_kernel_code_t.h
@@ -64,4 +63,5 @@ AMD_DEBUG_FILES = \
common/ac_debug.h common/ac_debug.h
AMD_GENERATED_FILES = \ AMD_GENERATED_FILES = \
common/amdgfxregs.h \
common/sid_tables.h common/sid_tables.h

1
src/amd/common/ac_debug.c
View File

@@ -34,7 +34,6 @@
#include <inttypes.h> #include <inttypes.h>
#include "sid.h" #include "sid.h"
#include "gfx9d.h"
#include "sid_tables.h" #include "sid_tables.h"
#include "util/u_math.h" #include "util/u_math.h"
#include "util/u_memory.h" #include "util/u_memory.h"

1
src/amd/common/ac_gpu_info.c
View File

@@ -25,7 +25,6 @@
#include "ac_gpu_info.h" #include "ac_gpu_info.h"
#include "sid.h" #include "sid.h"
#include "gfx9d.h"
#include "util/u_math.h" #include "util/u_math.h"

7435
src/amd/common/gfx9d.h
View File

File diff suppressed because it is too large Load Diff

12
src/amd/common/meson.build
View File

@@ -26,6 +26,14 @@ sid_tables_h = custom_target(
capture : true, 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( amd_common_files = files(
'ac_binary.c', 'ac_binary.c',
'ac_binary.h', 'ac_binary.h',
@@ -52,7 +60,7 @@ amd_common_files = files(
libamd_common = static_library( libamd_common = static_library(
'amd_common', 'amd_common',
[amd_common_files, sid_tables_h], [amd_common_files, sid_tables_h, amdgfxregs_h],
include_directories : [ include_directories : [
inc_common, inc_compiler, inc_mesa, inc_mapi, inc_amd, inc_common, inc_compiler, inc_mesa, inc_mapi, inc_amd,
], ],
@@ -63,3 +71,5 @@ libamd_common = static_library(
c_args : [c_vis_args], c_args : [c_vis_args],
cpp_args : [cpp_vis_args], cpp_args : [cpp_vis_args],
) )
idep_amdgfxregs_h = declare_dependency(sources : [amdgfxregs_h])

8905
src/amd/common/sid.h
View File

File diff suppressed because it is too large Load Diff

2
src/amd/vulkan/meson.build
View File

@@ -142,7 +142,7 @@ libvulkan_radeon = shared_library(
dependencies : [ dependencies : [
dep_llvm, dep_libdrm_amdgpu, dep_thread, dep_elf, dep_dl, dep_m, dep_llvm, dep_libdrm_amdgpu, dep_thread, dep_elf, dep_dl, dep_m,
dep_valgrind, radv_deps, 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], c_args : [c_vis_args, no_override_init_args, radv_flags],
cpp_args : [cpp_vis_args, radv_flags], cpp_args : [cpp_vis_args, radv_flags],

1
src/amd/vulkan/radv_cmd_buffer.c
View File

@@ -30,7 +30,6 @@
#include "radv_shader.h" #include "radv_shader.h"
#include "radv_cs.h" #include "radv_cs.h"
#include "sid.h" #include "sid.h"
#include "gfx9d.h"
#include "vk_format.h" #include "vk_format.h"
#include "radv_debug.h" #include "radv_debug.h"
#include "radv_meta.h" #include "radv_meta.h"

1
src/amd/vulkan/radv_debug.c
View File

@@ -31,7 +31,6 @@
#include "util/mesa-sha1.h" #include "util/mesa-sha1.h"
#include "sid.h" #include "sid.h"
#include "gfx9d.h"
#include "ac_debug.h" #include "ac_debug.h"
#include "radv_debug.h" #include "radv_debug.h"
#include "radv_shader.h" #include "radv_shader.h"

1
src/amd/vulkan/radv_device.c
View File

@@ -44,7 +44,6 @@
#include "vk_format.h" #include "vk_format.h"
#include "sid.h" #include "sid.h"
#include "git_sha1.h" #include "git_sha1.h"
#include "gfx9d.h"
#include "util/build_id.h" #include "util/build_id.h"
#include "util/debug.h" #include "util/debug.h"
#include "util/mesa-sha1.h" #include "util/mesa-sha1.h"

2
src/amd/vulkan/radv_image.c
View File

@@ -31,9 +31,9 @@
#include "vk_util.h" #include "vk_util.h"
#include "radv_radeon_winsys.h" #include "radv_radeon_winsys.h"
#include "sid.h" #include "sid.h"
#include "gfx9d.h"
#include "util/debug.h" #include "util/debug.h"
#include "util/u_atomic.h" #include "util/u_atomic.h"
static unsigned static unsigned
radv_choose_tiling(struct radv_device *device, radv_choose_tiling(struct radv_device *device,
const struct radv_image_create_info *create_info) const struct radv_image_create_info *create_info)

1
src/amd/vulkan/radv_nir_to_llvm.c
View File

@@ -36,7 +36,6 @@
#include <llvm-c/Transforms/Utils.h> #include <llvm-c/Transforms/Utils.h>
#include "sid.h" #include "sid.h"
#include "gfx9d.h"
#include "ac_binary.h" #include "ac_binary.h"
#include "ac_llvm_util.h" #include "ac_llvm_util.h"
#include "ac_llvm_build.h" #include "ac_llvm_build.h"

1
src/amd/vulkan/radv_pipeline.c
View File

@@ -40,7 +40,6 @@
#include <llvm-c/TargetMachine.h> #include <llvm-c/TargetMachine.h>
#include "sid.h" #include "sid.h"
#include "gfx9d.h"
#include "ac_binary.h" #include "ac_binary.h"
#include "ac_llvm_util.h" #include "ac_llvm_util.h"
#include "ac_nir_to_llvm.h" #include "ac_nir_to_llvm.h"

1
src/amd/vulkan/radv_shader.c
View File

@@ -40,7 +40,6 @@
#include <llvm-c/Support.h> #include <llvm-c/Support.h>
#include "sid.h" #include "sid.h"
#include "gfx9d.h"
#include "ac_binary.h" #include "ac_binary.h"
#include "ac_llvm_util.h" #include "ac_llvm_util.h"
#include "ac_nir_to_llvm.h" #include "ac_nir_to_llvm.h"

1
src/amd/vulkan/si_cmd_buffer.c
View File

@@ -31,7 +31,6 @@
#include "radv_shader.h" #include "radv_shader.h"
#include "radv_cs.h" #include "radv_cs.h"
#include "sid.h" #include "sid.h"
#include "gfx9d.h"
#include "radv_util.h" #include "radv_util.h"
#include "main/macros.h" #include "main/macros.h"

2
src/gallium/drivers/radeonsi/meson.build
View File

@@ -107,7 +107,7 @@ libradeonsi = static_library(
], ],
c_args : ['-Wstrict-overflow=0', c_vis_args], c_args : ['-Wstrict-overflow=0', c_vis_args],
cpp_args : [cpp_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( driver_radeonsi = declare_dependency(

1
src/gallium/drivers/radeonsi/si_debug.c
View File

@@ -25,7 +25,6 @@
#include "si_pipe.h" #include "si_pipe.h"
#include "si_compute.h" #include "si_compute.h"
#include "sid.h" #include "sid.h"
#include "gfx9d.h"
#include "sid_tables.h" #include "sid_tables.h"
#include "driver_ddebug/dd_util.h" #include "driver_ddebug/dd_util.h"
#include "util/u_dump.h" #include "util/u_dump.h"

1
src/gallium/drivers/radeonsi/si_descriptors.c
View File

@@ -55,7 +55,6 @@
#include "si_pipe.h" #include "si_pipe.h"
#include "sid.h" #include "sid.h"
#include "gfx9d.h"
#include "util/hash_table.h" #include "util/hash_table.h"
#include "util/u_idalloc.h" #include "util/u_idalloc.h"

2
src/gallium/drivers/radeonsi/si_state.c
View File

@@ -23,7 +23,7 @@
*/ */
#include "si_build_pm4.h" #include "si_build_pm4.h"
#include "gfx9d.h" #include "sid.h"
#include "si_query.h" #include "si_query.h"
#include "util/u_dual_blend.h" #include "util/u_dual_blend.h"

2
src/gallium/drivers/radeonsi/si_state_binning.c
View File

@@ -25,7 +25,7 @@
/* This file handles register programming of primitive binning. */ /* This file handles register programming of primitive binning. */
#include "si_build_pm4.h" #include "si_build_pm4.h"
#include "gfx9d.h" #include "sid.h"
struct uvec2 { struct uvec2 {
unsigned x, y; unsigned x, y;

2
src/gallium/drivers/radeonsi/si_state_draw.c
View File

@@ -23,7 +23,7 @@
*/ */
#include "si_build_pm4.h" #include "si_build_pm4.h"
#include "gfx9d.h" #include "sid.h"
#include "util/u_index_modify.h" #include "util/u_index_modify.h"
#include "util/u_log.h" #include "util/u_log.h"

2
src/gallium/drivers/radeonsi/si_state_shaders.c
View File

@@ -23,7 +23,7 @@
*/ */
#include "si_build_pm4.h" #include "si_build_pm4.h"
#include "gfx9d.h" #include "sid.h"
#include "compiler/nir/nir_serialize.h" #include "compiler/nir/nir_serialize.h"
#include "tgsi/tgsi_parse.h" #include "tgsi/tgsi_parse.h"

3
src/gallium/drivers/radeonsi/si_texture.c
View File

@@ -36,8 +36,7 @@
#include <errno.h> #include <errno.h>
#include <inttypes.h> #include <inttypes.h>
#include "state_tracker/drm_driver.h" #include "state_tracker/drm_driver.h"
#include "amd/common/sid.h" #include "sid.h"
#include "amd/common/gfx9d.h"
static enum radeon_surf_mode static enum radeon_surf_mode
si_choose_tiling(struct si_screen *sscreen, si_choose_tiling(struct si_screen *sscreen,

1
src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
View File

@@ -40,7 +40,6 @@
#include <sys/stat.h> #include <sys/stat.h>
#include "amd/common/ac_llvm_util.h" #include "amd/common/ac_llvm_util.h"
#include "amd/common/sid.h" #include "amd/common/sid.h"
#include "amd/common/gfx9d.h"
#ifndef AMDGPU_INFO_NUM_VRAM_CPU_PAGE_FAULTS #ifndef AMDGPU_INFO_NUM_VRAM_CPU_PAGE_FAULTS
#define AMDGPU_INFO_NUM_VRAM_CPU_PAGE_FAULTS 0x1E #define AMDGPU_INFO_NUM_VRAM_CPU_PAGE_FAULTS 0x1E

2
src/gallium/winsys/amdgpu/drm/meson.build
View File

@@ -31,5 +31,5 @@ libamdgpuwinsys = static_library(
c_args : [c_vis_args], c_args : [c_vis_args],
cpp_args : [cpp_vis_args], cpp_args : [cpp_vis_args],
link_with : libamdgpu_addrlib, link_with : libamdgpu_addrlib,
dependencies : [dep_llvm, dep_libdrm_amdgpu], dependencies : [dep_llvm, dep_libdrm_amdgpu, idep_amdgfxregs_h],
) )