Prepare OpenCL passes and LTO for C++20

jaladreips · igcbot · commit c4f2335ac9b3 · 2025-04-21T22:56:01.000+02:00
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/BufferBoundsChecking/BufferBoundsCheckingPatcher.hpp b/IGC/Compiler/Optimizer/OpenCLPasses/BufferBoundsChecking/BufferBoundsCheckingPatcher.hpp
@@ -24,7 +24,7 @@ namespace IGC
     {
     public:
         static char ID;
-        static constexpr char* BUFFER_SIZE_PLACEHOLDER_FUNCTION_NAME = "__bufferboundschecking.bufferSizePlaceholder";
+        static constexpr const char* BUFFER_SIZE_PLACEHOLDER_FUNCTION_NAME = "__bufferboundschecking.bufferSizePlaceholder";
 
         BufferBoundsCheckingPatcher();
         ~BufferBoundsCheckingPatcher() = default;
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/DpasFuncs/DpasFuncsResolution.cpp b/IGC/Compiler/Optimizer/OpenCLPasses/DpasFuncs/DpasFuncsResolution.cpp
@@ -684,7 +684,7 @@ bool DpasFuncsResolution::processCvt(CallInst& CI)
         args[0]->getType()
     };
     Function* cvtFunc = GenISAIntrinsic::getDeclaration(func->getParent(), iid, ITys);
-    char* cvt = "bf_cvt";
+    const char* cvt = "bf_cvt";
     if (iid == GenISAIntrinsic::GenISA_hftobf8 ||
         iid == GenISAIntrinsic::GenISA_bf8tohf)
     {

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ namespace IGC`
`24`	`24`	`{`
`25`	`25`	`public:`
`26`	`26`	`static char ID;`
`27`		`- static constexpr char* BUFFER_SIZE_PLACEHOLDER_FUNCTION_NAME = "__bufferboundschecking.bufferSizePlaceholder";`
	`27`	`+ static constexpr const char* BUFFER_SIZE_PLACEHOLDER_FUNCTION_NAME = "__bufferboundschecking.bufferSizePlaceholder";`
`28`	`28`
`29`	`29`	`BufferBoundsCheckingPatcher();`
`30`	`30`	`~BufferBoundsCheckingPatcher() = default;`
Original file line number	Diff line number	Diff line change
`@@ -684,7 +684,7 @@ bool DpasFuncsResolution::processCvt(CallInst& CI)`
`684`	`684`	`args[0]->getType()`
`685`	`685`	`};`
`686`	`686`	`Function* cvtFunc = GenISAIntrinsic::getDeclaration(func->getParent(), iid, ITys);`
`687`		`- char* cvt = "bf_cvt";`
	`687`	`+ const char* cvt = "bf_cvt";`
`688`	`688`	`if (iid == GenISAIntrinsic::GenISA_hftobf8 \|\|`
`689`	`689`	`iid == GenISAIntrinsic::GenISA_bf8tohf)`
`690`	`690`	`{`