adapt fixers to PR CL#1215

SunSerega · Aug 26, 2024 · 5c79770 · 5c79770
1 parent abdf2f8
commit 5c79770
Show file tree

Hide file tree

Showing 15 changed files with 1,693 additions and 1,357 deletions.
diff --git a/DataScraping/Reps/OpenCL-Docs b/DataScraping/Reps/OpenCL-Docs
diff --git a/DataScraping/XML/OpenCL/funcs.bin b/DataScraping/XML/OpenCL/funcs.bin
diff --git a/Log/OpenCL.log b/Log/OpenCL.log
@@ -55,19 +55,10 @@ Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: F
 Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: Func [cl::GetAcceleratorInfo + INTEL] could not generate overload: no output type info for Group [cl::AcceleratorInfo] Enum [cl::ACCELERATOR_DESCRIPTOR]
 Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Dumping Feature items
 Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::CompileProgram]
-Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueFillBuffer]
-Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueMapImage]
 Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueMigrateMemObjects]
-Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueNativeKernel]
-Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 30>12 overloads of non-fixed Func [cl::EnqueueNDRangeKernel]
-Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueReadBuffer]
 Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueSVMFree]
-Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueSVMMemFill]
-Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueSVMMigrateMem]
-Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueWriteBuffer]
 Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Dumping Extension items
 Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueSVMFree + ARM]
-Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueSVMMemFill + ARM]
 Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueMigrateMemObject + EXT]
 Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 30>12 overloads of non-fixed Func [cl::EnqueueGenerateMipmap + IMG]
 Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueAcquireGrallocObjects + IMG]

diff --git a/Modules.Packed/OpenCL.pas b/Modules.Packed/OpenCL.pas
diff --git a/Packing/Descriptions/OpenCL.predoc b/Packing/Descriptions/OpenCL.predoc
diff --git a/Packing/Template/LowLvl/CodeContainerItems.pas b/Packing/Template/LowLvl/CodeContainerItems.pas
@@ -2979,7 +2979,7 @@   FuncParamTChanges = record
         raise new MessageException($'ERROR: {FixerInfo(f)} had wrong param count');
 
       for var i := 0 to changes.Length-1 do
-        foreach var (is_add, t) in changes[i].changes_maker() do
+        foreach var (is_add, t) in changes[i].changes_maker().OrderBy(\(is_add, t) -> is_add) do
           if is_add then
           begin
             if t in f.possible_par_types[i+ind_nudge] then
@@ -2991,12 +2991,16 @@   FuncParamTChanges = record
               if t.var_arg and ((t.tname='IntPtr') or t.IsGeneric) then
                 if ppt.Remove(new FuncParamT(t.is_const, false, 0, KnownDirectTypes.IntPtr)) then
                   ppt.Add(new FuncParamT(t.is_const, false, 0, KnownDirectTypes.Pointer));
+              if not is_auto_fixer then
+                f.changed_by_fixer := true;
             end;
           end else
           begin
             if f.possible_par_types[i+ind_nudge].Remove(t) then
               self.ReportUsed else
               ErrorInfo(f, 'remove', i+ind_nudge, t, f.possible_par_types[i+ind_nudge]);
+            if not is_auto_fixer then
+              f.changed_by_fixer := true;
           end;
 
       if is_auto_fixer then
@@ -3093,6 +3097,7 @@   FuncParamTChanges = record
         Otp($'WARNING: {FixerInfo(f)} has not limited pars: {ObjectToString(unlimited_pars)}');
 
       self.ReportUsed;
+      f.changed_by_fixer := true;
       Result := false;
     end;
 

diff --git a/Packing/Template/LowLvl/Fixers/Func/OpenCL/cl_khr_command_buffer.dat b/Packing/Template/LowLvl/Fixers/Func/OpenCL/cl_khr_command_buffer.dat
@@ -1,47 +1,63 @@
 
 
 
+# cl::CommandBarrierWithWaitList+KHR
+!possible_par_types
+ *	| *	| *	| -array of cl::CommandProperties	const	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
+
+# cl::CommandCopyBuffer+KHR
+!possible_par_types
+ *	| *	| *	| -array of cl::CommandProperties	const	| *	| *	| *	| *	| *	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
+
 # cl::CommandCopyBufferRect+KHR
 !possible_par_types
- *	| *	| *	| *	| *	| -array of UIntPtr	const	| -array of UIntPtr	const	| -array of UIntPtr	const	| *	| *	| *	| *	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
+ *	| *	| *	| -array of cl::CommandProperties	const	| *	| *	| -array of UIntPtr	const	| -array of UIntPtr	const	| -array of UIntPtr	const	| *	| *	| *	| *	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
 !limit_ovrs
- *	| *	| *	| *	| *	| var UIntPtr		const	| var UIntPtr		const	| var UIntPtr		const	| *	| *	| *	| *	| *	| *							| *							| *								|
- *	| *	| *	| *	| *	| IntPtr			const	| IntPtr			const	| IntPtr			const	| *	| *	| *	| *	| *	| *							| *							| *								|
+ *	| *	| *	| *											| *	| *	| var UIntPtr		const	| var UIntPtr		const	| var UIntPtr		const	| *	| *	| *	| *	| *	| *							| *							| *								|
+ *	| *	| *	| *											| *	| *	| IntPtr			const	| IntPtr			const	| IntPtr			const	| *	| *	| *	| *	| *	| *							| *							| *								|
 
-# cl::CommandCopyImage+KHR
+# cl::CommandCopyBufferToImage+KHR
 !possible_par_types
- *	| *	| *	| *	| *	| -array of UIntPtr	const	| -array of UIntPtr	const	| -array of UIntPtr	const	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
+ *	| *	| *	| -array of cl::CommandProperties	const	| *	| *	| *	| -array of UIntPtr	const	| -array of UIntPtr	const	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
 !limit_ovrs
- *	| *	| *	| *	| *	| var UIntPtr		const	| var UIntPtr		const	| var UIntPtr		const	| *	| *							| *							| *								|
- *	| *	| *	| *	| *	| IntPtr			const	| IntPtr			const	| IntPtr			const	| *	| *							| *							| *								|
+ *	| *	| *	| *											| *	| *	| *	| var UIntPtr		const	| var UIntPtr		const	| *	| *							| *							| *								|
+ *	| *	| *	| *											| *	| *	| *	| IntPtr			const	| IntPtr			const	| *	| *							| *							| *								|
 
-# cl::CommandCopyBufferToImage+KHR
+# cl::CommandCopyImage+KHR
 !possible_par_types
- *	| *	| *	| *	| *	| *	| -array of UIntPtr	const	| -array of UIntPtr	const	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
+ *	| *	| *	| -array of cl::CommandProperties	const	| *	| *	| -array of UIntPtr	const	| -array of UIntPtr	const	| -array of UIntPtr	const	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
 !limit_ovrs
- *	| *	| *	| *	| *	| *	| var UIntPtr		const	| var UIntPtr		const	| *	| *							| *							| *								|
- *	| *	| *	| *	| *	| *	| IntPtr			const	| IntPtr			const	| *	| *							| *							| *								|
+ *	| *	| *	| *											| *	| *	| var UIntPtr		const	| var UIntPtr		const	| var UIntPtr		const	| *	| *							| *							| *								|
+ *	| *	| *	| *											| *	| *	| IntPtr			const	| IntPtr			const	| IntPtr			const	| *	| *							| *							| *								|
 
 # cl::CommandCopyImageToBuffer+KHR
 !possible_par_types
- *	| *	| *	| *	| *	| -array of UIntPtr	const	| -array of UIntPtr	const	| *	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
+ *	| *	| *	| -array of cl::CommandProperties	const	| *	| *	| -array of UIntPtr	const	| -array of UIntPtr	const	| *	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
 !limit_ovrs
- *	| *	| *	| *	| *	| var UIntPtr		const	| var UIntPtr		const	| *	| *	| *							| *							| *								|
- *	| *	| *	| *	| *	| IntPtr			const	| IntPtr			const	| *	| *	| *							| *							| *								|
-
+ *	| *	| *	| *											| *	| *	| var UIntPtr		const	| var UIntPtr		const	| *	| *	| *							| *							| *								|
+ *	| *	| *	| *											| *	| *	| IntPtr			const	| IntPtr			const	| *	| *	| *							| *							| *								|
 
+# cl::CommandFillBuffer+KHR
+!possible_par_types
+ *	| *	| *	| -array of cl::CommandProperties	const	| *	| +var T const	| *	| *	| *	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
 
 # cl::CommandFillImage+KHR
 !possible_par_types
- *	| *	| *	| *	| +var T const	| -array of UIntPtr const -IntPtr const	| -array of UIntPtr const -IntPtr const	| *	| -array of UInt32 const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
-
-
+ *	| *	| *	| -array of cl::CommandProperties	const	| *	| +var T const	| -array of UIntPtr const -IntPtr const	| -array of UIntPtr const -IntPtr const	| *	| -array of UInt32 const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
 
 # cl::CommandNDRangeKernel+KHR
 !possible_par_types
- *	| *	| *	| -array of cl::NDRangeKernelCommandProperties	const	| *	| *	| -array of UIntPtr	const	| -array of UIntPtr	const	| -array of UIntPtr	const	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
+ *	| *	| *	| -array of cl::CommandProperties	const	| *	| *	| -array of UIntPtr	const	| -array of UIntPtr	const	| -array of UIntPtr	const	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
 !limit_ovrs
- *	| *	| *	| var cl::NDRangeKernelCommandProperties		const	| *	| *	| var UIntPtr		const	| var UIntPtr		const	| var UIntPtr		const	| *	| *							| *							| *								|
- *	| *	| *	| IntPtr										const	| *	| *	| IntPtr			const	| IntPtr			const	| IntPtr			const	| *	| *							| *							| *								|
+ *	| *	| *	| *											| *	| *	| var UIntPtr		const	| var UIntPtr		const	| var UIntPtr		const	| *	| *							| *							| *								|
+ *	| *	| *	| *											| *	| *	| IntPtr			const	| IntPtr			const	| IntPtr			const	| *	| *							| *							| *								|
+
+# cl::CommandSVMMemcpy+KHR 
+!possible_par_types
+ *	| *	| *	| -array of cl::CommandProperties	const	| *	| *	| *	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
+
+# cl::CommandSVMMemFill+KHR 
+!possible_par_types
+ *	| *	| *	| -array of cl::CommandProperties	const	| *	| *	| *	| *	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
 
 
diff --git a/Packing/Template/LowLvl/Fixers/Group/OpenCL/0Misc.dat b/Packing/Template/LowLvl/Fixers/Group/OpenCL/0Misc.dat
@@ -39,10 +39,6 @@ cl::DeviceSVMCapabilities
 !rename
 cl::DeviceOnDeviceEnqueueCapabilities
 
-# cl::NdrangeKernelCommandProperties
-!rename
-cl::NDRangeKernelCommandProperties
-
 # cl::D3d[%v:10,11%]Device[%end:Set,Source%]
 !rename
 cl::D3D{%v%}Device{%end%}