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

ac/registers: don't use the si, cik, vi names, use gfxN

Browse Source 
trivial
This commit is contained in:
Marek Olšák
2019-06-03 17:07:16 -04:00
parent f480b8aaa4
commit b2bbd1a27b
6 changed files with 1405 additions and 1405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,11 +121,11 @@ void ac_dump_reg(FILE *file, enum chip_class chip_class, unsigned offset,
if (chip_class >= GFX9) if (chip_class >= GFX9)
reg = find_register(gfx9_reg_table, ARRAY_SIZE(gfx9_reg_table), offset); reg = find_register(gfx9_reg_table, ARRAY_SIZE(gfx9_reg_table), offset);
else if (chip_class >= GFX8) else if (chip_class >= GFX8)
reg = find_register(vi_reg_table, ARRAY_SIZE(vi_reg_table), offset); reg = find_register(gfx8_reg_table, ARRAY_SIZE(gfx8_reg_table), offset);
else if (chip_class >= GFX7) else if (chip_class >= GFX7)
reg = find_register(cik_reg_table, ARRAY_SIZE(cik_reg_table), offset); reg = find_register(gfx7_reg_table, ARRAY_SIZE(gfx7_reg_table), offset);
else else
reg = find_register(si_reg_table, ARRAY_SIZE(si_reg_table), offset); reg = find_register(gfx6_reg_table, ARRAY_SIZE(gfx6_reg_table), offset);
if (reg) { if (reg) {
const char *reg_name = sid_strings + reg->name_offset; const char *reg_name = sid_strings + reg->name_offset;

2
src/amd/common/sid_tables.py
View File

@@ -358,7 +358,7 @@ def main():
raise raise
# The ac_debug code only distinguishes by chip_class # The ac_debug code only distinguishes by chip_class
regdb.merge_chips(['vi', 'fiji', 'stoney'], 'vi') regdb.merge_chips(['gfx8', 'fiji', 'stoney'], 'gfx8')
# Write it all out # Write it all out
w = TableWriter() w = TableWriter()

2754
src/amd/registers/amdgfxregs.json
View File

File diff suppressed because it is too large Load Diff

6
src/amd/registers/makeregheader.py
View File

@@ -43,9 +43,9 @@ from regdb import Object, RegisterDatabase, deduplicate_enums, deduplicate_regis
# Chips are sorted chronologically # Chips are sorted chronologically
CHIPS = [ CHIPS = [
Object(name='si', disambiguation='GFX6'), Object(name='gfx6', disambiguation='GFX6'),
Object(name='cik', disambiguation='GFX6'), Object(name='gfx7', disambiguation='GFX6'),
Object(name='vi', disambiguation='GFX6'), Object(name='gfx8', disambiguation='GFX6'),
Object(name='fiji', disambiguation='GFX6'), Object(name='fiji', disambiguation='GFX6'),
Object(name='stoney', disambiguation='GFX6'), Object(name='stoney', disambiguation='GFX6'),
Object(name='gfx9', disambiguation='GFX9'), Object(name='gfx9', disambiguation='GFX9'),

4
src/amd/registers/parseheader.py
View File

@@ -48,7 +48,7 @@ RE_set_value_no_shift = re.compile(r'\((\(unsigned\))?\(x\) & ([0-9a-fA-Fx]+)\)'
class HeaderParser(object): class HeaderParser(object):
def __init__(self, address_space): def __init__(self, address_space):
self.regdb = RegisterDatabase() self.regdb = RegisterDatabase()
self.chips = ['si', 'cik', 'vi', 'fiji', 'stoney', 'gfx9'] self.chips = ['gfx6', 'gfx7', 'gfx8', 'fiji', 'stoney', 'gfx9']
self.address_space = address_space self.address_space = address_space
def __fini_field(self): def __fini_field(self):
@@ -81,7 +81,7 @@ class HeaderParser(object):
def parse_header(self, filp): def parse_header(self, filp):
regdb = RegisterDatabase() regdb = RegisterDatabase()
chips = ['si', 'cik', 'vi', 'fiji', 'stoney', 'gfx9'] chips = ['gfx6', 'gfx7', 'gfx8', 'fiji', 'stoney', 'gfx9']
self.__regmap = None self.__regmap = None
self.__fields = None self.__fields = None

38
src/amd/registers/pkt3.json
View File

@@ -92,7 +92,7 @@
}, },
"register_mappings": [ "register_mappings": [
{ {
"chips": ["si", "cik", "vi", "fiji", "stoney"], "chips": ["gfx6", "gfx7", "gfx8", "fiji", "stoney"],
"map": {"at": 1044, "to": "pkt3"}, "map": {"at": 1044, "to": "pkt3"},
"name": "COMMAND", "name": "COMMAND",
"type_ref": "COMMAND" "type_ref": "COMMAND"
@@ -104,31 +104,31 @@
"type_ref": "COMMAND_gfx9" "type_ref": "COMMAND_gfx9"
}, },
{ {
"chips": ["si"], "chips": ["gfx6"],
"map": {"at": 880, "to": "pkt3"}, "map": {"at": 880, "to": "pkt3"},
"name": "CONTROL", "name": "CONTROL",
"type_ref": "CONTROL" "type_ref": "CONTROL"
}, },
{ {
"chips": ["cik", "vi", "fiji", "stoney", "gfx9"], "chips": ["gfx7", "gfx8", "fiji", "stoney", "gfx9"],
"map": {"at": 880, "to": "pkt3"}, "map": {"at": 880, "to": "pkt3"},
"name": "CONTROL", "name": "CONTROL",
"type_ref": "CONTROL_cik" "type_ref": "CONTROL_cik"
}, },
{ {
"chips": ["si", "cik", "vi", "fiji", "stoney", "gfx9"], "chips": ["gfx6", "gfx7", "gfx8", "fiji", "stoney", "gfx9"],
"map": {"at": 1040, "to": "pkt3"}, "map": {"at": 1040, "to": "pkt3"},
"name": "CP_DMA_WORD0", "name": "CP_DMA_WORD0",
"type_ref": "CP_DMA_WORD0" "type_ref": "CP_DMA_WORD0"
}, },
{ {
"chips": ["si"], "chips": ["gfx6"],
"map": {"at": 1041, "to": "pkt3"}, "map": {"at": 1041, "to": "pkt3"},
"name": "CP_DMA_WORD1", "name": "CP_DMA_WORD1",
"type_ref": "CP_DMA_WORD1" "type_ref": "CP_DMA_WORD1"
}, },
{ {
"chips": ["cik", "vi", "fiji", "stoney"], "chips": ["gfx7", "gfx8", "fiji", "stoney"],
"map": {"at": 1041, "to": "pkt3"}, "map": {"at": 1041, "to": "pkt3"},
"name": "CP_DMA_WORD1", "name": "CP_DMA_WORD1",
"type_ref": "CP_DMA_WORD1_cik" "type_ref": "CP_DMA_WORD1_cik"
@@ -140,25 +140,25 @@
"type_ref": "CP_DMA_WORD1_gfx9" "type_ref": "CP_DMA_WORD1_gfx9"
}, },
{ {
"chips": ["si", "cik", "vi", "fiji", "stoney", "gfx9"], "chips": ["gfx6", "gfx7", "gfx8", "fiji", "stoney", "gfx9"],
"map": {"at": 1042, "to": "pkt3"}, "map": {"at": 1042, "to": "pkt3"},
"name": "CP_DMA_WORD2", "name": "CP_DMA_WORD2",
"type_ref": "CP_DMA_WORD2" "type_ref": "CP_DMA_WORD2"
}, },
{ {
"chips": ["si", "cik", "vi", "fiji", "stoney", "gfx9"], "chips": ["gfx6", "gfx7", "gfx8", "fiji", "stoney", "gfx9"],
"map": {"at": 1043, "to": "pkt3"}, "map": {"at": 1043, "to": "pkt3"},
"name": "CP_DMA_WORD3", "name": "CP_DMA_WORD3",
"type_ref": "CP_DMA_WORD3" "type_ref": "CP_DMA_WORD3"
}, },
{ {
"chips": ["si"], "chips": ["gfx6"],
"map": {"at": 1280, "to": "pkt3"}, "map": {"at": 1280, "to": "pkt3"},
"name": "DMA_DATA_WORD0", "name": "DMA_DATA_WORD0",
"type_ref": "DMA_DATA_WORD0" "type_ref": "DMA_DATA_WORD0"
}, },
{ {
"chips": ["cik", "vi", "fiji", "stoney"], "chips": ["gfx7", "gfx8", "fiji", "stoney"],
"map": {"at": 1280, "to": "pkt3"}, "map": {"at": 1280, "to": "pkt3"},
"name": "DMA_DATA_WORD0", "name": "DMA_DATA_WORD0",
"type_ref": "DMA_DATA_WORD0_cik" "type_ref": "DMA_DATA_WORD0_cik"
@@ -170,48 +170,48 @@
"type_ref": "DMA_DATA_WORD0_gfx9" "type_ref": "DMA_DATA_WORD0_gfx9"
}, },
{ {
"chips": ["si", "cik", "vi", "fiji", "stoney", "gfx9"], "chips": ["gfx6", "gfx7", "gfx8", "fiji", "stoney", "gfx9"],
"map": {"at": 882, "to": "pkt3"}, "map": {"at": 882, "to": "pkt3"},
"name": "DST_ADDR_HI" "name": "DST_ADDR_HI"
}, },
{ {
"chips": ["si", "cik", "vi", "fiji", "stoney", "gfx9"], "chips": ["gfx6", "gfx7", "gfx8", "fiji", "stoney", "gfx9"],
"map": {"at": 1284, "to": "pkt3"}, "map": {"at": 1284, "to": "pkt3"},
"name": "DST_ADDR_HI" "name": "DST_ADDR_HI"
}, },
{ {
"chips": ["si", "cik", "vi", "fiji", "stoney", "gfx9"], "chips": ["gfx6", "gfx7", "gfx8", "fiji", "stoney", "gfx9"],
"map": {"at": 881, "to": "pkt3"}, "map": {"at": 881, "to": "pkt3"},
"name": "DST_ADDR_LO" "name": "DST_ADDR_LO"
}, },
{ {
"chips": ["si", "cik", "vi", "fiji", "stoney", "gfx9"], "chips": ["gfx6", "gfx7", "gfx8", "fiji", "stoney", "gfx9"],
"map": {"at": 1283, "to": "pkt3"}, "map": {"at": 1283, "to": "pkt3"},
"name": "DST_ADDR_LO" "name": "DST_ADDR_LO"
}, },
{ {
"chips": ["si", "cik", "vi", "fiji", "stoney", "gfx9"], "chips": ["gfx6", "gfx7", "gfx8", "fiji", "stoney", "gfx9"],
"map": {"at": 1009, "to": "pkt3"}, "map": {"at": 1009, "to": "pkt3"},
"name": "IB_BASE_HI" "name": "IB_BASE_HI"
}, },
{ {
"chips": ["si", "cik", "vi", "fiji", "stoney", "gfx9"], "chips": ["gfx6", "gfx7", "gfx8", "fiji", "stoney", "gfx9"],
"map": {"at": 1008, "to": "pkt3"}, "map": {"at": 1008, "to": "pkt3"},
"name": "IB_BASE_LO" "name": "IB_BASE_LO"
}, },
{ {
"chips": ["si", "cik", "vi", "fiji", "stoney", "gfx9"], "chips": ["gfx6", "gfx7", "gfx8", "fiji", "stoney", "gfx9"],
"map": {"at": 1010, "to": "pkt3"}, "map": {"at": 1010, "to": "pkt3"},
"name": "IB_CONTROL", "name": "IB_CONTROL",
"type_ref": "IB_CONTROL" "type_ref": "IB_CONTROL"
}, },
{ {
"chips": ["si", "cik", "vi", "fiji", "stoney", "gfx9"], "chips": ["gfx6", "gfx7", "gfx8", "fiji", "stoney", "gfx9"],
"map": {"at": 1282, "to": "pkt3"}, "map": {"at": 1282, "to": "pkt3"},
"name": "SRC_ADDR_HI" "name": "SRC_ADDR_HI"
}, },
{ {
"chips": ["si", "cik", "vi", "fiji", "stoney", "gfx9"], "chips": ["gfx6", "gfx7", "gfx8", "fiji", "stoney", "gfx9"],
"map": {"at": 1281, "to": "pkt3"}, "map": {"at": 1281, "to": "pkt3"},
"name": "SRC_ADDR_LO" "name": "SRC_ADDR_LO"
} }