Skip to content

Commit 7649f26

Browse files
committed
format
1 parent 6272ab9 commit 7649f26

1 file changed

Lines changed: 32 additions & 33 deletions

File tree

tools/clang/unittests/HLSLExec/LinAlgTests.cpp

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1476,8 +1476,8 @@ static const char LoadMemoryShader[] = R"(
14761476
)";
14771477

14781478
static void runLoadMemory(ID3D12Device *Device,
1479-
dxc::SpecificDllLoader &DxcSupport,
1480-
const MatrixParams &Params, bool Verbose) {
1479+
dxc::SpecificDllLoader &DxcSupport,
1480+
const MatrixParams &Params, bool Verbose) {
14811481
const size_t NumElements = Params.totalElements();
14821482
const size_t BufferSize = Params.totalBytes();
14831483

@@ -1486,8 +1486,7 @@ static void runLoadMemory(ID3D12Device *Device,
14861486

14871487
std::string Args = buildCompilerArgs(Params, ExtraDefs.str().c_str());
14881488

1489-
compileShader(DxcSupport, LoadMemoryShader, "cs_6_10", Args,
1490-
Verbose);
1489+
compileShader(DxcSupport, LoadMemoryShader, "cs_6_10", Args, Verbose);
14911490

14921491
auto Expected = makeExpectedMat(Params.CompType, Params.M, Params.N, 1);
14931492

@@ -1498,14 +1497,14 @@ static void runLoadMemory(ID3D12Device *Device,
14981497
addRootUAV(Op.get(), 0, "Input");
14991498
addRootUAV(Op.get(), 1, "Output");
15001499

1501-
auto Result = runShaderOp(
1502-
Device, DxcSupport, std::move(Op),
1503-
[NumElements, Params](LPCSTR Name, std::vector<BYTE> &Data,
1504-
st::ShaderOp *) {
1505-
VERIFY_IS_TRUE(fillInputBuffer(Name, Data, Params.CompType,
1506-
NumElements),
1507-
"Saw unsupported component type");
1508-
});
1500+
auto Result =
1501+
runShaderOp(Device, DxcSupport, std::move(Op),
1502+
[NumElements, Params](LPCSTR Name, std::vector<BYTE> &Data,
1503+
st::ShaderOp *) {
1504+
VERIFY_IS_TRUE(fillInputBuffer(Name, Data, Params.CompType,
1505+
NumElements),
1506+
"Saw unsupported component type");
1507+
});
15091508

15101509
MappedData OutData;
15111510
Result->Test->GetReadBackData("Output", &OutData);
@@ -1552,9 +1551,9 @@ static const char StoreMemoryShader[] = R"(
15521551
)";
15531552

15541553
static void runStoreMemory(ID3D12Device *Device,
1555-
dxc::SpecificDllLoader &DxcSupport,
1556-
const MatrixParams &Params, bool Verbose,
1557-
float FillValue) {
1554+
dxc::SpecificDllLoader &DxcSupport,
1555+
const MatrixParams &Params, bool Verbose,
1556+
float FillValue) {
15581557
const size_t NumElements = Params.totalElements();
15591558
const size_t BufferSize = Params.totalBytes();
15601559

@@ -1564,13 +1563,13 @@ static void runStoreMemory(ID3D12Device *Device,
15641563

15651564
std::string Args = buildCompilerArgs(Params, ExtraDefs.str().c_str());
15661565

1567-
compileShader(DxcSupport, StoreMemoryShader, "cs_6_10", Args,
1568-
Verbose);
1566+
compileShader(DxcSupport, StoreMemoryShader, "cs_6_10", Args, Verbose);
15691567

1570-
auto Expected = makeExpectedMat(Params.CompType, Params.M, Params.N, FillValue, /*Increment=*/false);
1568+
auto Expected = makeExpectedMat(Params.CompType, Params.M, Params.N,
1569+
FillValue, /*Increment=*/false);
15711570

1572-
auto Op = createComputeOp(StoreMemoryShader, "cs_6_10", "UAV(u0)",
1573-
Args.c_str());
1571+
auto Op =
1572+
createComputeOp(StoreMemoryShader, "cs_6_10", "UAV(u0)", Args.c_str());
15741573
addUAVBuffer(Op.get(), "Output", BufferSize, true);
15751574
addRootUAV(Op.get(), 0, "Output");
15761575

@@ -1593,7 +1592,8 @@ void DxilConf_SM610_LinAlg::StoreMemory_Wave_16x16_F16() {
15931592
Params.Layout = LinalgMatrixLayout::RowMajor;
15941593
Params.NumThreads = 64;
15951594
Params.Enable16Bit = true;
1596-
runStoreMemory(D3DDevice, DxcSupport, Params, VerboseLogging, /*FillValue=*/7.0f);
1595+
runStoreMemory(D3DDevice, DxcSupport, Params, VerboseLogging,
1596+
/*FillValue=*/7.0f);
15971597
}
15981598

15991599
static const char AccumulateMemoryShader[] = R"(
@@ -1631,9 +1631,9 @@ static const char AccumulateMemoryShader[] = R"(
16311631
)";
16321632

16331633
static void runAccumulateMemory(ID3D12Device *Device,
1634-
dxc::SpecificDllLoader &DxcSupport,
1635-
const MatrixParams &Params, bool Verbose,
1636-
float FillValue) {
1634+
dxc::SpecificDllLoader &DxcSupport,
1635+
const MatrixParams &Params, bool Verbose,
1636+
float FillValue) {
16371637
const size_t NumElements = Params.totalElements();
16381638
const size_t BufferSize = Params.totalBytes();
16391639

@@ -1643,10 +1643,10 @@ static void runAccumulateMemory(ID3D12Device *Device,
16431643

16441644
std::string Args = buildCompilerArgs(Params, ExtraDefs.str().c_str());
16451645

1646-
compileShader(DxcSupport, AccumulateMemoryShader, "cs_6_10", Args,
1647-
Verbose);
1646+
compileShader(DxcSupport, AccumulateMemoryShader, "cs_6_10", Args, Verbose);
16481647

1649-
auto Expected = makeExpectedMat(Params.CompType, Params.M, Params.N, FillValue * 2, /*Increment=*/false);
1648+
auto Expected = makeExpectedMat(Params.CompType, Params.M, Params.N,
1649+
FillValue * 2, /*Increment=*/false);
16501650

16511651
auto Op = createComputeOp(AccumulateMemoryShader, "cs_6_10", "UAV(u0)",
16521652
Args.c_str());
@@ -1672,7 +1672,8 @@ void DxilConf_SM610_LinAlg::AccumulateMemory_Wave_16x16_F16() {
16721672
Params.Layout = LinalgMatrixLayout::RowMajor;
16731673
Params.NumThreads = 64;
16741674
Params.Enable16Bit = true;
1675-
runAccumulateMemory(D3DDevice, DxcSupport, Params, VerboseLogging, /*FillValue=*/7.0f);
1675+
runAccumulateMemory(D3DDevice, DxcSupport, Params, VerboseLogging,
1676+
/*FillValue=*/7.0f);
16761677
}
16771678

16781679
static const char ConvertShader[] = R"(
@@ -1693,9 +1694,8 @@ static const char ConvertShader[] = R"(
16931694
}
16941695
)";
16951696

1696-
static void runConvert(ID3D12Device *Device,
1697-
dxc::SpecificDllLoader &DxcSupport,
1698-
bool Verbose) {
1697+
static void runConvert(ID3D12Device *Device, dxc::SpecificDllLoader &DxcSupport,
1698+
bool Verbose) {
16991699
std::string Args = "-HV 202x";
17001700
MatrixDim NumElements = 4;
17011701
size_t BufferSize = elementSize(ComponentType::F32) * NumElements;
@@ -1704,8 +1704,7 @@ static void runConvert(ID3D12Device *Device,
17041704

17051705
auto Expected = makeExpectedVec(ComponentType::F32, NumElements, 1.0);
17061706

1707-
auto Op = createComputeOp(ConvertShader, "cs_6_10", "UAV(u0)",
1708-
Args.c_str());
1707+
auto Op = createComputeOp(ConvertShader, "cs_6_10", "UAV(u0)", Args.c_str());
17091708
addUAVBuffer(Op.get(), "Output", BufferSize, true);
17101709
addRootUAV(Op.get(), 0, "Output");
17111710

0 commit comments

Comments
 (0)