add an alternate CL_DEVICE_HANDLE_LIST_END_KHR (#253)

bashbaug · web-flow · commit 1bb1a918da2b · 2022-05-04T18:06:21.000-07:00
diff --git a/intercept/src/intercept.cpp b/intercept/src/intercept.cpp
@@ -2293,26 +2293,32 @@ void CLIntercept::getMemPropertiesString(
                 {
                     ++properties;
                     str += "{ ";
-                    do
+                    while( true )
                     {
                         if( *properties == CL_DEVICE_HANDLE_LIST_END_KHR )
                         {
                             str += "CL_DEVICE_HANDLE_LIST_END_KHR";
+                            properties++;
+                            break;
+                        }
+                        else if( *properties == 0x2052 )
+                        {
+                            str += "CL_DEVICE_HANDLE_LIST_END_KHR_0x2502";
+                            properties++;
+                            break;
                         }
                         else
                         {
-                            auto pDevice = (const cl_device_id*)properties;
+                            auto pDevice = (const cl_device_id*)properties++;
                             std::string deviceInfo;
                             getDeviceInfoString(
                                 1,
                                 pDevice,
                                 deviceInfo );
                             str += deviceInfo;
                             str += ", ";
-
                         }
                     }
-                    while( *properties++ != CL_DEVICE_HANDLE_LIST_END_KHR );
                     str += " }";
                 }
                 break;
@@ -2392,26 +2398,32 @@ void CLIntercept::getSemaphorePropertiesString(
                 {
                     ++properties;
                     str += "{ ";
-                    do
+                    while( true )
                     {
                         if( *properties == CL_DEVICE_HANDLE_LIST_END_KHR )
                         {
                             str += "CL_DEVICE_HANDLE_LIST_END_KHR";
+                            properties++;
+                            break;
+                        }
+                        else if( *properties == 0x2052 )
+                        {
+                            str += "CL_DEVICE_HANDLE_LIST_END_KHR_0x2502";
+                            properties++;
+                            break;
                         }
                         else
                         {
-                            auto pDevice = (const cl_device_id*)properties;
+                            auto pDevice = (const cl_device_id*)properties++;
                             std::string deviceInfo;
                             getDeviceInfoString(
                                 1,
                                 pDevice,
                                 deviceInfo );
                             str += deviceInfo;
                             str += ", ";
-
                         }
                     }
-                    while( *properties++ != CL_DEVICE_HANDLE_LIST_END_KHR );
                     str += " }";
                 }
                 break;

Original file line number	Diff line number	Diff line change
`@@ -2293,26 +2293,32 @@ void CLIntercept::getMemPropertiesString(`
`2293`	`2293`	`{`
`2294`	`2294`	`++properties;`
`2295`	`2295`	`str += "{ ";`
`2296`		`- do`
	`2296`	`+ while( true )`
`2297`	`2297`	`{`
`2298`	`2298`	`if( *properties == CL_DEVICE_HANDLE_LIST_END_KHR )`
`2299`	`2299`	`{`
`2300`	`2300`	`str += "CL_DEVICE_HANDLE_LIST_END_KHR";`
	`2301`	`+ properties++;`
	`2302`	`+ break;`
	`2303`	`+ }`
	`2304`	`+ else if( *properties == 0x2052 )`
	`2305`	`+ {`
	`2306`	`+ str += "CL_DEVICE_HANDLE_LIST_END_KHR_0x2502";`
	`2307`	`+ properties++;`
	`2308`	`+ break;`
`2301`	`2309`	`}`
`2302`	`2310`	`else`
`2303`	`2311`	`{`
`2304`		`- auto pDevice = (const cl_device_id*)properties;`
	`2312`	`+ auto pDevice = (const cl_device_id*)properties++;`
`2305`	`2313`	`std::string deviceInfo;`
`2306`	`2314`	`getDeviceInfoString(`
`2307`	`2315`	`1,`
`2308`	`2316`	`pDevice,`
`2309`	`2317`	`deviceInfo );`
`2310`	`2318`	`str += deviceInfo;`
`2311`	`2319`	`str += ", ";`
`2312`		`-`
`2313`	`2320`	`}`
`2314`	`2321`	`}`
`2315`		`- while( *properties++ != CL_DEVICE_HANDLE_LIST_END_KHR );`
`2316`	`2322`	`str += " }";`
`2317`	`2323`	`}`
`2318`	`2324`	`break;`
`@@ -2392,26 +2398,32 @@ void CLIntercept::getSemaphorePropertiesString(`
`2392`	`2398`	`{`
`2393`	`2399`	`++properties;`
`2394`	`2400`	`str += "{ ";`
`2395`		`- do`
	`2401`	`+ while( true )`
`2396`	`2402`	`{`
`2397`	`2403`	`if( *properties == CL_DEVICE_HANDLE_LIST_END_KHR )`
`2398`	`2404`	`{`
`2399`	`2405`	`str += "CL_DEVICE_HANDLE_LIST_END_KHR";`
	`2406`	`+ properties++;`
	`2407`	`+ break;`
	`2408`	`+ }`
	`2409`	`+ else if( *properties == 0x2052 )`
	`2410`	`+ {`
	`2411`	`+ str += "CL_DEVICE_HANDLE_LIST_END_KHR_0x2502";`
	`2412`	`+ properties++;`
	`2413`	`+ break;`
`2400`	`2414`	`}`
`2401`	`2415`	`else`
`2402`	`2416`	`{`
`2403`		`- auto pDevice = (const cl_device_id*)properties;`
	`2417`	`+ auto pDevice = (const cl_device_id*)properties++;`
`2404`	`2418`	`std::string deviceInfo;`
`2405`	`2419`	`getDeviceInfoString(`
`2406`	`2420`	`1,`
`2407`	`2421`	`pDevice,`
`2408`	`2422`	`deviceInfo );`
`2409`	`2423`	`str += deviceInfo;`
`2410`	`2424`	`str += ", ";`
`2411`		`-`
`2412`	`2425`	`}`
`2413`	`2426`	`}`
`2414`		`- while( *properties++ != CL_DEVICE_HANDLE_LIST_END_KHR );`
`2415`	`2427`	`str += " }";`
`2416`	`2428`	`}`
`2417`	`2429`	`break;`