add a control to prepend a string to CL_DEVICE_EXTENSIONS (#410)

bashbaug · web-flow · commit e2981670b1d2 · 2025-03-27T11:38:28.000-07:00
diff --git a/docs/controls.md b/docs/controls.md
@@ -891,6 +891,10 @@ If set to a non-negative value, the clGetDeviceInfo() query for CL\_DEVICE\_PREF
 
 If set to a non-empty string, the clGetDeviceInfo() query for CL\_DRIVER\_VERSION will return this value instead of the true driver version.
 
+##### `PrependDeviceExtensions` (string)
+
+If set to a non-empty string, the clGetDeviceInfo() query for CL\_DEVICE\_EXTENSIONS will return this value followed by the true device extensions string.
+
 ### Precompiled Kernel and Builtin Kernel Override Controls
 
 ##### `ForceByteBufferOverrides` (bool)
diff --git a/intercept/src/controls.h b/intercept/src/controls.h
@@ -221,6 +221,7 @@ CLI_CONTROL( cl_uint,       DevicePreferredVectorWidthHalf,         UINT_MAX, "I
 CLI_CONTROL( cl_uint,       DevicePreferredVectorWidthFloat,        UINT_MAX, "If set to a non-negative value, the clGetDeviceInfo() query for CL_DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT will return this value instead of the true device preferred vector width." )
 CLI_CONTROL( cl_uint,       DevicePreferredVectorWidthDouble,       UINT_MAX, "If set to a non-negative value, the clGetDeviceInfo() query for CL_DEVICE_PREFERRED_VECTOR_WIDTH_DOUBLE will return this value instead of the true device preferred vector width." )
 CLI_CONTROL( std::string,   DriverVersion,                          "",    "If set to a non-empty string, the clGetDeviceInfo() query for CL_DRIVER_VERSION will return this value instead of the true driver version." )
+CLI_CONTROL( std::string,   PrependDeviceExtensions,                "",    "If set to a non-empty string, the clGetDeviceInfo() query for CL_DEVICE_EXTENSIONS will return this value followed by the true device extensions string." )
 
 CLI_CONTROL_SEPARATOR( Precompiled Kernel and Builtin Kernel Override Controls: )
 CLI_CONTROL( bool,          ForceByteBufferOverrides,               false, "If set to a nonzero value, each of the buffer functions that are overridden (via one or more of the keys below) will use a byte-wise operation to read/write/copy the buffer (default behavior is to try to copy multiple bytes at a time, if possible).  Note: Requires OpenCL 1.1 or the \"byte addressable store\" extension." )
diff --git a/intercept/src/intercept.cpp b/intercept/src/intercept.cpp
@@ -11151,7 +11151,7 @@ bool CLIntercept::overrideGetPlatformInfo(
     switch( param_name )
     {
     case CL_PLATFORM_NAME:
-        if( m_Config.PlatformName != "" )
+        if( !m_Config.PlatformName.empty() )
         {
             char*   ptr = (char*)param_value;
             errorCode = writeStringToMemory(
@@ -11163,7 +11163,7 @@ bool CLIntercept::overrideGetPlatformInfo(
         }
         break;
     case CL_PLATFORM_VENDOR:
-        if( m_Config.PlatformVendor != "" )
+        if( !m_Config.PlatformVendor.empty() )
         {
             char*   ptr = (char*)param_value;
             errorCode = writeStringToMemory(
@@ -11175,7 +11175,7 @@ bool CLIntercept::overrideGetPlatformInfo(
         }
         break;
     case CL_PLATFORM_PROFILE:
-        if( m_Config.PlatformProfile != "" )
+        if( !m_Config.PlatformProfile.empty() )
         {
             char*   ptr = (char*)param_value;
             errorCode = writeStringToMemory(
@@ -11187,7 +11187,7 @@ bool CLIntercept::overrideGetPlatformInfo(
         }
         break;
     case CL_PLATFORM_VERSION:
-        if( m_Config.PlatformVersion != "" )
+        if( !m_Config.PlatformVersion.empty() )
         {
             char*   ptr = (char*)param_value;
             errorCode = writeStringToMemory(
@@ -11309,7 +11309,7 @@ bool CLIntercept::overrideGetDeviceInfo(
         }
         break;
     case CL_DEVICE_NAME:
-        if( m_Config.DeviceName != "" )
+        if( !m_Config.DeviceName.empty() )
         {
             char*   ptr = (char*)param_value;
             errorCode = writeStringToMemory(
@@ -11321,7 +11321,7 @@ bool CLIntercept::overrideGetDeviceInfo(
         }
         break;
     case CL_DEVICE_EXTENSIONS:
-        if( m_Config.DeviceExtensions != "" )
+        if( !m_Config.DeviceExtensions.empty() )
         {
             char*   ptr = (char*)param_value;
             errorCode = writeStringToMemory(
@@ -11331,11 +11331,16 @@ bool CLIntercept::overrideGetDeviceInfo(
                 ptr );
             override = true;
         }
-        else if( m_Config.Emulate_cl_khr_extended_versioning ||
+        else if( !m_Config.PrependDeviceExtensions.empty() ||
+                 m_Config.Emulate_cl_khr_extended_versioning ||
                  m_Config.Emulate_cl_khr_semaphore ||
                  m_Config.Emulate_cl_intel_unified_shared_memory )
         {
-            std::string newExtensions;
+            std::string newExtensions(m_Config.PrependDeviceExtensions);
+            if( !newExtensions.empty() && newExtensions.back() != ' ' )
+            {
+                newExtensions.push_back(' ');
+            }
             if( m_Config.Emulate_cl_khr_extended_versioning &&
                 !checkDeviceForExtension( device, "cl_khr_extended_versioning") )
             {
@@ -11376,7 +11381,7 @@ bool CLIntercept::overrideGetDeviceInfo(
         }
         break;
     case CL_DEVICE_VENDOR:
-        if( m_Config.DeviceVendor != "" )
+        if( !m_Config.DeviceVendor.empty() )
         {
             char*   ptr = (char*)param_value;
             errorCode = writeStringToMemory(
@@ -11388,7 +11393,7 @@ bool CLIntercept::overrideGetDeviceInfo(
         }
         break;
     case CL_DEVICE_PROFILE:
-        if( m_Config.DeviceProfile != "" )
+        if( !m_Config.DeviceProfile.empty() )
         {
             char*   ptr = (char*)param_value;
             errorCode = writeStringToMemory(
@@ -11400,7 +11405,7 @@ bool CLIntercept::overrideGetDeviceInfo(
         }
         break;
     case CL_DEVICE_VERSION:
-        if( m_Config.DeviceVersion != "" )
+        if( !m_Config.DeviceVersion.empty() )
         {
             char*   ptr = (char*)param_value;
             errorCode = writeStringToMemory(
@@ -11412,7 +11417,7 @@ bool CLIntercept::overrideGetDeviceInfo(
         }
         break;
     case CL_DEVICE_OPENCL_C_VERSION:
-        if( m_Config.DeviceCVersion != "" )
+        if( !m_Config.DeviceCVersion.empty() )
         {
             char*   ptr = (char*)param_value;
             errorCode = writeStringToMemory(
@@ -11424,7 +11429,7 @@ bool CLIntercept::overrideGetDeviceInfo(
         }
         break;
     case CL_DEVICE_IL_VERSION:
-        if( m_Config.DeviceILVersion != "" )
+        if( !m_Config.DeviceILVersion.empty() )
         {
             char*   ptr = (char*)param_value;
             errorCode = writeStringToMemory(
@@ -11702,7 +11707,7 @@ bool CLIntercept::overrideGetDeviceInfo(
         }
         break;
     case CL_DRIVER_VERSION:
-        if( m_Config.DriverVersion != "" )
+        if( !m_Config.DriverVersion.empty() )
         {
             char*   ptr = (char*)param_value;
             errorCode = writeStringToMemory(

Original file line number	Diff line number	Diff line change
`@@ -11151,7 +11151,7 @@ bool CLIntercept::overrideGetPlatformInfo(`
`11151`	`11151`	`switch( param_name )`
`11152`	`11152`	`{`
`11153`	`11153`	`case CL_PLATFORM_NAME:`
`11154`		`- if( m_Config.PlatformName != "" )`
	`11154`	`+ if( !m_Config.PlatformName.empty() )`
`11155`	`11155`	`{`
`11156`	`11156`	`char* ptr = (char*)param_value;`
`11157`	`11157`	`errorCode = writeStringToMemory(`
`@@ -11163,7 +11163,7 @@ bool CLIntercept::overrideGetPlatformInfo(`
`11163`	`11163`	`}`
`11164`	`11164`	`break;`
`11165`	`11165`	`case CL_PLATFORM_VENDOR:`
`11166`		`- if( m_Config.PlatformVendor != "" )`
	`11166`	`+ if( !m_Config.PlatformVendor.empty() )`
`11167`	`11167`	`{`
`11168`	`11168`	`char* ptr = (char*)param_value;`
`11169`	`11169`	`errorCode = writeStringToMemory(`
`@@ -11175,7 +11175,7 @@ bool CLIntercept::overrideGetPlatformInfo(`
`11175`	`11175`	`}`
`11176`	`11176`	`break;`
`11177`	`11177`	`case CL_PLATFORM_PROFILE:`
`11178`		`- if( m_Config.PlatformProfile != "" )`
	`11178`	`+ if( !m_Config.PlatformProfile.empty() )`
`11179`	`11179`	`{`
`11180`	`11180`	`char* ptr = (char*)param_value;`
`11181`	`11181`	`errorCode = writeStringToMemory(`
`@@ -11187,7 +11187,7 @@ bool CLIntercept::overrideGetPlatformInfo(`
`11187`	`11187`	`}`
`11188`	`11188`	`break;`
`11189`	`11189`	`case CL_PLATFORM_VERSION:`
`11190`		`- if( m_Config.PlatformVersion != "" )`
	`11190`	`+ if( !m_Config.PlatformVersion.empty() )`
`11191`	`11191`	`{`
`11192`	`11192`	`char* ptr = (char*)param_value;`
`11193`	`11193`	`errorCode = writeStringToMemory(`
`@@ -11309,7 +11309,7 @@ bool CLIntercept::overrideGetDeviceInfo(`
`11309`	`11309`	`}`
`11310`	`11310`	`break;`
`11311`	`11311`	`case CL_DEVICE_NAME:`
`11312`		`- if( m_Config.DeviceName != "" )`
	`11312`	`+ if( !m_Config.DeviceName.empty() )`
`11313`	`11313`	`{`
`11314`	`11314`	`char* ptr = (char*)param_value;`
`11315`	`11315`	`errorCode = writeStringToMemory(`
`@@ -11321,7 +11321,7 @@ bool CLIntercept::overrideGetDeviceInfo(`
`11321`	`11321`	`}`
`11322`	`11322`	`break;`
`11323`	`11323`	`case CL_DEVICE_EXTENSIONS:`
`11324`		`- if( m_Config.DeviceExtensions != "" )`
	`11324`	`+ if( !m_Config.DeviceExtensions.empty() )`
`11325`	`11325`	`{`
`11326`	`11326`	`char* ptr = (char*)param_value;`
`11327`	`11327`	`errorCode = writeStringToMemory(`
`@@ -11331,11 +11331,16 @@ bool CLIntercept::overrideGetDeviceInfo(`
`11331`	`11331`	`ptr );`
`11332`	`11332`	`override = true;`
`11333`	`11333`	`}`
`11334`		`- else if( m_Config.Emulate_cl_khr_extended_versioning \|\|`
	`11334`	`+ else if( !m_Config.PrependDeviceExtensions.empty() \|\|`
	`11335`	`+ m_Config.Emulate_cl_khr_extended_versioning \|\|`
`11335`	`11336`	`m_Config.Emulate_cl_khr_semaphore \|\|`
`11336`	`11337`	`m_Config.Emulate_cl_intel_unified_shared_memory )`
`11337`	`11338`	`{`
`11338`		`- std::string newExtensions;`
	`11339`	`+ std::string newExtensions(m_Config.PrependDeviceExtensions);`
	`11340`	`+ if( !newExtensions.empty() && newExtensions.back() != ' ' )`
	`11341`	`+ {`
	`11342`	`+ newExtensions.push_back(' ');`
	`11343`	`+ }`
`11339`	`11344`	`if( m_Config.Emulate_cl_khr_extended_versioning &&`
`11340`	`11345`	`!checkDeviceForExtension( device, "cl_khr_extended_versioning") )`
`11341`	`11346`	`{`
`@@ -11376,7 +11381,7 @@ bool CLIntercept::overrideGetDeviceInfo(`
`11376`	`11381`	`}`
`11377`	`11382`	`break;`
`11378`	`11383`	`case CL_DEVICE_VENDOR:`
`11379`		`- if( m_Config.DeviceVendor != "" )`
	`11384`	`+ if( !m_Config.DeviceVendor.empty() )`
`11380`	`11385`	`{`
`11381`	`11386`	`char* ptr = (char*)param_value;`
`11382`	`11387`	`errorCode = writeStringToMemory(`
`@@ -11388,7 +11393,7 @@ bool CLIntercept::overrideGetDeviceInfo(`
`11388`	`11393`	`}`
`11389`	`11394`	`break;`
`11390`	`11395`	`case CL_DEVICE_PROFILE:`
`11391`		`- if( m_Config.DeviceProfile != "" )`
	`11396`	`+ if( !m_Config.DeviceProfile.empty() )`
`11392`	`11397`	`{`
`11393`	`11398`	`char* ptr = (char*)param_value;`
`11394`	`11399`	`errorCode = writeStringToMemory(`
`@@ -11400,7 +11405,7 @@ bool CLIntercept::overrideGetDeviceInfo(`
`11400`	`11405`	`}`
`11401`	`11406`	`break;`
`11402`	`11407`	`case CL_DEVICE_VERSION:`
`11403`		`- if( m_Config.DeviceVersion != "" )`
	`11408`	`+ if( !m_Config.DeviceVersion.empty() )`
`11404`	`11409`	`{`
`11405`	`11410`	`char* ptr = (char*)param_value;`
`11406`	`11411`	`errorCode = writeStringToMemory(`
`@@ -11412,7 +11417,7 @@ bool CLIntercept::overrideGetDeviceInfo(`
`11412`	`11417`	`}`
`11413`	`11418`	`break;`
`11414`	`11419`	`case CL_DEVICE_OPENCL_C_VERSION:`
`11415`		`- if( m_Config.DeviceCVersion != "" )`
	`11420`	`+ if( !m_Config.DeviceCVersion.empty() )`
`11416`	`11421`	`{`
`11417`	`11422`	`char* ptr = (char*)param_value;`
`11418`	`11423`	`errorCode = writeStringToMemory(`
`@@ -11424,7 +11429,7 @@ bool CLIntercept::overrideGetDeviceInfo(`
`11424`	`11429`	`}`
`11425`	`11430`	`break;`
`11426`	`11431`	`case CL_DEVICE_IL_VERSION:`
`11427`		`- if( m_Config.DeviceILVersion != "" )`
	`11432`	`+ if( !m_Config.DeviceILVersion.empty() )`
`11428`	`11433`	`{`
`11429`	`11434`	`char* ptr = (char*)param_value;`
`11430`	`11435`	`errorCode = writeStringToMemory(`
`@@ -11702,7 +11707,7 @@ bool CLIntercept::overrideGetDeviceInfo(`
`11702`	`11707`	`}`
`11703`	`11708`	`break;`
`11704`	`11709`	`case CL_DRIVER_VERSION:`
`11705`		`- if( m_Config.DriverVersion != "" )`
	`11710`	`+ if( !m_Config.DriverVersion.empty() )`
`11706`	`11711`	`{`
`11707`	`11712`	`char* ptr = (char*)param_value;`
`11708`	`11713`	`errorCode = writeStringToMemory(`