Properly format this time

Author: JoeCitizen

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

@@ -306,18 +306,17 @@ 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;
-    }
+  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 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

@@ -3928,7 +3928,7 @@ static void ValidateGlobalVariables(ValidationContext &ValCtx) {
     if (EntryProps.props.IsCS()) {
       unsigned SpecifiedTGSMSize = EntryProps.props.groupSharedLimitBytes;
       if (SpecifiedTGSMSize > 0) {
-      MaxSize = SpecifiedTGSMSize;
+        MaxSize = SpecifiedTGSMSize;
       }
     }
   }

tools/clang/lib/CodeGen/CGHLSLMS.cpp

@@ -1646,7 +1646,8 @@ void CGMSHLSLRuntime::AddHLSLFunctionInfo(Function *F, const FunctionDecl *FD) {
     }
   }
 
-  if (const HLSLGroupSharedLimitAttr *Attr = FD->getAttr<HLSLGroupSharedLimitAttr>()) {
+  if (const HLSLGroupSharedLimitAttr *Attr =
+          FD->getAttr<HLSLGroupSharedLimitAttr>()) {
     if (isEntry && !SM->IsCS() && !SM->IsMS() && !SM->IsAS()) {
       unsigned DiagID = Diags.getCustomDiagID(
           DiagnosticsEngine::Error,
@@ -1658,21 +1659,21 @@ void CGMSHLSLRuntime::AddHLSLFunctionInfo(Function *F, const FunctionDecl *FD) {
     // Only valid for SM6.10+
     if (!SM->IsSM610Plus()) {
       unsigned DiagID = Diags.getCustomDiagID(
-          DiagnosticsEngine::Error,
-          "attribute GroupSharedLimit only valid for Shader Model 6.10 and above.");
+          DiagnosticsEngine::Error, "attribute GroupSharedLimit only valid for "
+                                    "Shader Model 6.10 and above.");
       Diags.Report(Attr->getLocation(), DiagID);
       return;
     }
 
     funcProps->groupSharedLimitBytes = Attr->getLimit();
   } else {
     if (SM->IsMS()) { // Fallback to default limits
-        funcProps->groupSharedLimitBytes = DXIL::kMaxMSSMSize; // 28k For MS
-      } else if (SM->IsAS() || SM->IsCS()) {
-        funcProps->groupSharedLimitBytes = DXIL::kMaxTGSMSize; // 32k For AS/CS
-      } else {
-        funcProps->groupSharedLimitBytes = 0;
-      }
+      funcProps->groupSharedLimitBytes = DXIL::kMaxMSSMSize; // 28k For MS
+    } else if (SM->IsAS() || SM->IsCS()) {
+      funcProps->groupSharedLimitBytes = DXIL::kMaxTGSMSize; // 32k For AS/CS
+    } else {
+      funcProps->groupSharedLimitBytes = 0;
+    }
   }
 
   // Hull shader.