From 0c83f8ccc745522d2a25bcef2067bde295be9f75 Mon Sep 17 00:00:00 2001 From: JonChesterfield Date: Tue, 17 Dec 2019 18:02:48 +0000 Subject: [PATCH] [libomptarget][nfc] Move three files under common, build them for amdgcn Summary: [libomptarget][nfc] Move three files under common, build them for amdgcn Change to reduction.cu to remove two dead includes, otherwise no code change. Reviewers: jdoerfert, ABataev, grokos Reviewed By: jdoerfert Subscribers: jvesely, mgorny, openmp-commits Tags: #openmp Differential Revision: https://reviews.llvm.org/D71601 --- openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt | 3 +++ openmp/libomptarget/deviceRTLs/{nvptx => common}/src/libcall.cu | 2 +- openmp/libomptarget/deviceRTLs/{nvptx => common}/src/omp_data.cu | 2 +- openmp/libomptarget/deviceRTLs/{nvptx => common}/src/reduction.cu | 6 +----- openmp/libomptarget/deviceRTLs/nvptx/CMakeLists.txt | 6 +++--- 5 files changed, 9 insertions(+), 10 deletions(-) rename openmp/libomptarget/deviceRTLs/{nvptx => common}/src/libcall.cu (99%) rename openmp/libomptarget/deviceRTLs/{nvptx => common}/src/omp_data.cu (97%) rename openmp/libomptarget/deviceRTLs/{nvptx => common}/src/reduction.cu (99%) diff --git a/openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt b/openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt index 802ab0b..9eadbdb 100644 --- a/openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt +++ b/openmp/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt @@ -58,6 +58,9 @@ set(cuda_sources ${devicertl_base_directory}/common/src/cancel.cu ${devicertl_base_directory}/common/src/critical.cu ${devicertl_base_directory}/common/src/loop.cu + ${devicertl_base_directory}/common/src/libcall.cu + ${devicertl_base_directory}/common/src/reduction.cu + ${devicertl_base_directory}/common/src/omp_data.cu ${devicertl_base_directory}/common/src/omptarget.cu ${devicertl_base_directory}/common/src/parallel.cu ${devicertl_base_directory}/common/src/sync.cu diff --git a/openmp/libomptarget/deviceRTLs/nvptx/src/libcall.cu b/openmp/libomptarget/deviceRTLs/common/src/libcall.cu similarity index 99% rename from openmp/libomptarget/deviceRTLs/nvptx/src/libcall.cu rename to openmp/libomptarget/deviceRTLs/common/src/libcall.cu index baee6d1..b9d37f4 100644 --- a/openmp/libomptarget/deviceRTLs/nvptx/src/libcall.cu +++ b/openmp/libomptarget/deviceRTLs/common/src/libcall.cu @@ -1,4 +1,4 @@ -//===------------ libcall.cu - NVPTX OpenMP user calls ----------- CUDA -*-===// +//===------------ libcall.cu - OpenMP GPU user calls ------------- CUDA -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/openmp/libomptarget/deviceRTLs/nvptx/src/omp_data.cu b/openmp/libomptarget/deviceRTLs/common/src/omp_data.cu similarity index 97% rename from openmp/libomptarget/deviceRTLs/nvptx/src/omp_data.cu rename to openmp/libomptarget/deviceRTLs/common/src/omp_data.cu index 9f8758a..5bef3b8 100644 --- a/openmp/libomptarget/deviceRTLs/nvptx/src/omp_data.cu +++ b/openmp/libomptarget/deviceRTLs/common/src/omp_data.cu @@ -1,4 +1,4 @@ -//===------------ omp_data.cu - NVPTX OpenMP GPU objects --------- CUDA -*-===// +//===------------ omp_data.cu - OpenMP GPU objects --------------- CUDA -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/openmp/libomptarget/deviceRTLs/nvptx/src/reduction.cu b/openmp/libomptarget/deviceRTLs/common/src/reduction.cu similarity index 99% rename from openmp/libomptarget/deviceRTLs/nvptx/src/reduction.cu rename to openmp/libomptarget/deviceRTLs/common/src/reduction.cu index fa9c130..5db1948 100644 --- a/openmp/libomptarget/deviceRTLs/nvptx/src/reduction.cu +++ b/openmp/libomptarget/deviceRTLs/common/src/reduction.cu @@ -1,5 +1,4 @@ -//===---- reduction.cu - NVPTX OpenMP reduction implementation ---- CUDA -//-*-===// +//===---- reduction.cu - GPU OpenMP reduction implementation ----- CUDA -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -11,9 +10,6 @@ // //===----------------------------------------------------------------------===// -#include -#include - #include "common/omptarget.h" #include "target_impl.h" diff --git a/openmp/libomptarget/deviceRTLs/nvptx/CMakeLists.txt b/openmp/libomptarget/deviceRTLs/nvptx/CMakeLists.txt index 83308be..d38d766 100644 --- a/openmp/libomptarget/deviceRTLs/nvptx/CMakeLists.txt +++ b/openmp/libomptarget/deviceRTLs/nvptx/CMakeLists.txt @@ -54,18 +54,18 @@ if(LIBOMPTARGET_DEP_CUDA_FOUND) ${devicertl_common_directory}/src/cancel.cu ${devicertl_common_directory}/src/critical.cu src/data_sharing.cu - src/libcall.cu + ${devicertl_common_directory}/src/libcall.cu src/target_impl.cu ${devicertl_common_directory}/src/loop.cu ${devicertl_common_directory}/src/omptarget.cu ${devicertl_common_directory}/src/parallel.cu - src/reduction.cu + ${devicertl_common_directory}/src/reduction.cu ${devicertl_common_directory}/src/support.cu ${devicertl_common_directory}/src/sync.cu ${devicertl_common_directory}/src/task.cu ) - set(omp_data_objects src/omp_data.cu) + set(omp_data_objects ${devicertl_common_directory}/src/omp_data.cu) # Get the compute capability the user requested or use SM_35 by default. # SM_35 is what clang uses by default. -- 2.7.4