[Openmp-commits] [openmp] 68ab93f - [libomptarget][amdgpu][nfc] Rename source files
Jon Chesterfield via Openmp-commits
openmp-commits at lists.llvm.org
Thu Aug 26 10:29:53 PDT 2021
Author: Jon Chesterfield
Date: 2021-08-26T18:29:44+01:00
New Revision: 68ab93f4d74baeb48bcf72bd246ddabf3b333c43
URL: https://github.com/llvm/llvm-project/commit/68ab93f4d74baeb48bcf72bd246ddabf3b333c43
DIFF: https://github.com/llvm/llvm-project/commit/68ab93f4d74baeb48bcf72bd246ddabf3b333c43.diff
LOG: [libomptarget][amdgpu][nfc] Rename source files
Added:
openmp/libomptarget/plugins/amdgpu/impl/impl.cpp
openmp/libomptarget/plugins/amdgpu/impl/impl.h
openmp/libomptarget/plugins/amdgpu/impl/impl_runtime.h
openmp/libomptarget/plugins/amdgpu/impl/interop_hsa.cpp
openmp/libomptarget/plugins/amdgpu/impl/interop_hsa.h
Modified:
openmp/libomptarget/plugins/amdgpu/CMakeLists.txt
openmp/libomptarget/plugins/amdgpu/impl/data.cpp
openmp/libomptarget/plugins/amdgpu/impl/internal.h
openmp/libomptarget/plugins/amdgpu/impl/rt.h
openmp/libomptarget/plugins/amdgpu/src/rtl.cpp
Removed:
openmp/libomptarget/plugins/amdgpu/impl/atmi.cpp
openmp/libomptarget/plugins/amdgpu/impl/atmi.h
openmp/libomptarget/plugins/amdgpu/impl/atmi_interop_hsa.cpp
openmp/libomptarget/plugins/amdgpu/impl/atmi_interop_hsa.h
openmp/libomptarget/plugins/amdgpu/impl/atmi_runtime.h
################################################################################
diff --git a/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt b/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt
index 51daa4f4f3d82..1c074ecdf625c 100644
--- a/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt
+++ b/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt
@@ -62,8 +62,8 @@ else()
endif()
add_library(omptarget.rtl.amdgpu SHARED
- impl/atmi.cpp
- impl/atmi_interop_hsa.cpp
+ impl/impl.cpp
+ impl/interop_hsa.cpp
impl/data.cpp
impl/get_elf_mach_gfx_name.cpp
impl/system.cpp
diff --git a/openmp/libomptarget/plugins/amdgpu/impl/data.cpp b/openmp/libomptarget/plugins/amdgpu/impl/data.cpp
index 1bb890bca404f..7cd7e4d3437e3 100644
--- a/openmp/libomptarget/plugins/amdgpu/impl/data.cpp
+++ b/openmp/libomptarget/plugins/amdgpu/impl/data.cpp
@@ -5,7 +5,7 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
-#include "atmi_runtime.h"
+#include "impl_runtime.h"
#include "hsa_api.h"
#include "internal.h"
#include "rt.h"
diff --git a/openmp/libomptarget/plugins/amdgpu/impl/atmi.cpp b/openmp/libomptarget/plugins/amdgpu/impl/impl.cpp
similarity index 97%
rename from openmp/libomptarget/plugins/amdgpu/impl/atmi.cpp
rename to openmp/libomptarget/plugins/amdgpu/impl/impl.cpp
index c7cd1fe9546cc..a9aabbf39e0e7 100644
--- a/openmp/libomptarget/plugins/amdgpu/impl/atmi.cpp
+++ b/openmp/libomptarget/plugins/amdgpu/impl/impl.cpp
@@ -1,11 +1,11 @@
-//===--- amdgpu/impl/atmi.cpp ------------------------------------- C++ -*-===//
+//===--- amdgpu/impl/impl.cpp ------------------------------------- C++ -*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
-#include "atmi_runtime.h"
+#include "impl_runtime.h"
#include "hsa_api.h"
#include "internal.h"
#include "rt.h"
diff --git a/openmp/libomptarget/plugins/amdgpu/impl/atmi.h b/openmp/libomptarget/plugins/amdgpu/impl/impl.h
similarity index 87%
rename from openmp/libomptarget/plugins/amdgpu/impl/atmi.h
rename to openmp/libomptarget/plugins/amdgpu/impl/impl.h
index 4dcde6a48afd0..81c32a9487c60 100644
--- a/openmp/libomptarget/plugins/amdgpu/impl/atmi.h
+++ b/openmp/libomptarget/plugins/amdgpu/impl/impl.h
@@ -1,12 +1,12 @@
-//===--- amdgpu/impl/atmi.h --------------------------------------- C++ -*-===//
+//===--- amdgpu/impl/impl.h --------------------------------------- C++ -*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
-#ifndef INCLUDE_ATMI_H_
-#define INCLUDE_ATMI_H_
+#ifndef INCLUDE_IMPL_H_
+#define INCLUDE_IMPL_H_
#define ROCM_VERSION_MAJOR 3
#define ROCM_VERSION_MINOR 2
@@ -36,4 +36,4 @@ typedef enum atmi_memtype_s {
} atmi_memtype_t;
/** @} */
-#endif // INCLUDE_ATMI_H_
+#endif // INCLUDE_IMPL_H_
diff --git a/openmp/libomptarget/plugins/amdgpu/impl/atmi_runtime.h b/openmp/libomptarget/plugins/amdgpu/impl/impl_runtime.h
similarity index 92%
rename from openmp/libomptarget/plugins/amdgpu/impl/atmi_runtime.h
rename to openmp/libomptarget/plugins/amdgpu/impl/impl_runtime.h
index c00ac8310c562..8d85458cc375c 100644
--- a/openmp/libomptarget/plugins/amdgpu/impl/atmi_runtime.h
+++ b/openmp/libomptarget/plugins/amdgpu/impl/impl_runtime.h
@@ -1,14 +1,14 @@
-//===--- amdgpu/impl/atmi_runtime.h ------------------------------- C++ -*-===//
+//===--- amdgpu/impl/impl_runtime.h ------------------------------- C++ -*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
-#ifndef INCLUDE_ATMI_RUNTIME_H_
-#define INCLUDE_ATMI_RUNTIME_H_
+#ifndef INCLUDE_IMPL_RUNTIME_H_
+#define INCLUDE_IMPL_RUNTIME_H_
-#include "atmi.h"
+#include "impl.h"
#include "hsa_api.h"
extern "C" {
@@ -67,4 +67,4 @@ hsa_status_t atmi_memcpy_d2h(hsa_signal_t sig, void *hostDest,
}
-#endif // INCLUDE_ATMI_RUNTIME_H_
+#endif // INCLUDE_IMPL_RUNTIME_H_
diff --git a/openmp/libomptarget/plugins/amdgpu/impl/internal.h b/openmp/libomptarget/plugins/amdgpu/impl/internal.h
index bc3a94e7a7550..f5588ea15a0b1 100644
--- a/openmp/libomptarget/plugins/amdgpu/impl/internal.h
+++ b/openmp/libomptarget/plugins/amdgpu/impl/internal.h
@@ -23,8 +23,8 @@
#include "hsa_api.h"
-#include "atmi.h"
-#include "atmi_runtime.h"
+#include "impl.h"
+#include "impl_runtime.h"
#include "rt.h"
#define MAX_NUM_KERNELS (1024 * 16)
diff --git a/openmp/libomptarget/plugins/amdgpu/impl/atmi_interop_hsa.cpp b/openmp/libomptarget/plugins/amdgpu/impl/interop_hsa.cpp
similarity index 96%
rename from openmp/libomptarget/plugins/amdgpu/impl/atmi_interop_hsa.cpp
rename to openmp/libomptarget/plugins/amdgpu/impl/interop_hsa.cpp
index e4431e768806f..7043cc836a419 100644
--- a/openmp/libomptarget/plugins/amdgpu/impl/atmi_interop_hsa.cpp
+++ b/openmp/libomptarget/plugins/amdgpu/impl/interop_hsa.cpp
@@ -1,11 +1,11 @@
-//===--- amdgpu/impl/atmi_interop_hsa.cpp ------------------------- C++ -*-===//
+//===--- amdgpu/impl/interop_hsa.cpp ------------------------------ C++ -*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
-#include "atmi_interop_hsa.h"
+#include "interop_hsa.h"
#include "internal.h"
hsa_status_t atmi_interop_hsa_get_symbol_info(
diff --git a/openmp/libomptarget/plugins/amdgpu/impl/atmi_interop_hsa.h b/openmp/libomptarget/plugins/amdgpu/impl/interop_hsa.h
similarity index 91%
rename from openmp/libomptarget/plugins/amdgpu/impl/atmi_interop_hsa.h
rename to openmp/libomptarget/plugins/amdgpu/impl/interop_hsa.h
index 0a92bf4114bc8..f98e0532bbd25 100644
--- a/openmp/libomptarget/plugins/amdgpu/impl/atmi_interop_hsa.h
+++ b/openmp/libomptarget/plugins/amdgpu/impl/interop_hsa.h
@@ -1,14 +1,14 @@
-//===--- amdgpu/impl/atmi_interop_hsa.h --------------------------- C++ -*-===//
+//===--- amdgpu/impl/interop_hsa.h -------------------------------- C++ -*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
-#ifndef INCLUDE_ATMI_INTEROP_HSA_H_
-#define INCLUDE_ATMI_INTEROP_HSA_H_
+#ifndef INCLUDE_INTEROP_HSA_H_
+#define INCLUDE_INTEROP_HSA_H_
-#include "atmi_runtime.h"
+#include "impl_runtime.h"
#include "hsa_api.h"
#include "internal.h"
@@ -17,7 +17,7 @@
extern "C" {
-/** \defgroup interop_hsa_functions ATMI-HSA Interop
+/** \defgroup interop_hsa_functions HSA Interop
* @{
*/
@@ -82,4 +82,4 @@ hsa_status_t atmi_interop_hsa_get_kernel_info(
}
-#endif // INCLUDE_ATMI_INTEROP_HSA_H_
+#endif // INCLUDE_INTEROP_HSA_H_
diff --git a/openmp/libomptarget/plugins/amdgpu/impl/rt.h b/openmp/libomptarget/plugins/amdgpu/impl/rt.h
index bfebd14f49ed2..9d98735320dc7 100644
--- a/openmp/libomptarget/plugins/amdgpu/impl/rt.h
+++ b/openmp/libomptarget/plugins/amdgpu/impl/rt.h
@@ -8,7 +8,7 @@
#ifndef SRC_RUNTIME_INCLUDE_RT_H_
#define SRC_RUNTIME_INCLUDE_RT_H_
-#include "atmi_runtime.h"
+#include "impl_runtime.h"
#include "hsa_api.h"
#include <string>
diff --git a/openmp/libomptarget/plugins/amdgpu/src/rtl.cpp b/openmp/libomptarget/plugins/amdgpu/src/rtl.cpp
index 9b00080ff2fb6..4b2f2f2fc3019 100644
--- a/openmp/libomptarget/plugins/amdgpu/src/rtl.cpp
+++ b/openmp/libomptarget/plugins/amdgpu/src/rtl.cpp
@@ -24,9 +24,8 @@
#include <unordered_map>
#include <vector>
-// Header from ATMI interface
-#include "atmi_interop_hsa.h"
-#include "atmi_runtime.h"
+#include "interop_hsa.h"
+#include "impl_runtime.h"
#include "internal.h"
More information about the Openmp-commits
mailing list