clang format

Author: JoeCitizen

include/dxc/DxilContainer/DxilPipelineStateValidation.h

@@ -1148,7 +1148,7 @@ void SetupPSVInitInfo(PSVInitInfo &InitInfo, const DxilModule &DM);
 void SetShaderProps(PSVRuntimeInfo0 *pInfo, const DxilModule &DM);
 void SetShaderProps(PSVRuntimeInfo1 *pInfo1, const DxilModule &DM);
 void SetShaderProps(PSVRuntimeInfo2 *pInfo2, const DxilModule &DM);
-void SetShaderProps(PSVRuntimeInfo4 *pInfo4, const DxilModule &DM);
+void SetShaderProps(PSVRuntimeInfo4 *Info4, const DxilModule &DM);
 
 void PrintPSVRuntimeInfo(llvm::raw_ostream &OS, PSVRuntimeInfo0 *pInfo0,
                          PSVRuntimeInfo1 *pInfo1, PSVRuntimeInfo2 *pInfo2,

lib/DXIL/DxilMetadataHelper.cpp

@@ -1625,9 +1625,9 @@ MDTuple *DxilMDHelper::EmitDxilEntryProperties(uint64_t rawShaderFlag,
       MDVals.emplace_back(MDNode::get(m_Ctx, WaveSizeVal));
     }
 
-    MDVals.emplace_back(Uint32ToConstMD(DxilMDHelper::kDxilMaxGroupSharedMemTag));
     MDVals.emplace_back(
-        Uint32ToConstMD(props.groupSharedLimitBytes));
+        Uint32ToConstMD(DxilMDHelper::kDxilMaxGroupSharedMemTag));
+    MDVals.emplace_back(Uint32ToConstMD(props.groupSharedLimitBytes));
   } break;
     // Geometry shader.
   case DXIL::ShaderKind::Geometry: {

lib/DXIL/DxilModule.cpp

@@ -413,14 +413,13 @@ unsigned DxilModule::GetNumThreads(unsigned idx) const {
 }
 
 unsigned DxilModule::GetGroupSharedLimit() const {
-    DXASSERT(m_DxilEntryPropsMap.size() == 1 &&
-                 (m_pSM->IsCS() || m_pSM->IsMS() || m_pSM->IsAS()),
+  DXASSERT(m_DxilEntryPropsMap.size() == 1 &&
+               (m_pSM->IsCS() || m_pSM->IsMS() || m_pSM->IsAS()),
            "only works for CS/MS/AS profiles");
   const DxilFunctionProps &props = m_DxilEntryPropsMap.begin()->second->props;
   DXASSERT_NOMSG(m_pSM->GetKind() == props.shaderKind);
   return props.groupSharedLimitBytes;
- }
-
+}
 
 DxilWaveSize &DxilModule::GetWaveSize() {
   return const_cast<DxilWaveSize &>(

lib/DxilContainer/DxilPipelineStateValidation.cpp

@@ -305,19 +305,18 @@ void hlsl::SetShaderProps(PSVRuntimeInfo2 *pInfo2, const DxilModule &DM) {
   }
 }
 
-void hlsl::SetShaderProps(PSVRuntimeInfo4 *pInfo4, const DxilModule &DM) {
-    assert(pInfo4);
-    const ShaderModel* SM = DM.GetShaderModel();
-    switch (SM->GetKind())
-    {
-    case ShaderModel::Kind::Compute:
-    case ShaderModel::Kind::Mesh:
-    case ShaderModel::Kind::Amplification:
-      pInfo4->GroupSharedLimit = DM.GetGroupSharedLimit();
-        break;
-    default:
-        break;
-    }
+void hlsl::SetShaderProps(PSVRuntimeInfo4 *Info4, const DxilModule &DM) {
+  assert(Info4);
+  const ShaderModel *SM = DM.GetShaderModel();
+  switch (SM->GetKind()) {
+  case ShaderModel::Kind::Compute:
+  case ShaderModel::Kind::Mesh:
+  case ShaderModel::Kind::Amplification:
+    Info4->GroupSharedLimit = DM.GetGroupSharedLimit();
+    break;
+  default:
+    break;
+  }
 }
 
 void PSVResourceBindInfo0::Print(raw_ostream &OS) const {
@@ -825,8 +824,7 @@ void hlsl::PrintPSVRuntimeInfo(llvm::raw_ostream &OS, PSVRuntimeInfo0 *pInfo0,
          << pInfo2->NumThreadsY << "," << pInfo2->NumThreadsZ << ")\n";
     }
     if (pInfo4) {
-      OS << Comment << " GroupSharedLimit="
-         << pInfo4->GroupSharedLimit << "\n";
+      OS << Comment << " GroupSharedLimit=" << pInfo4->GroupSharedLimit << "\n";
     }
     break;
   case PSVShaderKind::Amplification:
@@ -836,8 +834,7 @@ void hlsl::PrintPSVRuntimeInfo(llvm::raw_ostream &OS, PSVRuntimeInfo0 *pInfo0,
          << pInfo2->NumThreadsY << "," << pInfo2->NumThreadsZ << ")\n";
     }
     if (pInfo4) {
-      OS << Comment << " GroupSharedLimit="
-         << pInfo4->GroupSharedLimit << "\n";
+      OS << Comment << " GroupSharedLimit=" << pInfo4->GroupSharedLimit << "\n";
     }
     break;
   case PSVShaderKind::Mesh:
@@ -866,8 +863,7 @@ void hlsl::PrintPSVRuntimeInfo(llvm::raw_ostream &OS, PSVRuntimeInfo0 *pInfo0,
          << pInfo2->NumThreadsY << "," << pInfo2->NumThreadsZ << ")\n";
     }
     if (pInfo4) {
-      OS << Comment << " GroupSharedLimit="
-         << pInfo4->GroupSharedLimit << "\n";
+      OS << Comment << " GroupSharedLimit=" << pInfo4->GroupSharedLimit << "\n";
     }
     break;
   case PSVShaderKind::Library:

lib/DxilValidation/DxilValidation.cpp

@@ -3927,9 +3927,8 @@ static void ValidateGlobalVariables(ValidationContext &ValCtx) {
     DxilEntryProps &EntryProps = M.GetDxilEntryProps(M.GetEntryFunction());
     if (EntryProps.props.IsCS()) {
       unsigned SpecifiedTGSMSize = EntryProps.props.groupSharedLimitBytes;
-      if (SpecifiedTGSMSize > 0) {
-      MaxSize = SpecifiedTGSMSize;
-      }
+      if (SpecifiedTGSMSize > 0)
+        MaxSize = SpecifiedTGSMSize;
     }
   }