Fix typo in StoreOutput outputSigId parameter (#385)

include/dxc/HLSL/DxilInstructions.h

@@ -800,7 +800,7 @@ struct DxilInst_StoreOutput {
     return true;
   }
   // Accessors
-  llvm::Value *get_outputtSigId() const { return Instr->getOperand(1); }
+  llvm::Value *get_outputSigId() const { return Instr->getOperand(1); }
   llvm::Value *get_rowIndex() const { return Instr->getOperand(2); }
   llvm::Value *get_colIndex() const { return Instr->getOperand(3); }
   llvm::Value *get_value() const { return Instr->getOperand(4); }

lib/HLSL/ComputeViewIdState.cpp

@@ -298,7 +298,7 @@ void DxilViewIdState::AnalyzeFunctions(EntryInfo &Entry) {
           IFTBOOL(GetUnsignedVal(LI.get_colIndex(), &col), DXC_E_GENERAL_INTERNAL_ERROR);
         } else if (DxilInst_StoreOutput SO = DxilInst_StoreOutput(CI)) {
           pDynIdxElems = &m_OutSigDynIdxElems;
-          IFTBOOL(GetUnsignedVal(SO.get_outputtSigId(), &id), DXC_E_GENERAL_INTERNAL_ERROR);
+          IFTBOOL(GetUnsignedVal(SO.get_outputSigId(), &id), DXC_E_GENERAL_INTERNAL_ERROR);
           GetUnsignedVal(SO.get_rowIndex(), (uint32_t*)&row);
           IFTBOOL(GetUnsignedVal(SO.get_colIndex(), &col), DXC_E_GENERAL_INTERNAL_ERROR);
           Entry.Outputs.emplace(CI);
@@ -371,7 +371,7 @@ void DxilViewIdState::CollectValuesContributingToOutputs(EntryInfo &Entry) {
     if (DxilInst_StoreOutput SO = DxilInst_StoreOutput(CI)) {
       pDxilSig = &m_pModule->GetOutputSignature();
       pContributingValue = SO.get_value();
-      GetUnsignedVal(SO.get_outputtSigId(), &id);
+      GetUnsignedVal(SO.get_outputSigId(), &id);
       GetUnsignedVal(SO.get_colIndex(), &col);
       GetUnsignedVal(SO.get_rowIndex(), (uint32_t*)&startRow);
     } else if (DxilInst_StorePatchConstant SPC = DxilInst_StorePatchConstant(CI)) {

lib/HLSL/DxilContainerReflection.cpp

@@ -1744,7 +1744,7 @@ void DxilShaderReflection::MarkUsedSignatureElements() {
       pSig = &m_pDxilModule->GetInputSignature();
     }
     else if (SO) {
-      if (!GetUnsignedVal(SO.get_outputtSigId(), &sigId)) continue;
+      if (!GetUnsignedVal(SO.get_outputSigId(), &sigId)) continue;
       if (!GetUnsignedVal(SO.get_colIndex(), &col)) continue;
       if (!GetUnsignedVal(SO.get_rowIndex(), &row)) continue;
       pDescs = &m_OutputSignature;

lib/HLSL/DxilEliminateOutputDynamicIndexing.cpp

@@ -82,7 +82,7 @@ public:
     return true;
   }
   // Accessors
-  llvm::Value *get_outputtSigId() const {
+  llvm::Value *get_outputSigId() const {
     return Instr->getOperand(DXIL::OperandIndex::kStoreOutputIDOpIdx);
   }
   llvm::Value *get_rowIndex() const {
@@ -113,7 +113,7 @@ bool DxilEliminateOutputDynamicIndexing::EliminateDynamicOutput(
       DxilOutputStore store(CI);
       // Save dynamic indeed sigID.
       if (!isa<ConstantInt>(store.get_rowIndex())) {
-        Value *sigID = store.get_outputtSigId();
+        Value *sigID = store.get_outputSigId();
         dynamicSigSet[sigID] = store.get_value()->getType();
       }
     }
@@ -156,7 +156,7 @@ void DxilEliminateOutputDynamicIndexing::ReplaceDynamicOutput(
   for (auto it = F->user_begin(); it != F->user_end();) {
     CallInst *CI = cast<CallInst>(*(it++));
     DxilOutputStore store(CI);
-    if (sigID == store.get_outputtSigId()) {
+    if (sigID == store.get_outputSigId()) {
       uint64_t col = store.get_colIndex();
       Value *tmpSigElt = tmpSigElts[col];
       IRBuilder<> Builder(CI);

tools/clang/test/CodeGenHLSL/recursive.ll

@@ -154,13 +154,13 @@ entry:
   call fastcc void @"\01?test_inout@@YAXAAV?$vector@M$03@@V1@@Z"(<4 x float>* nonnull dereferenceable(16) %16, <4 x float> %15)
   %17 = load <4 x float>, <4 x float>* %16, align 4
   %18 = extractelement <4 x float> %17, i64 0
-  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 0, float %18)  ; StoreOutput(outputtSigId,rowIndex,colIndex,value)
+  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 0, float %18)  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
   %19 = extractelement <4 x float> %17, i64 1
-  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 1, float %19)  ; StoreOutput(outputtSigId,rowIndex,colIndex,value)
+  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 1, float %19)  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
   %20 = extractelement <4 x float> %17, i64 2
-  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 2, float %20)  ; StoreOutput(outputtSigId,rowIndex,colIndex,value)
+  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 2, float %20)  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
   %21 = extractelement <4 x float> %17, i64 3
-  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 3, float %21)  ; StoreOutput(outputtSigId,rowIndex,colIndex,value)
+  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 3, float %21)  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
   ret void
 }
 

tools/clang/test/HLSL/abs2_m.ll

@@ -61,10 +61,10 @@ entry:
   %add.i1 = add i32 %3, %.i1
   %add.i2 = add i32 %4, %.i1
   %add.i3 = add i32 %5, %.i1
-  tail call void @dx.op.storeOutput.i32(i32 5, i32 0, i32 0, i8 0, i32 %add.i0)  ; StoreOutput(outputtSigId,rowIndex,colIndex,value)
-  tail call void @dx.op.storeOutput.i32(i32 5, i32 0, i32 0, i8 1, i32 %add.i1)  ; StoreOutput(outputtSigId,rowIndex,colIndex,value)
-  tail call void @dx.op.storeOutput.i32(i32 5, i32 0, i32 0, i8 2, i32 %add.i2)  ; StoreOutput(outputtSigId,rowIndex,colIndex,value)
-  tail call void @dx.op.storeOutput.i32(i32 5, i32 0, i32 0, i8 3, i32 %add.i3)  ; StoreOutput(outputtSigId,rowIndex,colIndex,value)
+  tail call void @dx.op.storeOutput.i32(i32 5, i32 0, i32 0, i8 0, i32 %add.i0)  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
+  tail call void @dx.op.storeOutput.i32(i32 5, i32 0, i32 0, i8 1, i32 %add.i1)  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
+  tail call void @dx.op.storeOutput.i32(i32 5, i32 0, i32 0, i8 2, i32 %add.i2)  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
+  tail call void @dx.op.storeOutput.i32(i32 5, i32 0, i32 0, i8 3, i32 %add.i3)  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
   ret void
 }
 

tools/clang/test/HLSL/constprop/bfi.ll

@@ -43,7 +43,7 @@ entry:
   ;%9 = trunc i64 %8 to i32
   ;call void @dx.op.bufferStore.i32(i32 69, %dx.types.Handle %buf_UAV_rawbuf, i32 24, i32 undef, i32 %9, i32 undef, i32 undef, i32 undef, i8 1)  ; BufferStore(uav,coord0,coord1,value0,value1,value2,value3,mask)
   
-  call void @dx.op.storeOutput.i32(i32 5, i32 0, i32 0, i8 0, i32 0)  ; StoreOutput(outputtSigId,rowIndex,colIndex,value)
+  call void @dx.op.storeOutput.i32(i32 5, i32 0, i32 0, i8 0, i32 0)  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
   ret void
 }
 

tools/clang/test/HLSL/constprop/ibfe.ll

@@ -49,7 +49,7 @@ entry:
   %14 = trunc i64 %13 to i32
   call void @dx.op.bufferStore.i32(i32 69, %dx.types.Handle %buf_UAV_rawbuf, i32 28, i32 undef, i32 %14, i32 undef, i32 undef, i32 undef, i8 1)  ; BufferStore(uav,coord0,coord1,value0,value1,value2,value3,mask)
 
-  call void @dx.op.storeOutput.i32(i32 5, i32 0, i32 0, i8 0, i32 0)  ; StoreOutput(outputtSigId,rowIndex,colIndex,value)
+  call void @dx.op.storeOutput.i32(i32 5, i32 0, i32 0, i8 0, i32 0)  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
   ret void
 }
 

tools/clang/test/HLSL/constprop/ubfe.ll

@@ -49,7 +49,7 @@ entry:
   %14 = trunc i64 %13 to i32
   call void @dx.op.bufferStore.i32(i32 69, %dx.types.Handle %buf_UAV_rawbuf, i32 28, i32 undef, i32 %14, i32 undef, i32 undef, i32 undef, i8 1)  ; BufferStore(uav,coord0,coord1,value0,value1,value2,value3,mask)
 
-  call void @dx.op.storeOutput.i32(i32 5, i32 0, i32 0, i8 0, i32 0)  ; StoreOutput(outputtSigId,rowIndex,colIndex,value)
+  call void @dx.op.storeOutput.i32(i32 5, i32 0, i32 0, i8 0, i32 0)  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
   ret void
 }
 

tools/clang/tools/dxcompiler/dxcdisassembler.cpp

@@ -826,7 +826,7 @@ static const char *OpCodeSignatures[] = {
   "(regIndex,index,component)",  // MinPrecXRegLoad
   "(regIndex,index,component,value)",  // MinPrecXRegStore
   "(inputSigId,rowIndex,colIndex,gsVertexAxis)",  // LoadInput
-  "(outputtSigId,rowIndex,colIndex,value)",  // StoreOutput
+  "(outputSigId,rowIndex,colIndex,value)",  // StoreOutput
   "(value)",  // FAbs
   "(value)",  // Saturate
   "(value)",  // IsNaN

utils/hct/hctdb.py

@@ -402,7 +402,7 @@ class db_dxil(object):
         next_op_idx += 1
         self.add_dxil_op("StoreOutput", next_op_idx, "StoreOutput", "stores the value to shader output", "hfwi", "", [ # note, cannot store bit even though load supports it
             retvoid_param,
-            db_dxil_param(2, "u32", "outputtSigId", "output signature element ID"),
+            db_dxil_param(2, "u32", "outputSigId", "output signature element ID"),
             db_dxil_param(3, "u32", "rowIndex", "row index relative to element"),
             db_dxil_param(4, "u8", "colIndex", "column index relative to element"),
             db_dxil_param(5, "$o", "value", "value to store")])