Skip to content

Commit

Permalink
for now, remove aliases to cl_mem_migration_flags
Browse files Browse the repository at this point in the history 
Instead of adding aliases to cl_mem_migration_flags and associated
enums, restrict the clEnqueueMigrateMemINTEL API to OpenCL 1.2 or
newer, which satisfies all current use-cases.

If needed, the aliases can be re-introduced at a later date, since
adding them does not change the ABI.
  • Loading branch information
@bashbaug @alycm
bashbaug authored and alycm committed Jun 8, 2020
1 parent e7e570d commit b3d030c
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions xml/cl.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ server's OpenCL/api-docs repository.
<type category="define">typedef <type>cl_bitfield</type> <name>cl_mem_alloc_flags_intel</name>;</type>
<type category="define">typedef <type>cl_uint</type> <name>cl_mem_info_intel</name>;</type>
<type category="define">typedef <type>cl_uint</type> <name>cl_unified_shared_memory_type_intel</name>;</type>
<type category="define">typedef <type>cl_bitfield</type> <name>cl_mem_migration_flags_intel</name>;</type>
<type category="define">typedef <type>cl_uint</type> <name>cl_mem_advice_intel</name>;</type>
<type category="define">typedef <type>cl_bitfield</type> <name>cl_device_atomic_capabilities</name>;</type>
<type category="define">typedef <type>cl_uint</type> <name>cl_khronos_vendor_id</name>;</type>
Expand Down Expand Up @@ -723,9 +722,7 @@ server's OpenCL/api-docs repository.
<enums name="cl_mem_migration_flags" vendor="Khronos" type="bitmask">
<enum bitpos="0" name="CL_MIGRATE_MEM_OBJECT_HOST"/>
<enum bitpos="0" name="CL_MIGRATE_MEM_OBJECT_HOST_EXT"/>
<enum bitpos="0" name="CL_MIGRATE_MEM_OBJECT_HOST_INTEL"/>
<enum bitpos="1" name="CL_MIGRATE_MEM_OBJECT_CONTENT_UNDEFINED"/>
<enum bitpos="1" name="CL_MIGRATE_MEM_OBJECT_CONTENT_UNDEFINED_INTEL"/>
<unused start="2" end="31"/>
</enums>

Expand Down Expand Up @@ -2432,7 +2429,7 @@ server's OpenCL/api-docs repository.
<param><type>cl_command_queue</type> <name>command_queue</name></param>
<param>const <type>void</type>* <name>ptr</name></param>
<param><type>size_t</type> <name>size</name></param>
<param><type>cl_mem_migration_flags_intel</type> <name>flags</name></param>
<param><type>cl_mem_migration_flags</type> <name>flags</name></param>
<param><type>cl_uint</type> <name>num_events_in_wait_list</name></param>
<param>const <type>cl_event</type>* <name>event_wait_list</name></param>
<param><type>cl_event</type>* <name>event</name></param>
Expand Down Expand Up @@ -5552,7 +5549,6 @@ server's OpenCL/api-docs repository.
<type name="cl_mem_alloc_flags_intel"/>
<type name="cl_mem_info_intel"/>
<type name="cl_unified_shared_memory_type_intel"/>
<type name="cl_mem_migration_flags_intel"/>
<type name="cl_mem_advice_intel"/>
</require>
<require comment="cl_device_info">
Expand Down Expand Up @@ -5598,10 +5594,6 @@ server's OpenCL/api-docs repository.
<enum name="CL_COMMAND_MIGRATEMEM_INTEL"/>
<enum name="CL_COMMAND_MEMADVISE_INTEL"/>
</require>
<require comment="cl_mem_migration_flags_intel - bitfield">
<enum name="CL_MIGRATE_MEM_OBJECT_HOST_INTEL"/>
<enum name="CL_MIGRATE_MEM_OBJECT_CONTENT_UNDEFINED_INTEL"/>
</require>
<require>
<command name="clHostMemAllocINTEL"/>
<command name="clDeviceMemAllocINTEL"/>
Expand All @@ -5612,7 +5604,7 @@ server's OpenCL/api-docs repository.
<command name="clEnqueueMemsetINTEL"/>
<command name="clEnqueueMemFillINTEL"/>
<command name="clEnqueueMemcpyINTEL"/>
<command name="clEnqueueMigrateMemINTEL"/>
<command name="clEnqueueMigrateMemINTEL" requires="CL_VERSION_1_2"/>
<command name="clEnqueueMemAdviseINTEL"/>
</require>
</extension>
Expand Down

0 comments on commit b3d030c

Please sign in to comment.