Merge branch 'main' of https://github.com/microsoft/DirectXShaderCompiler into user/damyanp/fix-spirv-guards

Author: damyanp

tools/clang/unittests/HLSLExec/LongVectors.cpp

@@ -2996,19 +2996,19 @@ class DxilConf_SM69_Vectorized_Core : public TestClassCommon {
 #define HLK_TEST_DOUBLE(Op, DataType)                                          \
   TEST_METHOD(Op##_##DataType) {                                               \
     BEGIN_TEST_METHOD_PROPERTIES()                                             \
-    TEST_METHOD_PROPERTY(                                                      \
-        "Kits.Specification",                                                  \
-        "Device.Graphics.D3D12.DXILCore.ShaderModel69.DoublePrecision")        \
+    TEST_METHOD_PROPERTY("Kits.Specification",                                 \
+                         "Device.Graphics.D3D12.DXILCore.ShaderModel69."       \
+                         "DoublePrecision.Optional")                           \
     END_TEST_METHOD_PROPERTIES()                                               \
     runTest<DataType, OpType::Op>();                                           \
   }
 
 #define HLK_WAVEOP_TEST_DOUBLE(Op, DataType)                                   \
   TEST_METHOD(Op##_##DataType) {                                               \
     BEGIN_TEST_METHOD_PROPERTIES()                                             \
-    TEST_METHOD_PROPERTY(                                                      \
-        "Kits.Specification",                                                  \
-        "Device.Graphics.D3D12.DXILCore.ShaderModel69.DoublePrecision")        \
+    TEST_METHOD_PROPERTY("Kits.Specification",                                 \
+                         "Device.Graphics.D3D12.DXILCore.ShaderModel69."       \
+                         "DoublePrecision.Optional")                           \
     END_TEST_METHOD_PROPERTIES()                                               \
     runWaveOpTest<DataType, OpType::Op>();                                     \
   }
@@ -3025,7 +3025,7 @@ class DxilConf_SM69_Vectorized_Double : public TestClassCommon {
       "Validates required double precision SM 6.9 vectorized DXIL operations")
   TEST_METHOD_PROPERTY(
       "Kits.Specification",
-      "Device.Graphics.D3D12.DXILCore.ShaderModel69.DoublePrecision")
+      "Device.Graphics.D3D12.DXILCore.ShaderModel69.DoublePrecision.Optional")
   TEST_METHOD_PROPERTY(L"Priority", L"0")
   END_TEST_CLASS()