Add khr as an option.

s-perron · s-perron · commit 3746b6028673 · 2025-08-21T09:55:46.000-04:00
diff --git a/clang/lib/Driver/ToolChains/HLSL.cpp b/clang/lib/Driver/ToolChains/HLSL.cpp
@@ -250,7 +250,7 @@ SmallString<1024> getSpirvExtArg(ArrayRef<std::string> SpvExtensionArgs) {
 }
 
 bool isValidSPIRVExtensionName(const std::string &str) {
-  std::regex pattern("dxc|DXC|KHR|SPV_[a-zA-Z0-9_]+");
+  std::regex pattern("dxc|DXC|khr|KHR|SPV_[a-zA-Z0-9_]+");
   return std::regex_match(str, pattern);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ SmallString<1024> getSpirvExtArg(ArrayRef<std::string> SpvExtensionArgs) {`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`bool isValidSPIRVExtensionName(const std::string &str) {`
`253`		`- std::regex pattern("dxc\|DXC\|KHR\|SPV_[a-zA-Z0-9_]+");`
	`253`	`+ std::regex pattern("dxc\|DXC\|khr\|KHR\|SPV_[a-zA-Z0-9_]+");`
`254`	`254`	`return std::regex_match(str, pattern);`
`255`	`255`	`}`
`256`	`256`