Skip to content

Commit 1997b10

Browse files
committed
fix the feature description
1 parent fce0b6b commit 1997b10

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

clang/include/clang/Basic/LangOptions.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ ENUM_LANGOPT(HLSLVersion, HLSLLangStd, 16, HLSL_Unset, NotCompatible, "HLSL Vers
243243
LANGOPT(HLSLStrictAvailability, 1, 0, NotCompatible,
244244
"Strict availability diagnostic mode for HLSL built-in functions.")
245245
LANGOPT(HLSLSpvUseUnknownImageFormat, 1, 0, NotCompatible, "For storage images and texel buffers, sets the default format to 'Unknown' when not specified via the `vk::image_format` attribute. If this option is not used, the format is inferred from the resource's data type.")
246-
LANGOPT(HLSLSpvEnableMaximalReconvergence, 1, 0, NotCompatible, "Enables maximal reconvergence for SPIR-V codegen. This ensures that all control flow merges at the nearest possible merge point as defined by the Vulkan spec.")
246+
LANGOPT(HLSLSpvEnableMaximalReconvergence, 1, 0, NotCompatible, "Enables the MaximallyReconvergesKHR execution mode for this module. This ensures that control flow reconverges at well-defined merge points as defined by the Vulkan spec.")
247247

248248
LANGOPT(CUDAIsDevice , 1, 0, NotCompatible, "compiling for CUDA device")
249249
LANGOPT(CUDAHostDeviceConstexpr, 1, 1, NotCompatible, "treating unattributed constexpr functions as __host__ __device__")

clang/include/clang/Driver/Options.td

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9604,9 +9604,9 @@ def fhlsl_spv_enable_maximal_reconvergence
96049604
: Flag<["-"], "fspv-enable-maximal-reconvergence">,
96059605
Group<dxc_Group>,
96069606
Visibility<[CC1Option, DXCOption]>,
9607-
HelpText<"Enables maximal reconvergence for SPIR-V codegen. This ensures "
9608-
"that all control flow merges at the nearest possible merge point "
9609-
"as defined by the Vulkan spec.">,
9607+
HelpText<"Enables the MaximallyReconvergesKHR execution mode for this "
9608+
"module. This ensures that control flow reconverges at "
9609+
"well-defined merge points as defined by the Vulkan spec.">,
96109610
MarshallingInfoFlag<LangOpts<"HLSLSpvEnableMaximalReconvergence">>;
96119611

96129612
def no_wasm_opt : Flag<["--"], "no-wasm-opt">,

clang/test/CodeGenHLSL/vk-features/maximal_reconvergence.hlsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ void test() {
1414
// CHECK-ENTRY: define void @test() [[attributeNumber:#[0-9]+]] {
1515
}
1616

17-
// CHECK-ENTRY: attributes [[attributeNumber]] = {{.*}} "enable-maximal-reconvergence"="true" {{.*}}
17+
// CHECK-ENTRY: attributes [[attributeNumber]] = {{.*}} "enable-maximal-reconvergence"="true" {{.*}}

0 commit comments

Comments
 (0)