libclc: Add clspv64 target

[kpet]

Summary

Add a variant of the clspv target that is built using spir64.
This is a pre-requisite to supporting spir64 in clspv which is
required to take advantage of SPV_KHR_physical_storage_buffer which
in turn enables more OpenCL C programs to be compiled with clspv.

[kpet]

Adding missing clspv64 symlink to the diff.

[alan-baker]

Which version of physical storage buffer do you intend to support? Because if 64-bit integers can be assumes, then the clspv64 target should use the generic implementation of fma instead of the one the standard clspv target uses to avoid all the carry bit logic.

[kpet]

I've done my prototyping assuming support for 64-bit integers but, unfortunately, some targets of interest don't support 64-bit yet so I will likely end up implementing support for both paths (64-bit integers and uvec2) in clspv. I've mapped the clspv64 target to the version that doesn't require 64-bit integers for compatibility, to avoid carrying two builds of the library in clspv (each build adds about 2MB to the binary size). Looking at both implementations of fma, I'm not overly concerned about always using the version that doesn't require support for 64-bit integers for now. Both will be excruciatingly slow compared to hardware support anyway. Longer-term we can either assume support for 64-bit integers once more prevalent in the Vulkan ecosystem or introduce an additional variant of the library but I'd rather treat this as a future optimisation if that works for you.

[alan-baker]

Sounds reasonable. I agree the high precision fma is already very slow.

[jvesely]

Was this tested on an existing device, or is it just for completion (since there already is clspv target)?

libclc/CMakeLists.txt

221

wrong formatting. If you spill over to the next line keep NOT close to the negated element and align to match the first line

253

formatting issue

308

just add another elseif branch for better readability. Nested if is not saving much

[kpet]

Thanks for the review. I've now addressed the comments, PTAL.

[jvesely]

LGTM.

thanks

[kpet]

Thanks! Now committed.

libclc/CMakeLists.txt

308

I did it with nesting to mirror what was done for spirv and spirv64 and de-duplicate flag setting. There are fewer flags with clspv* targets though. I've removed nesting and agree it's more readable.

libclc/CMakeLists.txt

   amdgcn-mesa3d/lib/SOURCES;
   amdgpu/lib/SOURCES;
   clspv/lib/SOURCES;
+  clspv64/lib/SOURCES;
   generic/lib/SOURCES;
   ptx/lib/SOURCES;
   ptx-nvidiacl/lib/SOURCES;

   amdgcn--
   amdgcn--amdhsa
   clspv--
+  clspv64--
   r600--
   nvptx--
   nvptx64--

 set( amdgcn-mesa-mesa3d_devices ${amdgcn--_devices} )
 set( amdgcn--amdhsa_devices none )
 set( clspv--_devices none )
+set( clspv64--_devices none )
 set( nvptx--_devices none )
 set( nvptx64--_devices none )
 set( nvptx--nvidiacl_devices none )

 
   set( dirs )
 
-  if ( NOT ${ARCH} STREQUAL spirv AND NOT ${ARCH} STREQUAL spirv64 AND NOT ${ARCH} STREQUAL clspv )
+  if ( NOT ${ARCH} STREQUAL spirv AND NOT ${ARCH} STREQUAL spirv64 AND NOT
+            ${ARCH} STREQUAL clspv AND NOT ${ARCH} STREQUAL clspv64)
     LIST( APPEND dirs generic )
   endif()
 

 
   # Add the generated convert.cl here to prevent adding
   # the one listed in SOURCES
-  if( NOT ${ARCH} STREQUAL "spirv" AND NOT ${ARCH} STREQUAL "spirv64" AND NOT ${ARCH} STREQUAL "clspv" )
+  if( NOT ${ARCH} STREQUAL "spirv" AND NOT ${ARCH} STREQUAL "spirv64" AND
+            NOT ${ARCH} STREQUAL "clspv" AND NOT ${ARCH} STREQUAL "clspv64" )
     set( rel_files convert.cl )
     set( objects convert.cl )
     if( NOT ENABLE_RUNTIME_SUBNORMAL )

       set( build_flags -O0 -finline-hint-functions )
       set( opt_flags )
       set( spvflags --spirv-max-version=1.1 )
-    elseif( ${ARCH} STREQUAL "clspv" )
-      set( t "spir--" )
+    elseif( ${ARCH} STREQUAL "clspv" OR ${ARCH} STREQUAL "clspv64" )
+      if( ${ARCH} STREQUAL "clspv" )
+        set( t "spir--" )
+      else()
+        set( t "spir64--" )
+      endif()
       set( build_flags )
       set( opt_flags -O3 )
     else()

libclc/clspv64

+clspv
 No newline at end of file