Added bitmask for returned value from OpenCL 3.0 runtime

Lamzed-Short, Andrew · Lamzed-Short, Andrew · commit d9c49ff91c77 · 2023-03-09T05:14:49.000-08:00
Unsure whether ACQUIRE and RELEASE need removing as current pi.h expects
5 bits for memory order info but the OCL headers say only 3 are necessary
in 3.0 as the values are RELAXED, ACQ_REL, and SEQ_CST.
diff --git a/sycl/include/sycl/detail/pi.h b/sycl/include/sycl/detail/pi.h
@@ -554,6 +554,8 @@ constexpr pi_memory_order_capabilities PI_MEMORY_ORDER_RELEASE = 0x04;
 constexpr pi_memory_order_capabilities PI_MEMORY_ORDER_ACQ_REL = 0x08;
 constexpr pi_memory_order_capabilities PI_MEMORY_ORDER_SEQ_CST = 0x10;
 
+constexpr pi_memory_order_capabilities PI_MEMORY_ORDER_BITMASK = 0x07;
+
 using pi_memory_scope_capabilities = pi_bitfield;
 constexpr pi_memory_scope_capabilities PI_MEMORY_SCOPE_WORK_ITEM = 0x01;
 constexpr pi_memory_scope_capabilities PI_MEMORY_SCOPE_SUB_GROUP = 0x02;
diff --git a/sycl/plugins/opencl/pi_opencl.cpp b/sycl/plugins/opencl/pi_opencl.cpp
@@ -311,7 +311,7 @@ pi_result piDeviceGetInfo(pi_device device, pi_device_info paramName,
       cl_int result = clGetDeviceInfo(
           cast<cl_device_id>(device), cast<cl_device_info>(paramName),
           paramValueSize, paramValue, paramValueSizeRet);
-      return static_cast<pi_result>(result);
+      return static_cast<pi_result>(result & PI_MEMORY_ORDER_BITMASK);
     }
   }
   case PI_DEVICE_INFO_ATOMIC_64: {

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ pi_result piDeviceGetInfo(pi_device device, pi_device_info paramName,`
`311`	`311`	`cl_int result = clGetDeviceInfo(`
`312`	`312`	`cast<cl_device_id>(device), cast<cl_device_info>(paramName),`
`313`	`313`	`paramValueSize, paramValue, paramValueSizeRet);`
`314`		`- return static_cast<pi_result>(result);`
	`314`	`+ return static_cast<pi_result>(result & PI_MEMORY_ORDER_BITMASK);`
`315`	`315`	`}`
`316`	`316`	`}`
`317`	`317`	`case PI_DEVICE_INFO_ATOMIC_64: {`