Skip to content

Commit 08cb72c

Browse files
saiislamsaiislam
committed
[NFC] Fix stale hyperlinks after GitHub organization and repo movement
Following GitHub organizations were merged into the ROCm org: * ROCm-Developer-Tools * RadeonOpenCompute * ROCmSoftwarePlatform Ensure that all hyperlinks to old organizations now point to the new organization at https://github.com/ROCm. Following independent repositories were also moved and renamed: * RadeonOpenCompute/ROCm-CompilerSupport --> ROCm/llvm-project/amd/comgr * RadeonOpenCompute/ROCm-Device-Libs --> ROCm/llvm-project/amd/device-libs * ROCm-Developer-Tools/HIPCC --> ROCm/llvm-project/amd/hipcc * ROCmSoftwarePlatform/rocThrust --> ROCm/rocm-libraries Ensure that all hyperlinks to old GitHub repos now point to their new locations.
1 parent 7e4c488 commit 08cb72c

File tree

7 files changed

+62
-15
lines changed

7 files changed

+62
-15
lines changed

‎amd/comgr/test/source/multiple-note-records-one-kernel.s‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ _ZN17__HIP_CoordinatesI14__HIP_BlockDimE1xE:
120120
.zero 1
121121
.size _ZN17__HIP_CoordinatesI14__HIP_BlockDimE1xE, 1
122122

123-
.ident "AMD clang version 17.0.0 (https://github.com/RadeonOpenCompute/llvm-project roc-6.0.0 23483 7208e8d15fbf218deb74483ea8c549c67ca4985e)"
123+
.ident "AMD clang version 17.0.0 (https://github.com/ROCm/llvm-project roc-6.0.0 23483 7208e8d15fbf218deb74483ea8c549c67ca4985e)"
124124
.section ".note.GNU-stack"
125125
.addrsig
126126
.amdgpu_metadata

‎amd/comgr/test/source/multiple-note-records.s‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ _ZN17__HIP_CoordinatesI14__HIP_BlockDimE1xE:
216216
.zero 1
217217
.size _ZN17__HIP_CoordinatesI14__HIP_BlockDimE1xE, 1
218218

219-
.ident "AMD clang version 17.0.0 (https://github.com/RadeonOpenCompute/llvm-project roc-6.0.0 23483 7208e8d15fbf218deb74483ea8c549c67ca4985e)"
219+
.ident "AMD clang version 17.0.0 (https://github.com/ROCm/llvm-project roc-6.0.0 23483 7208e8d15fbf218deb74483ea8c549c67ca4985e)"
220220
.section ".note.GNU-stack"
221221
.addrsig
222222
.amdgpu_metadata

‎amd/device-libs/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
106106
set ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Radeon Open Compute - device libraries" )
107107
set ( CPACK_PACKAGE_DESCRIPTION "This package includes LLVM bitcode libraries." )
108108
set ( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.TXT" )
109-
set ( CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/RadeonOpenCompute/ROCm-Device-Libs" )
109+
set ( CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/ROCm/llvm-project/tree/amd-staging/amd/device-libs" )
110110

111111
# Install License file
112112
install ( FILES "${CPACK_RESOURCE_FILE_LICENSE}"

‎amd/hipcc/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ set(CPACK_DEB_COMPONENT_INSTALL ON)
7070
set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
7171
set(CPACK_DEBIAN_PACKAGE_DEPENDS "rocm-core")
7272
set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "perl (>= 5.0)")
73-
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/ROCm-Developer-Tools/HIPCC")
73+
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/ROCm/llvm-project/tree/amd-staging/amd/hipcc")
7474
if(DEFINED ENV{CPACK_DEBIAN_PACKAGE_RELEASE})
7575
set(CPACK_DEBIAN_PACKAGE_RELEASE $ENV{CPACK_DEBIAN_PACKAGE_RELEASE})
7676
else()

‎amd/utils/translate-legacy-branch-to-omnibus-monorepo.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
#|
1414
#| Value Repository
1515
#| ----------- ---------------------------------------------------------
16-
#| comgr https://github.com/RadeonOpenCompute/ROCm-CompilerSupport
17-
#| device-libs https://github.com/RadeonOpenCompute/ROCm-Device-Libs
18-
#| hipcc https://github.com/ROCm-Developer-Tools/HIPCC
16+
#| comgr https://github.com/ROCm/llvm-project/tree/amd-staging/amd/comgr
17+
#| device-libs https://github.com/ROCm/llvm-project/tree/amd-staging/amd/device-libs
18+
#| hipcc https://github.com/ROCm/llvm-project/tree/amd-staging/amd/hipcc
1919
#|
2020
#| BASE-BRANCH identifies the branch upon which the to-be-translated branch is
2121
#| based (e.g. amd-stg-open).
2222
#|
2323
#| The TARGET-REPO-DIR must locate a fresh clone of the ROCm llvm-project
24-
#| repository (https://github.com/RadeonOpenCompute/llvm-project). If the
24+
#| repository (https://github.com/ROCm/llvm-project). If the
2525
#| script is to be invoked repeatedly the same clone may be reused. It is
2626
#| NOT recommended to use any clone which contains local refs that have not
2727
#| been saved elsewhere, as they may be clobbered!

‎llvm/lib/Support/CommandLine.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2529,7 +2529,7 @@ class VersionPrinter {
25292529
#ifdef PACKAGE_VENDOR
25302530
OS << PACKAGE_VENDOR << " ";
25312531
#else
2532-
OS << "AOMP-18.0-12 (http://github.com/ROCm-Developer-Tools/aomp):\n Source ID:18.0-12-ce1873ac686bb90ddec72bb99889a4e80e2de382\n ";
2532+
OS << "AOMP-18.0-12 (http://github.com/ROCm/aomp):\n Source ID:18.0-12-ce1873ac686bb90ddec72bb99889a4e80e2de382\n ";
25332533
#endif
25342534
OS << PACKAGE_NAME << " version " << PACKAGE_VERSION << "\n ";
25352535
#if LLVM_IS_DEBUG_BUILD

‎openmp/docs/SupportAndFAQ.rst‎

Lines changed: 53 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,60 @@ time and link against it directly.
103103

104104
Q: How to build an OpenMP AMDGPU offload capable compiler?
105105
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
106+
A subset of the `ROCm <https://github.com/ROCm>`_ toolchain is
107+
required to build the LLVM toolchain and to execute the openmp application.
108+
Either install ROCm somewhere that cmake's find_package can locate it, or
109+
build the required subcomponents ROCt and ROCr from source.
106110

107-
The OpenMP AMDGPU offloading support depends on the ROCm math libraries and the
108-
HSA ROCr / ROCt runtimes. These are normally provided by a standard ROCm
109-
installation, but can be built and used independently if desired. Building the
110-
libraries does not depend on these libraries by default by dynamically loading
111-
the HSA runtime at program execution. As in the CUDA case, this can be change by
112-
omitting ``amdgpu`` from the ``LIBOMPTARGET_DLOPEN_PLUGINS`` list.
111+
The two components used are ROCT-Thunk-Interface, roct, and ROCR-Runtime, rocr.
112+
Roct is the userspace part of the linux driver. It calls into the driver which
113+
ships with the linux kernel. It is an implementation detail of Rocr from
114+
OpenMP's perspective. Rocr is an implementation of `HSA
115+
<http://www.hsafoundation.com>`_.
116+
117+
.. code-block:: text
118+
119+
SOURCE_DIR=same-as-llvm-source # e.g. the checkout of llvm-project, next to openmp
120+
BUILD_DIR=somewhere
121+
INSTALL_PREFIX=same-as-llvm-install
122+
123+
cd $SOURCE_DIR
124+
git clone [email protected]:ROCm/ROCT-Thunk-Interface.git -b roc-4.2.x \
125+
--single-branch
126+
git clone [email protected]:ROCm/ROCR-Runtime.git -b rocm-4.2.x \
127+
--single-branch
128+
129+
cd $BUILD_DIR && mkdir roct && cd roct
130+
cmake $SOURCE_DIR/ROCT-Thunk-Interface/ -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \
131+
-DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF
132+
make && make install
133+
134+
cd $BUILD_DIR && mkdir rocr && cd rocr
135+
cmake $SOURCE_DIR/ROCR-Runtime/src -DIMAGE_SUPPORT=OFF \
136+
-DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DCMAKE_BUILD_TYPE=Release \
137+
-DBUILD_SHARED_LIBS=ON
138+
make && make install
139+
140+
``IMAGE_SUPPORT`` requires building rocr with clang and is not used by openmp.
141+
142+
Provided cmake's find_package can find the ROCR-Runtime package, LLVM will
143+
build a tool ``bin/amdgpu-arch`` which will print a string like ``gfx906`` when
144+
run if it recognises a GPU on the local system. LLVM will also build a shared
145+
library, libomptarget.rtl.amdgpu.so, which is linked against rocr.
146+
147+
With those libraries installed, then LLVM build and installed, try:
148+
149+
.. code-block:: shell
150+
151+
clang -O2 -fopenmp -fopenmp-targets=amdgcn-amd-amdhsa example.c -o example && ./example
152+
153+
If your build machine is not the target machine or automatic detection of the
154+
available GPUs failed, you should also set:
155+
156+
- ``LIBOMPTARGET_DEVICE_ARCHITECTURES='gfx<xyz>;...'`` where ``<xyz>`` is the
157+
shader core instruction set architecture. For instance, set
158+
``LIBOMPTARGET_DEVICE_ARCHITECTURES='gfx906;gfx90a'`` to target AMD GCN5
159+
and CDNA2 devices.
113160

114161
Q: What are the known limitations of OpenMP AMDGPU offload?
115162
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)