clang-format

Author: Greg Roth

lib/DxilValidation/DxilValidation.cpp

@@ -1484,7 +1484,8 @@ static void ValidateResourceDxilOp(CallInst *CI, DXIL::OpCode opcode,
     }
     LLVM_FALLTHROUGH;
   case DXIL::OpCode::RawBufferVectorLoad: {
-    Value *handle = CI->getOperand(DXIL::OperandIndex::kRawBufferLoadHandleOpIdx);
+    Value *handle =
+        CI->getOperand(DXIL::OperandIndex::kRawBufferLoadHandleOpIdx);
     DXIL::ComponentType compTy;
     DXIL::ResourceClass resClass;
     DXIL::ResourceKind resKind =
@@ -1500,7 +1501,8 @@ static void ValidateResourceDxilOp(CallInst *CI, DXIL::OpCode opcode,
     if (!isa<ConstantInt>(CI->getOperand(alignIdx)))
       ValCtx.EmitInstrError(CI, ValidationRule::InstrConstAlignForRawBuf);
 
-    Value *offset = CI->getOperand(DXIL::OperandIndex::kRawBufferLoadElementOffsetOpIdx);
+    Value *offset =
+        CI->getOperand(DXIL::OperandIndex::kRawBufferLoadElementOffsetOpIdx);
     switch (resKind) {
     case DXIL::ResourceKind::RawBuffer:
       if (!isa<UndefValue>(offset)) {
@@ -1530,15 +1532,17 @@ static void ValidateResourceDxilOp(CallInst *CI, DXIL::OpCode opcode,
     DxilInst_RawBufferStore bufSt(CI);
     ConstantInt *mask = dyn_cast<ConstantInt>(bufSt.get_mask());
     unsigned stValMask =
-      StoreValueToMask({bufSt.get_value0(), bufSt.get_value1(),
-          bufSt.get_value2(), bufSt.get_value3()});
+        StoreValueToMask({bufSt.get_value0(), bufSt.get_value1(),
+                          bufSt.get_value2(), bufSt.get_value3()});
 
     if (!ValidateStorageMasks(CI, opcode, mask, stValMask, false /*isTyped*/,
                               ValCtx))
       return;
-  } LLVM_FALLTHROUGH;
+  }
+    LLVM_FALLTHROUGH;
   case DXIL::OpCode::RawBufferVectorStore: {
-    Value *handle = CI->getOperand(DXIL::OperandIndex::kRawBufferStoreHandleOpIdx);
+    Value *handle =
+        CI->getOperand(DXIL::OperandIndex::kRawBufferStoreHandleOpIdx);
     DXIL::ComponentType compTy;
     DXIL::ResourceClass resClass;
     DXIL::ResourceKind resKind =
@@ -1552,12 +1556,14 @@ static void ValidateResourceDxilOp(CallInst *CI, DXIL::OpCode opcode,
       alignIdx = DXIL::OperandIndex::kRawBufferVectorStoreAlignmentOpIdx;
       unsigned valueIx = DXIL::OperandIndex::kRawBufferVectorStoreValOpIdx;
       if (isa<UndefValue>(CI->getOperand(valueIx)))
-        ValCtx.EmitInstrError(CI, ValidationRule::InstrUndefinedValueForUAVStore);
+        ValCtx.EmitInstrError(CI,
+                              ValidationRule::InstrUndefinedValueForUAVStore);
     }
     if (!isa<ConstantInt>(CI->getOperand(alignIdx)))
       ValCtx.EmitInstrError(CI, ValidationRule::InstrConstAlignForRawBuf);
 
-    Value *offset = CI->getOperand(DXIL::OperandIndex::kRawBufferStoreElementOffsetOpIdx);
+    Value *offset =
+        CI->getOperand(DXIL::OperandIndex::kRawBufferStoreElementOffsetOpIdx);
     switch (resKind) {
     case DXIL::ResourceKind::RawBuffer:
       if (!isa<UndefValue>(offset)) {

lib/HLSL/DxilScalarizeVectorLoadStores.cpp

@@ -49,7 +49,8 @@ class DxilScalarizeVectorLoadStores : public ModulePass {
     hlsl::OP *HlslOP = DM.GetOP();
     for (auto FIt : HlslOP->GetOpFuncList(DXIL::OpCode::RawBufferVectorLoad)) {
       Function *Func = FIt.second;
-      if (!Func) continue;
+      if (!Func)
+        continue;
       for (auto U = Func->user_begin(), UE = Func->user_end(); U != UE;) {
         CallInst *CI = cast<CallInst>(*(U++));
         scalarizeVectorLoad(HlslOP, M.getDataLayout(), CI);
@@ -58,7 +59,8 @@ class DxilScalarizeVectorLoadStores : public ModulePass {
     }
     for (auto FIt : HlslOP->GetOpFuncList(DXIL::OpCode::RawBufferVectorStore)) {
       Function *Func = FIt.second;
-      if (!Func) continue;
+      if (!Func)
+        continue;
       for (auto U = Func->user_begin(), UE = Func->user_end(); U != UE;) {
         CallInst *CI = cast<CallInst>(*(U++));
         scalarizeVectorStore(HlslOP, M.getDataLayout(), CI);

tools/clang/unittests/HLSL/ValidationTest.cpp

@@ -1506,21 +1506,23 @@ TEST_F(ValidationTest, StructBufStrideOutOfBound) {
 }
 
 TEST_F(ValidationTest, StructBufLoadCoordinates) {
-  RewriteAssemblyCheckMsg(L"..\\DXILValidation\\struct_buf1.hlsl", "ps_6_0",
-                          "bufferLoad.f32(i32 68, %dx.types.Handle "
-                          "%buf1_texture_structbuf, i32 1, i32 8)",
-                          "bufferLoad.f32(i32 68, %dx.types.Handle "
-                          "%buf1_texture_structbuf, i32 1, i32 undef)",
-                          "structured buffer requires defined index and offset coordinates");
+  RewriteAssemblyCheckMsg(
+      L"..\\DXILValidation\\struct_buf1.hlsl", "ps_6_0",
+      "bufferLoad.f32(i32 68, %dx.types.Handle "
+      "%buf1_texture_structbuf, i32 1, i32 8)",
+      "bufferLoad.f32(i32 68, %dx.types.Handle "
+      "%buf1_texture_structbuf, i32 1, i32 undef)",
+      "structured buffer requires defined index and offset coordinates");
 }
 
 TEST_F(ValidationTest, StructBufStoreCoordinates) {
-  RewriteAssemblyCheckMsg(L"..\\DXILValidation\\struct_buf1.hlsl", "ps_6_0",
-                          "bufferStore.f32(i32 69, %dx.types.Handle "
-                          "%buf2_UAV_structbuf, i32 0, i32 0",
-                          "bufferStore.f32(i32 69, %dx.types.Handle "
-                          "%buf2_UAV_structbuf, i32 0, i32 undef",
-                          "structured buffer requires defined index and offset coordinates");
+  RewriteAssemblyCheckMsg(
+      L"..\\DXILValidation\\struct_buf1.hlsl", "ps_6_0",
+      "bufferStore.f32(i32 69, %dx.types.Handle "
+      "%buf2_UAV_structbuf, i32 0, i32 0",
+      "bufferStore.f32(i32 69, %dx.types.Handle "
+      "%buf2_UAV_structbuf, i32 0, i32 undef",
+      "structured buffer requires defined index and offset coordinates");
 }
 
 TEST_F(ValidationTest, TypedBufRetType) {