Use non-legacy ASIC to generate AMDIL

* This may break on drivers old enough to not recognise the first non-legacy
  ASIC, but that is much rarer than new drivers that have dropped support for
  the old ones.
This commit is contained in:
baldurk
2022-06-30 15:41:45 +01:00
parent c817b6f9ff
commit 4dc80c1793
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -380,7 +380,7 @@ rdcstr DisassembleGLSL(ShaderStage stage, const bytebuf &shaderBytes, const rdcs
// dummy values
if(!found)
{
const asic &a = asicInfo[0];
const asic &a = asicInfo[legacyAsicCount];
cmdLine += StringFormat::Fmt("%d;%d;", a.chipFamily, a.chipRevision);
}
+2 -2
View File
@@ -115,8 +115,8 @@ rdcstr DisassembleDXBC(const bytebuf &shaderBytes, const rdcstr &target)
bool amdil = false;
if(target == "AMDIL")
{
in.chipFamily = asicInfo[0].chipFamily;
in.chipRevision = asicInfo[0].chipRevision;
in.chipFamily = asicInfo[legacyAsicCount].chipFamily;
in.chipRevision = asicInfo[legacyAsicCount].chipRevision;
amdil = true;
}
+1 -1
View File
@@ -27,7 +27,7 @@ class GL_Shader_ISA(rdtest.TestCase):
# Generic testing can't do much, we just ensure that we can successfully get a non-empty disassembly string
for isa in isas:
# The AMD disassembler does an audible ping when it fails, so skip ones we know won't work
if not is_amd and ('GCN (' in isa or 'RDNA (' in isa or isa == 'AMDIL'):
if not is_amd and ('GCN (' in isa or 'RDNA (' in isa or 'RDNA2 (' in isa or isa == 'AMDIL'):
rdtest.log.print("Skipping {} as we know it will fail".format(isa))
continue