From d76be6fdccb13835d38849ebb6c30be84c5c1599 Mon Sep 17 00:00:00 2001 From: "Favela, Brian" Date: Tue, 20 Jan 2026 16:57:03 -0500 Subject: [PATCH 1/2] Fixing long vectors tests to use wide chars for text --- .../unittests/HLSLExec/LongVectorTestData.h | 2 +- .../clang/unittests/HLSLExec/LongVectors.cpp | 26 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/clang/unittests/HLSLExec/LongVectorTestData.h b/tools/clang/unittests/HLSLExec/LongVectorTestData.h index 4126d861ac..42de18f481 100644 --- a/tools/clang/unittests/HLSLExec/LongVectorTestData.h +++ b/tools/clang/unittests/HLSLExec/LongVectorTestData.h @@ -261,7 +261,7 @@ template const std::vector &getInputSet(InputSet InputSet) { default: \ break; \ } \ - VERIFY_FAIL("Missing input set"); \ + VERIFY_FAIL(L"Missing input set"); \ std::abort(); \ } diff --git a/tools/clang/unittests/HLSLExec/LongVectors.cpp b/tools/clang/unittests/HLSLExec/LongVectors.cpp index 56d2e1dc60..7334baf87c 100644 --- a/tools/clang/unittests/HLSLExec/LongVectors.cpp +++ b/tools/clang/unittests/HLSLExec/LongVectors.cpp @@ -1809,8 +1809,8 @@ using namespace LongVector; TEST_METHOD(Op##_##DataType) { \ BEGIN_TEST_METHOD_PROPERTIES() \ TEST_METHOD_PROPERTY( \ - "Kits.Specification", \ - "Device.Graphics.D3D12.DXILCore.ShaderModel69.DoublePrecision") \ + L"Kits.Specification", \ + L"Device.Graphics.D3D12.DXILCore.ShaderModel69.DoublePrecision") \ END_TEST_METHOD_PROPERTIES() \ runTest(); \ } @@ -1819,8 +1819,8 @@ using namespace LongVector; TEST_METHOD(Op##_##DataType) { \ BEGIN_TEST_METHOD_PROPERTIES() \ TEST_METHOD_PROPERTY( \ - "Kits.Specification", \ - "Device.Graphics.D3D12.DXILCore.ShaderModel69.CoreRequirement") \ + L"Kits.Specification", \ + L"Device.Graphics.D3D12.DXILCore.ShaderModel69.CoreRequirement") \ END_TEST_METHOD_PROPERTIES() \ runWaveOpTest(); \ } @@ -1829,8 +1829,8 @@ using namespace LongVector; TEST_METHOD(Op##_##DataType) { \ BEGIN_TEST_METHOD_PROPERTIES() \ TEST_METHOD_PROPERTY( \ - "Kits.Specification", \ - "Device.Graphics.D3D12.DXILCore.ShaderModel69.DoublePrecision") \ + L"Kits.Specification", \ + L"Device.Graphics.D3D12.DXILCore.ShaderModel69.DoublePrecision") \ END_TEST_METHOD_PROPERTIES() \ runWaveOpTest(); \ } @@ -1838,14 +1838,14 @@ using namespace LongVector; class DxilConf_SM69_Vectorized { public: BEGIN_TEST_CLASS(DxilConf_SM69_Vectorized) - TEST_CLASS_PROPERTY("Kits.TestName", - "D3D12 - Shader Model 6.9 - Vectorized DXIL - Core Tests") - TEST_CLASS_PROPERTY("Kits.TestId", "81db1ff8-5bc5-48a1-8d7b-600fc600a677") - TEST_CLASS_PROPERTY("Kits.Description", - "Validates required SM 6.9 vectorized DXIL operations") + TEST_CLASS_PROPERTY(L"Kits.TestName", + L"D3D12 - Shader Model 6.9 - Vectorized DXIL - Core Tests") + TEST_CLASS_PROPERTY(L"Kits.TestId", L"81db1ff8-5bc5-48a1-8d7b-600fc600a677") + TEST_CLASS_PROPERTY(L"Kits.Description", + L"Validates required SM 6.9 vectorized DXIL operations") TEST_CLASS_PROPERTY( - "Kits.Specification", - "Device.Graphics.D3D12.DXILCore.ShaderModel69.CoreRequirement") + L"Kits.Specification", + L"Device.Graphics.D3D12.DXILCore.ShaderModel69.CoreRequirement") TEST_METHOD_PROPERTY(L"Priority", L"0") END_TEST_CLASS() From 092197b1ac7c6de9bb0332305ebac6a668dac8c2 Mon Sep 17 00:00:00 2001 From: "Favela, Brian" Date: Tue, 20 Jan 2026 17:14:52 -0500 Subject: [PATCH 2/2] Making clang-format happy --- .../unittests/HLSLExec/LongVectorTestData.h | 2 +- tools/clang/unittests/HLSLExec/LongVectors.cpp | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tools/clang/unittests/HLSLExec/LongVectorTestData.h b/tools/clang/unittests/HLSLExec/LongVectorTestData.h index 42de18f481..ac82c7bfcc 100644 --- a/tools/clang/unittests/HLSLExec/LongVectorTestData.h +++ b/tools/clang/unittests/HLSLExec/LongVectorTestData.h @@ -261,7 +261,7 @@ template const std::vector &getInputSet(InputSet InputSet) { default: \ break; \ } \ - VERIFY_FAIL(L"Missing input set"); \ + VERIFY_FAIL(L"Missing input set"); \ std::abort(); \ } diff --git a/tools/clang/unittests/HLSLExec/LongVectors.cpp b/tools/clang/unittests/HLSLExec/LongVectors.cpp index 7334baf87c..1654cb6e00 100644 --- a/tools/clang/unittests/HLSLExec/LongVectors.cpp +++ b/tools/clang/unittests/HLSLExec/LongVectors.cpp @@ -1809,8 +1809,8 @@ using namespace LongVector; TEST_METHOD(Op##_##DataType) { \ BEGIN_TEST_METHOD_PROPERTIES() \ TEST_METHOD_PROPERTY( \ - L"Kits.Specification", \ - L"Device.Graphics.D3D12.DXILCore.ShaderModel69.DoublePrecision") \ + L"Kits.Specification", \ + L"Device.Graphics.D3D12.DXILCore.ShaderModel69.DoublePrecision") \ END_TEST_METHOD_PROPERTIES() \ runTest(); \ } @@ -1819,8 +1819,8 @@ using namespace LongVector; TEST_METHOD(Op##_##DataType) { \ BEGIN_TEST_METHOD_PROPERTIES() \ TEST_METHOD_PROPERTY( \ - L"Kits.Specification", \ - L"Device.Graphics.D3D12.DXILCore.ShaderModel69.CoreRequirement") \ + L"Kits.Specification", \ + L"Device.Graphics.D3D12.DXILCore.ShaderModel69.CoreRequirement") \ END_TEST_METHOD_PROPERTIES() \ runWaveOpTest(); \ } @@ -1829,8 +1829,8 @@ using namespace LongVector; TEST_METHOD(Op##_##DataType) { \ BEGIN_TEST_METHOD_PROPERTIES() \ TEST_METHOD_PROPERTY( \ - L"Kits.Specification", \ - L"Device.Graphics.D3D12.DXILCore.ShaderModel69.DoublePrecision") \ + L"Kits.Specification", \ + L"Device.Graphics.D3D12.DXILCore.ShaderModel69.DoublePrecision") \ END_TEST_METHOD_PROPERTIES() \ runWaveOpTest(); \ } @@ -1838,8 +1838,9 @@ using namespace LongVector; class DxilConf_SM69_Vectorized { public: BEGIN_TEST_CLASS(DxilConf_SM69_Vectorized) - TEST_CLASS_PROPERTY(L"Kits.TestName", - L"D3D12 - Shader Model 6.9 - Vectorized DXIL - Core Tests") + TEST_CLASS_PROPERTY( + L"Kits.TestName", + L"D3D12 - Shader Model 6.9 - Vectorized DXIL - Core Tests") TEST_CLASS_PROPERTY(L"Kits.TestId", L"81db1ff8-5bc5-48a1-8d7b-600fc600a677") TEST_CLASS_PROPERTY(L"Kits.Description", L"Validates required SM 6.9 vectorized DXIL operations")