libclc: Merge amdgpu and amdgcn directories (#185619)
Now that r600 is no longer in the build there is no reason to
keep this split. Consolidate on the amdgpu name.
diff --git a/libclc/CMakeLists.txt b/libclc/CMakeLists.txt
index f55f02f..f154451 100644
--- a/libclc/CMakeLists.txt
+++ b/libclc/CMakeLists.txt
@@ -123,14 +123,13 @@
endforeach()
add_subdirectory(clc/lib/generic)
-add_subdirectory(clc/lib/amdgcn)
add_subdirectory(clc/lib/amdgpu)
add_subdirectory(clc/lib/ptx-nvidiacl)
add_subdirectory(clc/lib/spirv)
add_subdirectory(clc/lib/clspv)
add_subdirectory(opencl/lib/generic)
-add_subdirectory(opencl/lib/amdgcn)
+add_subdirectory(opencl/lib/amdgpu)
add_subdirectory(opencl/lib/clspv)
add_subdirectory(opencl/lib/spirv)
@@ -206,7 +205,7 @@
# Collect CLC sources; target-specific sources override generic ones by basename.
set(_clc_overrides)
if(ARCH STREQUAL amdgcn)
- list(APPEND _clc_overrides ${CLC_AMDGPU_SOURCES} ${CLC_AMDGCN_SOURCES})
+ list(APPEND _clc_overrides ${CLC_AMDGPU_SOURCES})
elseif(ARCH STREQUAL nvptx64 AND (OS STREQUAL nvidiacl OR OS STREQUAL cuda))
list(APPEND _clc_overrides ${CLC_PTX_NVIDIACL_SOURCES})
elseif(ARCH STREQUAL spirv OR ARCH STREQUAL spirv64)
diff --git a/libclc/clc/lib/amdgcn/CMakeLists.txt b/libclc/clc/lib/amdgcn/CMakeLists.txt
deleted file mode 100644
index 0ab4ab6..0000000
--- a/libclc/clc/lib/amdgcn/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-libclc_configure_source_list(CLC_AMDGCN_SOURCES
- ${CMAKE_CURRENT_SOURCE_DIR}
- address_space/qualifier.cl
- math/clc_ldexp.cl
- mem_fence/clc_mem_fence.cl
- subgroup/subgroup.cl
- subgroup/sub_group_broadcast.cl
- subgroup/sub_group_reduce.cl
- synchronization/clc_sub_group_barrier.cl
- synchronization/clc_work_group_barrier.cl
- workitem/clc_get_enqueued_local_size.cl
- workitem/clc_get_global_offset.cl
- workitem/clc_get_global_size.cl
- workitem/clc_get_group_id.cl
- workitem/clc_get_local_id.cl
- workitem/clc_get_local_size.cl
- workitem/clc_get_max_sub_group_size.cl
- workitem/clc_get_num_groups.cl
- workitem/clc_get_num_sub_groups.cl
- workitem/clc_get_sub_group_id.cl
- workitem/clc_get_sub_group_size.cl
- workitem/clc_get_work_dim.cl
-)
diff --git a/libclc/clc/lib/amdgpu/CMakeLists.txt b/libclc/clc/lib/amdgpu/CMakeLists.txt
index b44bd10..a21d0d8 100644
--- a/libclc/clc/lib/amdgpu/CMakeLists.txt
+++ b/libclc/clc/lib/amdgpu/CMakeLists.txt
@@ -1,5 +1,6 @@
libclc_configure_source_list(CLC_AMDGPU_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}
+ address_space/qualifier.cl
math/clc_half_exp.cl
math/clc_half_exp2.cl
math/clc_half_exp10.cl
@@ -9,11 +10,29 @@
math/clc_half_recip.cl
math/clc_half_rsqrt.cl
math/clc_half_sqrt.cl
+ math/clc_ldexp.cl
math/clc_native_exp.cl
math/clc_native_exp2.cl
math/clc_native_log10.cl
math/clc_sqrt.cl
-)
+ mem_fence/clc_mem_fence.cl
+ subgroup/subgroup.cl
+ subgroup/sub_group_broadcast.cl
+ subgroup/sub_group_reduce.cl
+ synchronization/clc_sub_group_barrier.cl
+ synchronization/clc_work_group_barrier.cl
+ workitem/clc_get_enqueued_local_size.cl
+ workitem/clc_get_global_offset.cl
+ workitem/clc_get_global_size.cl
+ workitem/clc_get_group_id.cl
+ workitem/clc_get_local_id.cl
+ workitem/clc_get_local_size.cl
+ workitem/clc_get_max_sub_group_size.cl
+ workitem/clc_get_num_groups.cl
+ workitem/clc_get_num_sub_groups.cl
+ workitem/clc_get_sub_group_id.cl
+ workitem/clc_get_sub_group_size.cl
+ workitem/clc_get_work_dim.cl)
libclc_configure_source_options(${CMAKE_CURRENT_SOURCE_DIR} -fapprox-func
math/clc_native_exp.cl
diff --git a/libclc/clc/lib/amdgcn/address_space/qualifier.cl b/libclc/clc/lib/amdgpu/address_space/qualifier.cl
similarity index 100%
rename from libclc/clc/lib/amdgcn/address_space/qualifier.cl
rename to libclc/clc/lib/amdgpu/address_space/qualifier.cl
diff --git a/libclc/clc/lib/amdgcn/math/clc_ldexp.cl b/libclc/clc/lib/amdgpu/math/clc_ldexp.cl
similarity index 100%
rename from libclc/clc/lib/amdgcn/math/clc_ldexp.cl
rename to libclc/clc/lib/amdgpu/math/clc_ldexp.cl
diff --git a/libclc/clc/lib/amdgcn/mem_fence/clc_mem_fence.cl b/libclc/clc/lib/amdgpu/mem_fence/clc_mem_fence.cl
similarity index 100%
rename from libclc/clc/lib/amdgcn/mem_fence/clc_mem_fence.cl
rename to libclc/clc/lib/amdgpu/mem_fence/clc_mem_fence.cl
diff --git a/libclc/clc/lib/amdgcn/subgroup/sub_group_broadcast.cl b/libclc/clc/lib/amdgpu/subgroup/sub_group_broadcast.cl
similarity index 100%
rename from libclc/clc/lib/amdgcn/subgroup/sub_group_broadcast.cl
rename to libclc/clc/lib/amdgpu/subgroup/sub_group_broadcast.cl
diff --git a/libclc/clc/lib/amdgcn/subgroup/sub_group_reduce.cl b/libclc/clc/lib/amdgpu/subgroup/sub_group_reduce.cl
similarity index 100%
rename from libclc/clc/lib/amdgcn/subgroup/sub_group_reduce.cl
rename to libclc/clc/lib/amdgpu/subgroup/sub_group_reduce.cl
diff --git a/libclc/clc/lib/amdgcn/subgroup/subgroup.cl b/libclc/clc/lib/amdgpu/subgroup/subgroup.cl
similarity index 100%
rename from libclc/clc/lib/amdgcn/subgroup/subgroup.cl
rename to libclc/clc/lib/amdgpu/subgroup/subgroup.cl
diff --git a/libclc/clc/lib/amdgcn/synchronization/clc_sub_group_barrier.cl b/libclc/clc/lib/amdgpu/synchronization/clc_sub_group_barrier.cl
similarity index 100%
rename from libclc/clc/lib/amdgcn/synchronization/clc_sub_group_barrier.cl
rename to libclc/clc/lib/amdgpu/synchronization/clc_sub_group_barrier.cl
diff --git a/libclc/clc/lib/amdgcn/synchronization/clc_work_group_barrier.cl b/libclc/clc/lib/amdgpu/synchronization/clc_work_group_barrier.cl
similarity index 100%
rename from libclc/clc/lib/amdgcn/synchronization/clc_work_group_barrier.cl
rename to libclc/clc/lib/amdgpu/synchronization/clc_work_group_barrier.cl
diff --git a/libclc/clc/lib/amdgcn/workitem/clc_get_enqueued_local_size.cl b/libclc/clc/lib/amdgpu/workitem/clc_get_enqueued_local_size.cl
similarity index 100%
rename from libclc/clc/lib/amdgcn/workitem/clc_get_enqueued_local_size.cl
rename to libclc/clc/lib/amdgpu/workitem/clc_get_enqueued_local_size.cl
diff --git a/libclc/clc/lib/amdgcn/workitem/clc_get_global_offset.cl b/libclc/clc/lib/amdgpu/workitem/clc_get_global_offset.cl
similarity index 100%
rename from libclc/clc/lib/amdgcn/workitem/clc_get_global_offset.cl
rename to libclc/clc/lib/amdgpu/workitem/clc_get_global_offset.cl
diff --git a/libclc/clc/lib/amdgcn/workitem/clc_get_global_size.cl b/libclc/clc/lib/amdgpu/workitem/clc_get_global_size.cl
similarity index 100%
rename from libclc/clc/lib/amdgcn/workitem/clc_get_global_size.cl
rename to libclc/clc/lib/amdgpu/workitem/clc_get_global_size.cl
diff --git a/libclc/clc/lib/amdgcn/workitem/clc_get_group_id.cl b/libclc/clc/lib/amdgpu/workitem/clc_get_group_id.cl
similarity index 100%
rename from libclc/clc/lib/amdgcn/workitem/clc_get_group_id.cl
rename to libclc/clc/lib/amdgpu/workitem/clc_get_group_id.cl
diff --git a/libclc/clc/lib/amdgcn/workitem/clc_get_local_id.cl b/libclc/clc/lib/amdgpu/workitem/clc_get_local_id.cl
similarity index 100%
rename from libclc/clc/lib/amdgcn/workitem/clc_get_local_id.cl
rename to libclc/clc/lib/amdgpu/workitem/clc_get_local_id.cl
diff --git a/libclc/clc/lib/amdgcn/workitem/clc_get_local_size.cl b/libclc/clc/lib/amdgpu/workitem/clc_get_local_size.cl
similarity index 100%
rename from libclc/clc/lib/amdgcn/workitem/clc_get_local_size.cl
rename to libclc/clc/lib/amdgpu/workitem/clc_get_local_size.cl
diff --git a/libclc/clc/lib/amdgcn/workitem/clc_get_max_sub_group_size.cl b/libclc/clc/lib/amdgpu/workitem/clc_get_max_sub_group_size.cl
similarity index 100%
rename from libclc/clc/lib/amdgcn/workitem/clc_get_max_sub_group_size.cl
rename to libclc/clc/lib/amdgpu/workitem/clc_get_max_sub_group_size.cl
diff --git a/libclc/clc/lib/amdgcn/workitem/clc_get_num_groups.cl b/libclc/clc/lib/amdgpu/workitem/clc_get_num_groups.cl
similarity index 100%
rename from libclc/clc/lib/amdgcn/workitem/clc_get_num_groups.cl
rename to libclc/clc/lib/amdgpu/workitem/clc_get_num_groups.cl
diff --git a/libclc/clc/lib/amdgcn/workitem/clc_get_num_sub_groups.cl b/libclc/clc/lib/amdgpu/workitem/clc_get_num_sub_groups.cl
similarity index 100%
rename from libclc/clc/lib/amdgcn/workitem/clc_get_num_sub_groups.cl
rename to libclc/clc/lib/amdgpu/workitem/clc_get_num_sub_groups.cl
diff --git a/libclc/clc/lib/amdgcn/workitem/clc_get_sub_group_id.cl b/libclc/clc/lib/amdgpu/workitem/clc_get_sub_group_id.cl
similarity index 100%
rename from libclc/clc/lib/amdgcn/workitem/clc_get_sub_group_id.cl
rename to libclc/clc/lib/amdgpu/workitem/clc_get_sub_group_id.cl
diff --git a/libclc/clc/lib/amdgcn/workitem/clc_get_sub_group_size.cl b/libclc/clc/lib/amdgpu/workitem/clc_get_sub_group_size.cl
similarity index 100%
rename from libclc/clc/lib/amdgcn/workitem/clc_get_sub_group_size.cl
rename to libclc/clc/lib/amdgpu/workitem/clc_get_sub_group_size.cl
diff --git a/libclc/clc/lib/amdgcn/workitem/clc_get_work_dim.cl b/libclc/clc/lib/amdgpu/workitem/clc_get_work_dim.cl
similarity index 100%
rename from libclc/clc/lib/amdgcn/workitem/clc_get_work_dim.cl
rename to libclc/clc/lib/amdgpu/workitem/clc_get_work_dim.cl
diff --git a/libclc/opencl/lib/amdgcn/CMakeLists.txt b/libclc/opencl/lib/amdgpu/CMakeLists.txt
similarity index 100%
rename from libclc/opencl/lib/amdgcn/CMakeLists.txt
rename to libclc/opencl/lib/amdgpu/CMakeLists.txt
diff --git a/libclc/opencl/lib/amdgcn/async/wait_group_events.cl b/libclc/opencl/lib/amdgpu/async/wait_group_events.cl
similarity index 100%
rename from libclc/opencl/lib/amdgcn/async/wait_group_events.cl
rename to libclc/opencl/lib/amdgpu/async/wait_group_events.cl
diff --git a/libclc/opencl/lib/amdgcn/printf/__printf_alloc.cl b/libclc/opencl/lib/amdgpu/printf/__printf_alloc.cl
similarity index 100%
rename from libclc/opencl/lib/amdgcn/printf/__printf_alloc.cl
rename to libclc/opencl/lib/amdgpu/printf/__printf_alloc.cl
