DXIL Disassembly tweaks to getelementptr, RawBufferLoad, RawBufferStore

Zorro666 · Zorro666 · commit 44fdde8b3ef9 · 2024-05-29T07:28:33.000+01:00
Fixed getelementptr showing raw type and converted type
Improved RawBufferLoad, RawBufferStore display when displaying byteOffset
diff --git a/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp b/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp
@@ -3376,27 +3376,34 @@ void Program::MakeRDDisassemblyString(const DXBC::Reflection *reflection)
                 rdcstr resName = GetHandleAlias(handleStr);
                 if(!resName.isEmpty())
                 {
-                  lineStr += resName;
                   if(!isUndef(inst.args[2]))
                   {
-                    lineStr += "[" + ArgToString(inst.args[2], false) + "]";
+                    rdcstr arrayStr = resName + "[" + ArgToString(inst.args[2], false) + "]";
                     if(!isUndef(inst.args[3]))
                     {
+                      // *(&<resName>[<index>] + <elementOffset> bytes)
                       uint32_t elementOffset;
                       if(getival<uint32_t>(inst.args[3], elementOffset))
                       {
                         if(elementOffset > 0)
-                          lineStr += " + " + ToStr(elementOffset) + " bytes";
+                          lineStr += "*(&" + arrayStr + " + " + ToStr(elementOffset) + " bytes)";
+                        else
+                          lineStr += arrayStr;
                       }
                       else
                       {
-                        lineStr += " + " + ArgToString(inst.args[3], false) + " bytes";
+                        lineStr +=
+                            "*(&" + arrayStr + " + " + ArgToString(inst.args[3], false) + " bytes)";
                       }
                     }
+                    else
+                    {
+                      lineStr += arrayStr;
+                    }
                   }
                   else
                   {
-                    lineStr += "[" + ArgToString(inst.args[3], false) + "]";
+                    lineStr += resName + "[" + ArgToString(inst.args[3], false) + "]";
                   }
                 }
                 else
@@ -3418,29 +3425,37 @@ void Program::MakeRDDisassemblyString(const DXBC::Reflection *reflection)
                   bool validElementOffset = !isUndef(inst.args[3]);
                   bool constantElementOffset = validElementOffset && getival(inst.args[3], offset);
 
-                  lineStr += resName;
+                  rdcstr arrayStr = resName;
                   uint32_t index;
                   if(getival(inst.args[2], index))
                   {
                     if((offset == 0) || (index > 0))
-                      lineStr += "[" + ToStr(index) + "]";
+                      arrayStr += "[" + ToStr(index) + "]";
                   }
                   else
                   {
-                    lineStr += "[" + ArgToString(inst.args[2], false) + "]";
+                    arrayStr += "[" + ArgToString(inst.args[2], false) + "]";
                   }
                   if(validElementOffset)
                   {
+                    // *(&<resName>[<index>] + <elementOffset> bytes)
                     if(constantElementOffset)
                     {
                       if(offset > 0)
-                        lineStr += " + " + ToStr(offset) + " bytes";
+                        lineStr = "*(&" + arrayStr + " + " + ToStr(offset) + " bytes)";
+                      else
+                        lineStr += arrayStr;
                     }
                     else
                     {
-                      lineStr += " + " + ArgToString(inst.args[3], false) + " bytes";
+                      lineStr +=
+                          "*(&" + arrayStr + " + " + ArgToString(inst.args[3], false) + " bytes)";
                     }
                   }
+                  else
+                  {
+                    lineStr += arrayStr;
+                  }
                   lineStr += " = ";
                   lineStr += "{";
                   bool needComma = false;
@@ -4045,27 +4060,23 @@ void Program::MakeRDDisassemblyString(const DXBC::Reflection *reflection)
 
                   switch(addrspace)
                   {
-                    case DXIL::Type::PointerAddrSpace::Default: lineStr = ""; break;
+                    case DXIL::Type::PointerAddrSpace::Default: resultTypeStr = ""; break;
                     case DXIL::Type::PointerAddrSpace::DeviceMemory:
-                      lineStr = "DeviceMemory";
+                      resultTypeStr = "DeviceMemory";
                       break;
-                    case DXIL::Type::PointerAddrSpace::CBuffer: lineStr = "CBuffer"; break;
-                    case DXIL::Type::PointerAddrSpace::GroupShared: lineStr = "GroupShared"; break;
-                    case DXIL::Type::PointerAddrSpace::GenericPointer: lineStr = ""; break;
+                    case DXIL::Type::PointerAddrSpace::CBuffer: resultTypeStr = "CBuffer"; break;
+                    case DXIL::Type::PointerAddrSpace::GroupShared:
+                      resultTypeStr = "GroupShared";
+                      break;
+                    case DXIL::Type::PointerAddrSpace::GenericPointer: resultTypeStr = ""; break;
                     case DXIL::Type::PointerAddrSpace::ImmediateCBuffer:
-                      lineStr = "ImmediateCBuffer";
+                      resultTypeStr = "ImmediateCBuffer";
                       break;
                   };
 
-                  lineStr += " ";
-                  lineStr += scalarType;
-                  lineStr += "* ";
-
-                  if(!inst.getName().empty())
-                    lineStr += StringFormat::Fmt("%c%s = ", DXIL::dxilIdentifier,
-                                                 escapeStringIfNeeded(inst.getName()).c_str());
-                  else if(inst.slot != ~0U)
-                    lineStr += StringFormat::Fmt("%c%u = ", DXIL::dxilIdentifier, inst.slot);
+                  resultTypeStr += " ";
+                  resultTypeStr += scalarType;
+                  resultTypeStr += "* ";
 
                   // arg[0] : ptr
                   rdcstr ptrStr = ArgToString(inst.args[0], false);

Original file line number	Diff line number	Diff line change
`@@ -3376,27 +3376,34 @@ void Program::MakeRDDisassemblyString(const DXBC::Reflection *reflection)`
`3376`	`3376`	`rdcstr resName = GetHandleAlias(handleStr);`
`3377`	`3377`	`if(!resName.isEmpty())`
`3378`	`3378`	`{`
`3379`		`- lineStr += resName;`
`3380`	`3379`	`if(!isUndef(inst.args[2]))`
`3381`	`3380`	`{`
`3382`		`- lineStr += "[" + ArgToString(inst.args[2], false) + "]";`
	`3381`	`+ rdcstr arrayStr = resName + "[" + ArgToString(inst.args[2], false) + "]";`
`3383`	`3382`	`if(!isUndef(inst.args[3]))`
`3384`	`3383`	`{`
	`3384`	`+ // *(&<resName>[<index>] + <elementOffset> bytes)`
`3385`	`3385`	`uint32_t elementOffset;`
`3386`	`3386`	`if(getival<uint32_t>(inst.args[3], elementOffset))`
`3387`	`3387`	`{`
`3388`	`3388`	`if(elementOffset > 0)`
`3389`		`- lineStr += " + " + ToStr(elementOffset) + " bytes";`
	`3389`	`+ lineStr += "*(&" + arrayStr + " + " + ToStr(elementOffset) + " bytes)";`
	`3390`	`+ else`
	`3391`	`+ lineStr += arrayStr;`
`3390`	`3392`	`}`
`3391`	`3393`	`else`
`3392`	`3394`	`{`
`3393`		`- lineStr += " + " + ArgToString(inst.args[3], false) + " bytes";`
	`3395`	`+ lineStr +=`
	`3396`	`+ "*(&" + arrayStr + " + " + ArgToString(inst.args[3], false) + " bytes)";`
`3394`	`3397`	`}`
`3395`	`3398`	`}`
	`3399`	`+ else`
	`3400`	`+ {`
	`3401`	`+ lineStr += arrayStr;`
	`3402`	`+ }`
`3396`	`3403`	`}`
`3397`	`3404`	`else`
`3398`	`3405`	`{`
`3399`		`- lineStr += "[" + ArgToString(inst.args[3], false) + "]";`
	`3406`	`+ lineStr += resName + "[" + ArgToString(inst.args[3], false) + "]";`
`3400`	`3407`	`}`
`3401`	`3408`	`}`
`3402`	`3409`	`else`
`@@ -3418,29 +3425,37 @@ void Program::MakeRDDisassemblyString(const DXBC::Reflection *reflection)`
`3418`	`3425`	`bool validElementOffset = !isUndef(inst.args[3]);`
`3419`	`3426`	`bool constantElementOffset = validElementOffset && getival(inst.args[3], offset);`
`3420`	`3427`
`3421`		`- lineStr += resName;`
	`3428`	`+ rdcstr arrayStr = resName;`
`3422`	`3429`	`uint32_t index;`
`3423`	`3430`	`if(getival(inst.args[2], index))`
`3424`	`3431`	`{`
`3425`	`3432`	`if((offset == 0) \|\| (index > 0))`
`3426`		`- lineStr += "[" + ToStr(index) + "]";`
	`3433`	`+ arrayStr += "[" + ToStr(index) + "]";`
`3427`	`3434`	`}`
`3428`	`3435`	`else`
`3429`	`3436`	`{`
`3430`		`- lineStr += "[" + ArgToString(inst.args[2], false) + "]";`
	`3437`	`+ arrayStr += "[" + ArgToString(inst.args[2], false) + "]";`
`3431`	`3438`	`}`
`3432`	`3439`	`if(validElementOffset)`
`3433`	`3440`	`{`
	`3441`	`+ // *(&<resName>[<index>] + <elementOffset> bytes)`
`3434`	`3442`	`if(constantElementOffset)`
`3435`	`3443`	`{`
`3436`	`3444`	`if(offset > 0)`
`3437`		`- lineStr += " + " + ToStr(offset) + " bytes";`
	`3445`	`+ lineStr = "*(&" + arrayStr + " + " + ToStr(offset) + " bytes)";`
	`3446`	`+ else`
	`3447`	`+ lineStr += arrayStr;`
`3438`	`3448`	`}`
`3439`	`3449`	`else`
`3440`	`3450`	`{`
`3441`		`- lineStr += " + " + ArgToString(inst.args[3], false) + " bytes";`
	`3451`	`+ lineStr +=`
	`3452`	`+ "*(&" + arrayStr + " + " + ArgToString(inst.args[3], false) + " bytes)";`
`3442`	`3453`	`}`
`3443`	`3454`	`}`
	`3455`	`+ else`
	`3456`	`+ {`
	`3457`	`+ lineStr += arrayStr;`
	`3458`	`+ }`
`3444`	`3459`	`lineStr += " = ";`
`3445`	`3460`	`lineStr += "{";`
`3446`	`3461`	`bool needComma = false;`
`@@ -4045,27 +4060,23 @@ void Program::MakeRDDisassemblyString(const DXBC::Reflection *reflection)`
`4045`	`4060`
`4046`	`4061`	`switch(addrspace)`
`4047`	`4062`	`{`
`4048`		`- case DXIL::Type::PointerAddrSpace::Default: lineStr = ""; break;`
	`4063`	`+ case DXIL::Type::PointerAddrSpace::Default: resultTypeStr = ""; break;`
`4049`	`4064`	`case DXIL::Type::PointerAddrSpace::DeviceMemory:`
`4050`		`- lineStr = "DeviceMemory";`
	`4065`	`+ resultTypeStr = "DeviceMemory";`
`4051`	`4066`	`break;`
`4052`		`- case DXIL::Type::PointerAddrSpace::CBuffer: lineStr = "CBuffer"; break;`
`4053`		`- case DXIL::Type::PointerAddrSpace::GroupShared: lineStr = "GroupShared"; break;`
`4054`		`- case DXIL::Type::PointerAddrSpace::GenericPointer: lineStr = ""; break;`
	`4067`	`+ case DXIL::Type::PointerAddrSpace::CBuffer: resultTypeStr = "CBuffer"; break;`
	`4068`	`+ case DXIL::Type::PointerAddrSpace::GroupShared:`
	`4069`	`+ resultTypeStr = "GroupShared";`
	`4070`	`+ break;`
	`4071`	`+ case DXIL::Type::PointerAddrSpace::GenericPointer: resultTypeStr = ""; break;`
`4055`	`4072`	`case DXIL::Type::PointerAddrSpace::ImmediateCBuffer:`
`4056`		`- lineStr = "ImmediateCBuffer";`
	`4073`	`+ resultTypeStr = "ImmediateCBuffer";`
`4057`	`4074`	`break;`
`4058`	`4075`	`};`
`4059`	`4076`
`4060`		`- lineStr += " ";`
`4061`		`- lineStr += scalarType;`
`4062`		`- lineStr += "* ";`
`4063`		`-`
`4064`		`- if(!inst.getName().empty())`
`4065`		`- lineStr += StringFormat::Fmt("%c%s = ", DXIL::dxilIdentifier,`
`4066`		`- escapeStringIfNeeded(inst.getName()).c_str());`
`4067`		`- else if(inst.slot != ~0U)`
`4068`		`- lineStr += StringFormat::Fmt("%c%u = ", DXIL::dxilIdentifier, inst.slot);`
	`4077`	`+ resultTypeStr += " ";`
	`4078`	`+ resultTypeStr += scalarType;`
	`4079`	`+ resultTypeStr += "* ";`
`4069`	`4080`
`4070`	`4081`	`// arg[0] : ptr`
`4071`	`4082`	`rdcstr ptrStr = ArgToString(inst.args[0], false);`