6.0.2 main toolchain

2024-02-05 19:46:05 -07:00 · 2024-02-05 19:46:05 -07:00 · 7463bc695e
parent 5810a32d56
commit 7463bc695e
10 changed files with 268 additions and 158 deletions
--- a/docs/_source/_static/scripts/rocm-6.0.2/build-hipblas.sh
+++ b/docs/_source/_static/scripts/rocm-6.0.2/build-hipblas.sh
@ -1,11 +1,7 @@
-#!/bin/bash
-
-rm -rf hipBLAS
 git clone https://github.com/ROCm/hipBLAS
 git checkout rocm-6.0.2
 cd hipBLAS/
 rm -rf build
-
 cmake -B build -G Ninja \
  -DCMAKE_BUILD_TYPE=Release \
  -DCMAKE_INSTALL_PREFIX=/opt/rocm \
@ -14,14 +10,13 @@ cmake -B build -G Ninja \
  -DCPACK_BINARY_STGZ=OFF \
  -DCPACK_BINARY_TGZ=OFF \
  -DCPACK_BINARY_TZ=OFF \
+  -DCPACK_GENERATOR=DEB \
+  -DCPACK_PACKAGING_INSTALL_PREFIX=/opt/rocm \
  -DCPACK_SOURCE_TBZ2=OFF \
  -DCPACK_SOURCE_TGZ=OFF \
-  -DCPACK_SOURCE_TZ=OFF \
  -DCPACK_SOURCE_TXZ=OFF \
-  -DCPACK_GENERATOR=DEB \
-  -DCPACK_PACKAGING_INSTALL_PREFIX=/opt/rocm
+  -DCPACK_SOURCE_TZ=OFF

 ninja -C build package
-
 sudo dpkg -i build/hipblas_2.2.0-0867603_amd64.deb \
  build/hipblas-dev_2.2.0-0867603_amd64.deb
--- a/docs/_source/_static/scripts/rocm-6.0.2/build-rocblas.sh
+++ b/docs/_source/_static/scripts/rocm-6.0.2/build-rocblas.sh
@ -29,8 +29,8 @@ cmake -B build -G Ninja \
  -DROCM_DEP_ROCMCORE=OFF

 ninja -C build package
-sudo dpkg -i build/rocblas_4.2.0-90c6632f~dirty_amd64.deb \
-  build/rocblas-dev_4.2.0-90c6632f~dirty_amd64.deb
+sudo dpkg -i build/rocblas-dev_4.0.0-88df9726~dirty_amd64.deb \
+  build/rocblas_4.0.0-88df9726~dirty_amd64.deb
 exit
  -DAMDGPU_TARGETS=gfx1100 \
  -DTENSILE_GPU_ARCHS=gfx1100 \
--- a/docs/_source/_static/scripts/rocm-6.0.2/build-rocprim.sh
+++ b/docs/_source/_static/scripts/rocm-6.0.2/build-rocprim.sh
@ -1,28 +1,23 @@
-#!/bin/bash
-
-rm -rf rocprim
 git clone https://github.com/ROCm/rocprim
 cd rocprim/
 git checkout rocm-6.0.2
-rm -rf build
 sed -i -e 's/hip-rocclr >= 3.5.0//g' CMakeLists.txt
-
+rm -rf build
 cmake -B build -G Ninja \
  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_CXX_COMPILER=clang++ \
  -DCMAKE_INSTALL_PREFIX=/opt/rocm \
  -DCMAKE_PREFIX_PATH=/opt/rocm/ \
  -DCPACK_BINARY_DEB=ON \
  -DCPACK_BINARY_STGZ=OFF \
  -DCPACK_BINARY_TGZ=OFF \
  -DCPACK_BINARY_TZ=OFF \
-  -DCPACK_SOURCE_TBZ2=OFF \
-  -DCPACK_SOURCE_TGZ=OFF \
-  -DCPACK_SOURCE_TZ=OFF \
-  -DCPACK_SOURCE_TXZ=OFF \
  -DCPACK_GENERATOR=DEB \
  -DCPACK_PACKAGING_INSTALL_PREFIX=/opt/rocm \
-  -DCMAKE_CXX_COMPILER=clang++
+  -DCPACK_SOURCE_TBZ2=OFF \
+  -DCPACK_SOURCE_TGZ=OFF \
+  -DCPACK_SOURCE_TXZ=OFF \
+  -DCPACK_SOURCE_TZ=OFF

 ninja -C build package
-
-sudo dpkg -i build/rocprim-dev_3.0.0-e55fbf53~dirty_amd64.deb
+sudo dpkg -i build/rocprim-dev_3.0.0-c8297d68~dirty_amd64.deb
--- a/docs/_source/_static/scripts/rocm-6.0.2/build-rocsolver.sh
+++ b/docs/_source/_static/scripts/rocm-6.0.2/build-rocsolver.sh
@ -1,29 +1,24 @@
-#!/bin/bash
-
-rm -rf rocsolver
 git clone https://github.com/ROCm/rocsolver
 cd rocsolver/
 git checkout rocm-6.0.2
 rm -rf build
-
 cmake -B build -G Ninja \
+  -DAMDGPU_TARGETS=gfx1100 \
  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_CXX_COMPILER=clang++ \
  -DCMAKE_INSTALL_PREFIX=/opt/rocm \
  -DCMAKE_PREFIX_PATH=/opt/rocm/ \
  -DCPACK_BINARY_DEB=ON \
  -DCPACK_BINARY_STGZ=OFF \
  -DCPACK_BINARY_TGZ=OFF \
  -DCPACK_BINARY_TZ=OFF \
-  -DCPACK_SOURCE_TBZ2=OFF \
-  -DCPACK_SOURCE_TGZ=OFF \
-  -DCPACK_SOURCE_TZ=OFF \
-  -DCPACK_SOURCE_TXZ=OFF \
  -DCPACK_GENERATOR=DEB \
  -DCPACK_PACKAGING_INSTALL_PREFIX=/opt/rocm \
-  -DAMDGPU_TARGETS=gfx1100 \
-  -DCMAKE_CXX_COMPILER=clang++
+  -DCPACK_SOURCE_TBZ2=OFF \
+  -DCPACK_SOURCE_TGZ=OFF \
+  -DCPACK_SOURCE_TXZ=OFF \
+  -DCPACK_SOURCE_TZ=OFF

 ninja -C build package
-
 sudo dpkg -i build/rocsolver_3.26.0-2c64a42_amd64.deb \
  rocsolver-dev_3.26.0-2c64a42_amd64.deb
--- a/docs/_source/_static/scripts/rocm-6.0.2/build-rocsparse.sh
+++ b/docs/_source/_static/scripts/rocm-6.0.2/build-rocsparse.sh
@ -1,30 +1,25 @@
-#!/bin/bash
-
-rm -rf rocsparse
 git clone https://github.com/ROCm/rocsparse
 cd rocsparse/
 git checkout rocm-6.0.2
-rm -rf build
 sed -i -e 's/hip-rocclr >= 3.5.0//g' CMakeLists.txt
-
+rm -rf build
 cmake -B build -G Ninja \
  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_CXX_COMPILER=clang++ \
+  -DCMAKE_C_COMPILER=clang \
  -DCMAKE_INSTALL_PREFIX=/opt/rocm \
  -DCMAKE_PREFIX_PATH=/opt/rocm/ \
  -DCPACK_BINARY_DEB=ON \
  -DCPACK_BINARY_STGZ=OFF \
  -DCPACK_BINARY_TGZ=OFF \
  -DCPACK_BINARY_TZ=OFF \
-  -DCPACK_SOURCE_TBZ2=OFF \
-  -DCPACK_SOURCE_TGZ=OFF \
-  -DCPACK_SOURCE_TZ=OFF \
-  -DCPACK_SOURCE_TXZ=OFF \
  -DCPACK_GENERATOR=DEB \
  -DCPACK_PACKAGING_INSTALL_PREFIX=/opt/rocm \
-  -DCMAKE_CXX_COMPILER=clang++
-  -DCMAKE_C_COMPILER=clang
+  -DCPACK_SOURCE_TBZ2=OFF \
+  -DCPACK_SOURCE_TGZ=OFF \
+  -DCPACK_SOURCE_TXZ=OFF \
+  -DCPACK_SOURCE_TZ=OFF

 ninja -C build package
-
-sudo dpkg -i build/rocsparse_3.1.1-c97a9918 \
-  build/rocsparse-dev_3.1.1-c97a9918~dirty_amd64.deb
+sudo dpkg -i build/rocsparse-dev_3.0.2-1c5d839c~dirty_amd64.deb \
+  build/rocsparse_3.0.2-1c5d839c~dirty_amd64.deb
--- a/docs/_source/index.rst
+++ b/docs/_source/index.rst
@ -18,9 +18,7 @@ tinyrocs is currently working with AMD 7900 XTX GPUs and ``tinygrad``!
   firmware
   os
   kernel
-   toolchain
   toolchain-6.0.2
-   toolchain-spack
   apps
   source
   wetrocs
--- a/docs/_source/locale/en/LC_MESSAGES/toolchain-6.0.2.po
+++ b/docs/_source/locale/en/LC_MESSAGES/toolchain-6.0.2.po
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tinyrocs 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-05 15:43-0700\n"
+"POT-Creation-Date: 2024-02-05 19:45-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@ -20,7 +20,7 @@ msgstr ""
 "Generated-By: Babel 2.14.0\n"

 #: ../../../_source/toolchain-6.0.2.rst:3
-msgid "Toolchain 6.0.2"
+msgid "Toolchain"
 msgstr ""

 #: ../../../_source/toolchain-6.0.2.rst:4
@ -39,23 +39,24 @@ msgstr ""

 #: ../../../_source/toolchain-6.0.2.rst:11
 msgid ""
-"There is a bit of a chicken and egg problem with getting the libraries and "
-"compilers built."
+"There is a bit of a chicken and egg problem with getting the libraries "
+"and compilers built."
 msgstr ""

 #: ../../../_source/toolchain-6.0.2.rst:14
 msgid ""
-"AMD's ROCm source repositories contain most of the toolchain software that "
-"needs to be built. Note, there are many equivalent packages in Debian's main "
-"free repository, but they are older versions than needed (including in "
-"unstable sid)."
+"AMD's ROCm source repositories contain most of the toolchain software "
+"that needs to be built. Note, there are many equivalent packages in "
+"Debian's main free repository, but they are older versions than needed "
+"(including in unstable sid)."
 msgstr ""

 #: ../../../_source/toolchain-6.0.2.rst:19
 msgid ""
 "The ``amdgpu`` module is in the Linux kernel source. See \"Operating "
-"System\" about building that. It is not required to use this toolchain to "
-"build the kernel module. The stock Debian gcc is used for the kernel module."
+"System\" about building that. It is not required to use this toolchain to"
+" build the kernel module. The stock Debian gcc is used for the kernel "
+"module."
 msgstr ""

 #: ../../../_source/toolchain-6.0.2.rst:26
@ -64,8 +65,8 @@ msgstr ""

 #: ../../../_source/toolchain-6.0.2.rst:27
 msgid ""
-"Starting from a \"clean slate\" Perhaps blow out all the old files and start "
-"from scratch..."
+"Starting from a \"clean slate\" Perhaps blow out all the old files and "
+"start from scratch..."
 msgstr ""

 #: ../../../_source/toolchain-6.0.2.rst:39
@ -74,8 +75,8 @@ msgstr ""

 #: ../../../_source/toolchain-6.0.2.rst:40
 msgid ""
-"First pass of LLVM build. Doesn't include \"everything\" because it needs "
-"other dependencies built with itself first."
+"First pass of LLVM build. Doesn't include \"everything\" because it needs"
+" other dependencies built with itself first."
 msgstr ""

 #: ../../../_source/toolchain-6.0.2.rst:48
@ -113,9 +114,9 @@ msgstr ""
 #: ../../../_source/toolchain-6.0.2.rst:75
 msgid ""
 "Note, building against the ``amd-stg-open`` or ``amd-staging`` branch "
-"includes and ``amd/`` directory that has ``device-libs`` to build. Release "
-"``6.0.2`` does not have these directories, so the packages need to be build "
-"from other repos, which is kind of broken, afaict."
+"includes and ``amd/`` directory that has ``device-libs`` to build. "
+"Release ``6.0.2`` does not have these directories, so the packages need "
+"to be build from other repos, which is kind of broken, afaict."
 msgstr ""

 #: ../../../_source/toolchain-6.0.2.rst:85
@ -132,14 +133,14 @@ msgstr ""

 #: ../../../_source/toolchain-6.0.2.rst:94
 msgid ""
-"Build ``rocr-runtime``. Needs hsakmtConfig.cmake from ROCT-Thunk-Interface "
-"first."
+"Build ``rocr-runtime``. Needs hsakmtConfig.cmake from ROCT-Thunk-"
+"Interface first."
 msgstr ""

 #: ../../../_source/toolchain-6.0.2.rst:100
 msgid ""
-"For some reason, this is installing headers to ``/usr/hsa`` instead of ``/"
-"opt/rocm``. It is ignoring the ``PREFIX``.  Workaround..."
+"For some reason, this is installing headers to ``/usr/hsa`` instead of "
+"``/opt/rocm``. It is ignoring the ``PREFIX``.  Workaround..."
 msgstr ""

 #: ../../../_source/toolchain-6.0.2.rst:105
@ -156,8 +157,8 @@ msgstr ""

 #: ../../../_source/toolchain-6.0.2.rst:110
 msgid ""
-"This is another that in latest HEAD uses ``llvm-project/amd/`` directory, "
-"but in ``6.0.2`` this isn't available."
+"This is another that in latest HEAD uses ``llvm-project/amd/`` directory,"
+" but in ``6.0.2`` this isn't available."
 msgstr ""

 #: ../../../_source/toolchain-6.0.2.rst:117
@ -190,7 +191,8 @@ msgstr ""

 #: ../../../_source/toolchain-6.0.2.rst:140
 msgid ""
-"``file STRINGS file \"/home/jebba/devel/ROCm/hip/VERSION\" cannot be read.``"
+"``file STRINGS file \"/home/jebba/devel/ROCm/hip/VERSION\" cannot be "
+"read.``"
 msgstr ""

 #: ../../../_source/toolchain-6.0.2.rst:147
@ -264,3 +266,7 @@ msgstr ""
 #: ../../../_source/toolchain-6.0.2.rst:218
 msgid "``apt-mark hold hipcc llvm rocm-cmake rocm-device-libs rocminfo``"
 msgstr ""
+
+#~ msgid "Toolchain 6.0.2"
+#~ msgstr ""
+
--- a/docs/_source/locale/en/LC_MESSAGES/toolchain-head.po
+++ b/docs/_source/locale/en/LC_MESSAGES/toolchain-head.po
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tinyrocs 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-28 19:46-0700\n"
+"POT-Creation-Date: 2024-02-05 19:45-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@ -24,152 +24,278 @@ msgid "Toolchain HEAD"
 msgstr ""

 #: ../../../_source/toolchain-head.rst:4
+msgid "The main GPU toolchain is built from AMD upstream ROCm sources."
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:6
 msgid ""
-"XXX Building using latest commit in repo, not using tags, ala "
-"``rocm-6.0.0``. Using tags ``amd-stg-open``, ``develop``, etc."
+"A build of all the sources requires building LLVM (``clang``) and the "
+"various ROCm libraries and applications."
 msgstr ""

 #: ../../../_source/toolchain-head.rst:9
-msgid "LLVM"
+msgid ""
+"There is a bit of a chicken and egg problem with getting the libraries "
+"and compilers built."
 msgstr ""

-#: ../../../_source/toolchain-head.rst:16
-msgid "rocm-core"
+#: ../../../_source/toolchain-head.rst:12
+msgid ""
+"AMD's ROCm source repositories contain most of the toolchain software "
+"that needs to be built. Note, there are many equivalent packages in "
+"Debian's main free repository, but they are older versions than needed "
+"(including in unstable sid)."
 msgstr ""

 #: ../../../_source/toolchain-head.rst:17
-msgid "Build ``rocm-core``."
+msgid ""
+"The ``amdgpu`` module is in the Linux kernel source. See \"Operating "
+"System\" about building that. It is not required to use this toolchain to"
+" build the kernel module. The stock Debian gcc is used for the kernel "
+"module."
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:24
+msgid "Ug"
 msgstr ""

 #: ../../../_source/toolchain-head.rst:25
-msgid "rocm-cmake"
-msgstr ""
-
-#: ../../../_source/toolchain-head.rst:26
-msgid "Build ``rocm-cmake``."
-msgstr ""
-
-#: ../../../_source/toolchain-head.rst:34
-msgid "amd-smi"
-msgstr ""
-
-#: ../../../_source/toolchain-head.rst:35
-msgid "Build ``amd-smi``."
-msgstr ""
-
-#: ../../../_source/toolchain-head.rst:43
-msgid "LLVM ``amd/comgr``"
-msgstr ""
-
-#: ../../../_source/toolchain-head.rst:44
 msgid ""
-"After LLVM is built above, and the other packages, in particular ``rocm-"
-"core``, perhaps ``device-libs`` can be built. In this build, the ``device-"
-"libs`` being used is the one in AMD's LLVM fork, it isn't AMD's separate "
-"repo for device libs."
+"Most of the ROCm repositories have a ``rocm-6.0.0`` tag. I was unable to "
+"build everything using this tag in all repos. The main issue is building "
+"the ``device-libs``, HIP, and ``hipcc``. AMD has moved these builds under"
+" their LLVM repo. But this occurred after tag ``rocm-6.0.0``. To build "
+"with that tag, there are a separate ROCm device-libs, HIP, and HIPCC "
+"repos, but this fails to build all required packages/files, afaict."
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:33
+msgid ""
+"To get everything to build, I used the ``amd-stg-open`` tag in LLVM, and "
+"the latest ``HEAD`` in the main branch (usually ``main`` or ``develop``) "
+"in the other repos. For ``clr`` (OpenCL), the ``rocm-6.0.0`` tag was "
+"used."
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:38
+msgid "Latest upstream as of this is ``6.0.2``."
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:41
+msgid "LLVM"
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:48
+msgid "rocm-core"
 msgstr ""

 #: ../../../_source/toolchain-head.rst:49
-msgid "``amd/hipcc`` --- HIP CC compiler (clang wrapper)."
+msgid "Build ``rocm-core``."
 msgstr ""

-#: ../../../_source/toolchain-head.rst:51
-msgid "``amd/device-libs`` --- AMD device libs."
-msgstr ""
-
-#: ../../../_source/toolchain-head.rst:53
-msgid "``amd/comgr`` --- Code Object Manager."
+#: ../../../_source/toolchain-head.rst:56
+msgid "rocm-cmake"
 msgstr ""

 #: ../../../_source/toolchain-head.rst:57
-#: ../../../_source/toolchain-head.rst:115
-msgid "hipcc"
+msgid "Build ``rocm-cmake``."
 msgstr ""

-#: ../../../_source/toolchain-head.rst:58
-msgid "Build ``hipcc``."
+#: ../../../_source/toolchain-head.rst:64
+msgid "amd-smi"
 msgstr ""

-#: ../../../_source/toolchain-head.rst:60
-msgid "XXX This is better below using ``clr`` repo. XXX ?"
-msgstr ""
-
-#: ../../../_source/toolchain-head.rst:67
-msgid "device-libs"
-msgstr ""
-
-#: ../../../_source/toolchain-head.rst:68
-msgid "Build ``device-libs``."
+#: ../../../_source/toolchain-head.rst:65
+msgid "Build ``amd-smi``."
 msgstr ""

 #: ../../../_source/toolchain-head.rst:70
-msgid "Fails with clang target error..."
+msgid ""
+"After LLVM is built above, and the other packages, in particular ``rocm-"
+"core``, perhaps ``device-libs`` can be built. In this build, the "
+"``device-libs`` being used is the one in AMD's LLVM fork, it isn't AMD's "
+"separate repo for device libs."
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:75
+msgid "``amd/hipcc`` --- HIP CC compiler (clang wrapper)."
 msgstr ""

 #: ../../../_source/toolchain-head.rst:77
+msgid "``amd/device-libs`` --- AMD device libs."
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:79
+msgid "``amd/comgr`` --- Code Object Manager."
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:83
+msgid "device-libs"
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:84
+msgid "Build ``device-libs``."
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:91
 msgid "roct-thunk-interface"
 msgstr ""

-#: ../../../_source/toolchain-head.rst:78
+#: ../../../_source/toolchain-head.rst:92
 msgid "Build ``roct-thunk-interface``."
 msgstr ""

-#: ../../../_source/toolchain-head.rst:86
+#: ../../../_source/toolchain-head.rst:99
 msgid "rocr-runtime"
 msgstr ""

-#: ../../../_source/toolchain-head.rst:87
+#: ../../../_source/toolchain-head.rst:100
 msgid ""
-"Build ``rocr-runtime``. Needs hsakmtConfig.cmake from ROCT-Thunk-Interface "
-"first."
+"Build ``rocr-runtime``. Needs hsakmtConfig.cmake from ROCT-Thunk-"
+"Interface first."
 msgstr ""

-#: ../../../_source/toolchain-head.rst:96
+#: ../../../_source/toolchain-head.rst:106
+msgid ""
+"For some reason, this is installing headers to ``/usr/hsa`` instead of "
+"``/opt/rocm``. It is ignoring the ``PREFIX``.  Workaround..."
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:111
 msgid "comgr"
 msgstr ""

-#: ../../../_source/toolchain-head.rst:97
+#: ../../../_source/toolchain-head.rst:112
 msgid "Build ``comgr``."
 msgstr ""

-#: ../../../_source/toolchain-head.rst:99
+#: ../../../_source/toolchain-head.rst:114
 msgid ""
 "Needs AMD device-libs built first. Needs hsa-runtime64Config.cmake first "
 "from ROCR-Runtime"
 msgstr ""

-#: ../../../_source/toolchain-head.rst:107
-msgid "clr"
-msgstr ""
-
-#: ../../../_source/toolchain-head.rst:108
-msgid "clr..."
-msgstr ""
-
-#: ../../../_source/toolchain-head.rst:116
-msgid "hipcc built under clr. This seems better."
+#: ../../../_source/toolchain-head.rst:122
+msgid "hipcc"
 msgstr ""

 #: ../../../_source/toolchain-head.rst:123
+msgid "hipcc."
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:130
 msgid "rocminfo"
 msgstr ""

-#: ../../../_source/toolchain-head.rst:124
+#: ../../../_source/toolchain-head.rst:131
 msgid "Yes, ``rocminfo``"
 msgstr ""

-#: ../../../_source/toolchain-head.rst:131
-msgid "rocBLAS"
+#: ../../../_source/toolchain-head.rst:138
+msgid "rocm-bandwidth-test"
 msgstr ""

-#: ../../../_source/toolchain-head.rst:132
-msgid "Needed before hipBLAS."
+#: ../../../_source/toolchain-head.rst:139
+msgid "``rocm-bandwidth-test``."
 msgstr ""

-#: ../../../_source/toolchain-head.rst:135
-msgid "Set up this once:"
+#: ../../../_source/toolchain-head.rst:146
+msgid "LLVM Second Pass"
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:147
+msgid "Rebuilding LLVM with itself, with more features."
 msgstr ""

 #: ../../../_source/toolchain-head.rst:154
-msgid "Fails with this:"
+msgid "clr"
 msgstr ""
+
+#: ../../../_source/toolchain-head.rst:155
+msgid "OpenCL and more."
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:162
+msgid "rocBLAS"
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:163
+msgid "Needed before hipBLAS."
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:165
+msgid "Set up this once:"
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:182
+msgid "rocprim"
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:183
+msgid "``rocprim``."
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:190
+msgid "rocsparse"
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:191
+msgid "``rocsparse``."
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:198
+msgid "rocsolver"
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:199
+msgid "``rocsolver`` for hipBLAS."
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:206
+msgid "hipBLAS"
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:207
+msgid "``hipBLAS`` plz."
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:214
+msgid "HOLD"
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:215
+msgid "Don't upgrade over these files. Debian has higher epochs."
+msgstr ""
+
+#: ../../../_source/toolchain-head.rst:217
+msgid "``apt-mark hold hipcc llvm rocm-cmake rocm-device-libs rocminfo``"
+msgstr ""
+
+#~ msgid ""
+#~ "XXX Building using latest commit in "
+#~ "repo, not using tags, ala "
+#~ "``rocm-6.0.0``. Using tags ``amd-stg-"
+#~ "open``, ``develop``, etc."
+#~ msgstr ""
+
+#~ msgid "LLVM ``amd/comgr``"
+#~ msgstr ""
+
+#~ msgid "Build ``hipcc``."
+#~ msgstr ""
+
+#~ msgid "XXX This is better below using ``clr`` repo. XXX ?"
+#~ msgstr ""
+
+#~ msgid "Fails with clang target error..."
+#~ msgstr ""
+
+#~ msgid "clr..."
+#~ msgstr ""
+
+#~ msgid "hipcc built under clr. This seems better."
+#~ msgstr ""
+
+#~ msgid "Fails with this:"
+#~ msgstr ""
+
--- a/docs/_source/toolchain-6.0.2.rst
+++ b/docs/_source/toolchain-6.0.2.rst
@ -1,6 +1,6 @@
-===============
-Toolchain 6.0.2
-===============
+=========
+Toolchain
+=========
 This is a draft of rebuilding all of ROCm for the ``6.0.2`` release.

 The main GPU toolchain is built from AMD upstream ROCm sources.
--- a/docs/_source/toolchain-head.rst
+++ b/docs/_source/toolchain-head.rst
@ -1,6 +1,6 @@
-=========
-Toolchain
-=========
+==============
+Toolchain HEAD
+==============
 The main GPU toolchain is built from AMD upstream ROCm sources.

 A build of all the sources requires building LLVM (``clang``)