Merge from 'sycl' to 'sycl-web'

iclsrc · iclsrc · commit 9eeba35112c8 · 2021-07-12T09:45:24.000-07:00
diff --git a/sycl/plugins/cuda/pi_cuda.cpp b/sycl/plugins/cuda/pi_cuda.cpp
@@ -1283,7 +1283,7 @@ pi_result cuda_piDeviceGetInfo(pi_device device, pi_device_info param_name,
                              device->get()) == CUDA_SUCCESS);
 
     cl::sycl::detail::pi::assertion((ecc_enabled == 0) | (ecc_enabled == 1));
-    auto result = static_cast<bool>(ecc_enabled);
+    auto result = static_cast<pi_bool>(ecc_enabled);
     return getInfo(param_value_size, param_value, param_value_size_ret, result);
   }
   case PI_DEVICE_INFO_HOST_UNIFIED_MEMORY: {
@@ -1294,7 +1294,7 @@ pi_result cuda_piDeviceGetInfo(pi_device device, pi_device_info param_name,
 
     cl::sycl::detail::pi::assertion((is_integrated == 0) |
                                     (is_integrated == 1));
-    auto result = static_cast<bool>(is_integrated);
+    auto result = static_cast<pi_bool>(is_integrated);
     return getInfo(param_value_size, param_value, param_value_size_ret, result);
   }
   case PI_DEVICE_INFO_PROFILING_TIMER_RESOLUTION: {
@@ -1304,16 +1304,20 @@ pi_result cuda_piDeviceGetInfo(pi_device device, pi_device_info param_name,
                    size_t{1000u});
   }
   case PI_DEVICE_INFO_ENDIAN_LITTLE: {
-    return getInfo(param_value_size, param_value, param_value_size_ret, true);
+    return getInfo(param_value_size, param_value, param_value_size_ret,
+                   PI_TRUE);
   }
   case PI_DEVICE_INFO_AVAILABLE: {
-    return getInfo(param_value_size, param_value, param_value_size_ret, true);
+    return getInfo(param_value_size, param_value, param_value_size_ret,
+                   PI_TRUE);
   }
   case PI_DEVICE_INFO_COMPILER_AVAILABLE: {
-    return getInfo(param_value_size, param_value, param_value_size_ret, true);
+    return getInfo(param_value_size, param_value, param_value_size_ret,
+                   PI_TRUE);
   }
   case PI_DEVICE_INFO_LINKER_AVAILABLE: {
-    return getInfo(param_value_size, param_value, param_value_size_ret, true);
+    return getInfo(param_value_size, param_value, param_value_size_ret,
+                   PI_TRUE);
   }
   case PI_DEVICE_INFO_EXECUTION_CAPABILITIES: {
     auto capability = CL_EXEC_KERNEL;
@@ -1403,7 +1407,8 @@ pi_result cuda_piDeviceGetInfo(pi_device device, pi_device_info param_name,
                    size_t{1024u});
   }
   case PI_DEVICE_INFO_PREFERRED_INTEROP_USER_SYNC: {
-    return getInfo(param_value_size, param_value, param_value_size_ret, true);
+    return getInfo(param_value_size, param_value, param_value_size_ret,
+                   PI_TRUE);
   }
   case PI_DEVICE_INFO_PARENT_DEVICE: {
     return getInfo(param_value_size, param_value, param_value_size_ret,
diff --git a/sycl/plugins/rocm/pi_rocm.cpp b/sycl/plugins/rocm/pi_rocm.cpp
@@ -1233,7 +1233,7 @@ pi_result rocm_piDeviceGetInfo(pi_device device, pi_device_info param_name,
                               device->get()) == hipSuccess);
 
     cl::sycl::detail::pi::assertion((ecc_enabled == 0) | (ecc_enabled == 1));
-    auto result = static_cast<bool>(ecc_enabled);
+    auto result = static_cast<pi_bool>(ecc_enabled);
     return getInfo(param_value_size, param_value, param_value_size_ret, result);
   }
   case PI_DEVICE_INFO_HOST_UNIFIED_MEMORY: {
@@ -1244,7 +1244,7 @@ pi_result rocm_piDeviceGetInfo(pi_device device, pi_device_info param_name,
 
     cl::sycl::detail::pi::assertion((is_integrated == 0) |
                                     (is_integrated == 1));
-    auto result = static_cast<bool>(is_integrated);
+    auto result = static_cast<pi_bool>(is_integrated);
     return getInfo(param_value_size, param_value, param_value_size_ret, result);
   }
   case PI_DEVICE_INFO_PROFILING_TIMER_RESOLUTION: {
@@ -1254,16 +1254,20 @@ pi_result rocm_piDeviceGetInfo(pi_device device, pi_device_info param_name,
                    size_t{1000u});
   }
   case PI_DEVICE_INFO_ENDIAN_LITTLE: {
-    return getInfo(param_value_size, param_value, param_value_size_ret, true);
+    return getInfo(param_value_size, param_value, param_value_size_ret,
+                   PI_TRUE);
   }
   case PI_DEVICE_INFO_AVAILABLE: {
-    return getInfo(param_value_size, param_value, param_value_size_ret, true);
+    return getInfo(param_value_size, param_value, param_value_size_ret,
+                   PI_TRUE);
   }
   case PI_DEVICE_INFO_COMPILER_AVAILABLE: {
-    return getInfo(param_value_size, param_value, param_value_size_ret, true);
+    return getInfo(param_value_size, param_value, param_value_size_ret,
+                   PI_TRUE);
   }
   case PI_DEVICE_INFO_LINKER_AVAILABLE: {
-    return getInfo(param_value_size, param_value, param_value_size_ret, true);
+    return getInfo(param_value_size, param_value, param_value_size_ret,
+                   PI_TRUE);
   }
   case PI_DEVICE_INFO_EXECUTION_CAPABILITIES: {
     auto capability = CL_EXEC_KERNEL;
@@ -1333,7 +1337,8 @@ pi_result rocm_piDeviceGetInfo(pi_device device, pi_device_info param_name,
                    size_t{1024u});
   }
   case PI_DEVICE_INFO_PREFERRED_INTEROP_USER_SYNC: {
-    return getInfo(param_value_size, param_value, param_value_size_ret, true);
+    return getInfo(param_value_size, param_value, param_value_size_ret,
+                   PI_TRUE);
   }
   case PI_DEVICE_INFO_PARENT_DEVICE: {
     return getInfo(param_value_size, param_value, param_value_size_ret,

Original file line number	Diff line number	Diff line change
`@@ -1283,7 +1283,7 @@ pi_result cuda_piDeviceGetInfo(pi_device device, pi_device_info param_name,`
`1283`	`1283`	`device->get()) == CUDA_SUCCESS);`
`1284`	`1284`
`1285`	`1285`	`cl::sycl::detail::pi::assertion((ecc_enabled == 0) \| (ecc_enabled == 1));`
`1286`		`- auto result = static_cast<bool>(ecc_enabled);`
	`1286`	`+ auto result = static_cast<pi_bool>(ecc_enabled);`
`1287`	`1287`	`return getInfo(param_value_size, param_value, param_value_size_ret, result);`
`1288`	`1288`	`}`
`1289`	`1289`	`case PI_DEVICE_INFO_HOST_UNIFIED_MEMORY: {`
`@@ -1294,7 +1294,7 @@ pi_result cuda_piDeviceGetInfo(pi_device device, pi_device_info param_name,`
`1294`	`1294`
`1295`	`1295`	`cl::sycl::detail::pi::assertion((is_integrated == 0) \|`
`1296`	`1296`	`(is_integrated == 1));`
`1297`		`- auto result = static_cast<bool>(is_integrated);`
	`1297`	`+ auto result = static_cast<pi_bool>(is_integrated);`
`1298`	`1298`	`return getInfo(param_value_size, param_value, param_value_size_ret, result);`
`1299`	`1299`	`}`
`1300`	`1300`	`case PI_DEVICE_INFO_PROFILING_TIMER_RESOLUTION: {`
`@@ -1304,16 +1304,20 @@ pi_result cuda_piDeviceGetInfo(pi_device device, pi_device_info param_name,`
`1304`	`1304`	`size_t{1000u});`
`1305`	`1305`	`}`
`1306`	`1306`	`case PI_DEVICE_INFO_ENDIAN_LITTLE: {`
`1307`		`- return getInfo(param_value_size, param_value, param_value_size_ret, true);`
	`1307`	`+ return getInfo(param_value_size, param_value, param_value_size_ret,`
	`1308`	`+ PI_TRUE);`
`1308`	`1309`	`}`
`1309`	`1310`	`case PI_DEVICE_INFO_AVAILABLE: {`
`1310`		`- return getInfo(param_value_size, param_value, param_value_size_ret, true);`
	`1311`	`+ return getInfo(param_value_size, param_value, param_value_size_ret,`
	`1312`	`+ PI_TRUE);`
`1311`	`1313`	`}`
`1312`	`1314`	`case PI_DEVICE_INFO_COMPILER_AVAILABLE: {`
`1313`		`- return getInfo(param_value_size, param_value, param_value_size_ret, true);`
	`1315`	`+ return getInfo(param_value_size, param_value, param_value_size_ret,`
	`1316`	`+ PI_TRUE);`
`1314`	`1317`	`}`
`1315`	`1318`	`case PI_DEVICE_INFO_LINKER_AVAILABLE: {`
`1316`		`- return getInfo(param_value_size, param_value, param_value_size_ret, true);`
	`1319`	`+ return getInfo(param_value_size, param_value, param_value_size_ret,`
	`1320`	`+ PI_TRUE);`
`1317`	`1321`	`}`
`1318`	`1322`	`case PI_DEVICE_INFO_EXECUTION_CAPABILITIES: {`
`1319`	`1323`	`auto capability = CL_EXEC_KERNEL;`
`@@ -1403,7 +1407,8 @@ pi_result cuda_piDeviceGetInfo(pi_device device, pi_device_info param_name,`
`1403`	`1407`	`size_t{1024u});`
`1404`	`1408`	`}`
`1405`	`1409`	`case PI_DEVICE_INFO_PREFERRED_INTEROP_USER_SYNC: {`
`1406`		`- return getInfo(param_value_size, param_value, param_value_size_ret, true);`
	`1410`	`+ return getInfo(param_value_size, param_value, param_value_size_ret,`
	`1411`	`+ PI_TRUE);`
`1407`	`1412`	`}`
`1408`	`1413`	`case PI_DEVICE_INFO_PARENT_DEVICE: {`
`1409`	`1414`	`return getInfo(param_value_size, param_value, param_value_size_ret,`
Original file line number	Diff line number	Diff line change
`@@ -1233,7 +1233,7 @@ pi_result rocm_piDeviceGetInfo(pi_device device, pi_device_info param_name,`
`1233`	`1233`	`device->get()) == hipSuccess);`
`1234`	`1234`
`1235`	`1235`	`cl::sycl::detail::pi::assertion((ecc_enabled == 0) \| (ecc_enabled == 1));`
`1236`		`- auto result = static_cast<bool>(ecc_enabled);`
	`1236`	`+ auto result = static_cast<pi_bool>(ecc_enabled);`
`1237`	`1237`	`return getInfo(param_value_size, param_value, param_value_size_ret, result);`
`1238`	`1238`	`}`
`1239`	`1239`	`case PI_DEVICE_INFO_HOST_UNIFIED_MEMORY: {`
`@@ -1244,7 +1244,7 @@ pi_result rocm_piDeviceGetInfo(pi_device device, pi_device_info param_name,`
`1244`	`1244`
`1245`	`1245`	`cl::sycl::detail::pi::assertion((is_integrated == 0) \|`
`1246`	`1246`	`(is_integrated == 1));`
`1247`		`- auto result = static_cast<bool>(is_integrated);`
	`1247`	`+ auto result = static_cast<pi_bool>(is_integrated);`
`1248`	`1248`	`return getInfo(param_value_size, param_value, param_value_size_ret, result);`
`1249`	`1249`	`}`
`1250`	`1250`	`case PI_DEVICE_INFO_PROFILING_TIMER_RESOLUTION: {`
`@@ -1254,16 +1254,20 @@ pi_result rocm_piDeviceGetInfo(pi_device device, pi_device_info param_name,`
`1254`	`1254`	`size_t{1000u});`
`1255`	`1255`	`}`
`1256`	`1256`	`case PI_DEVICE_INFO_ENDIAN_LITTLE: {`
`1257`		`- return getInfo(param_value_size, param_value, param_value_size_ret, true);`
	`1257`	`+ return getInfo(param_value_size, param_value, param_value_size_ret,`
	`1258`	`+ PI_TRUE);`
`1258`	`1259`	`}`
`1259`	`1260`	`case PI_DEVICE_INFO_AVAILABLE: {`
`1260`		`- return getInfo(param_value_size, param_value, param_value_size_ret, true);`
	`1261`	`+ return getInfo(param_value_size, param_value, param_value_size_ret,`
	`1262`	`+ PI_TRUE);`
`1261`	`1263`	`}`
`1262`	`1264`	`case PI_DEVICE_INFO_COMPILER_AVAILABLE: {`
`1263`		`- return getInfo(param_value_size, param_value, param_value_size_ret, true);`
	`1265`	`+ return getInfo(param_value_size, param_value, param_value_size_ret,`
	`1266`	`+ PI_TRUE);`
`1264`	`1267`	`}`
`1265`	`1268`	`case PI_DEVICE_INFO_LINKER_AVAILABLE: {`
`1266`		`- return getInfo(param_value_size, param_value, param_value_size_ret, true);`
	`1269`	`+ return getInfo(param_value_size, param_value, param_value_size_ret,`
	`1270`	`+ PI_TRUE);`
`1267`	`1271`	`}`
`1268`	`1272`	`case PI_DEVICE_INFO_EXECUTION_CAPABILITIES: {`
`1269`	`1273`	`auto capability = CL_EXEC_KERNEL;`
`@@ -1333,7 +1337,8 @@ pi_result rocm_piDeviceGetInfo(pi_device device, pi_device_info param_name,`
`1333`	`1337`	`size_t{1024u});`
`1334`	`1338`	`}`
`1335`	`1339`	`case PI_DEVICE_INFO_PREFERRED_INTEROP_USER_SYNC: {`
`1336`		`- return getInfo(param_value_size, param_value, param_value_size_ret, true);`
	`1340`	`+ return getInfo(param_value_size, param_value, param_value_size_ret,`
	`1341`	`+ PI_TRUE);`
`1337`	`1342`	`}`
`1338`	`1343`	`case PI_DEVICE_INFO_PARENT_DEVICE: {`
`1339`	`1344`	`return getInfo(param_value_size, param_value, param_value_size_ret,`