upgpkg: hip-runtime-amd 4.5.0-2 Fix vector assertion errors

Changes

3 changed files (+40/-4)

• hip-runtime-amd/.SRCINFO
  • @@ -1,7 +1,7 @@
    pkgbase = hip-runtime-amd pkgdesc = Heterogeneous Interface for Portability ROCm pkgver = 4.5.0 - pkgrel = 1 + pkgrel = 2 url = https://rocmdocs.amd.com/en/latest/Installation_Guide/HIP.html arch = x86_64 license = MIT
  • @@ -19,10 +19,12 @@ pkgbase = hip-runtime-amd
    source = hip-runtime-amd-rocclr-4.5.0.tar.gz::https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-4.5.0.tar.gz source = hip-runtime-amd-hipamd-4.5.0.tar.gz::https://github.com/ROCm-Developer-Tools/hipamd/archive/rocm-4.5.0.tar.gz source = disable-testing.patch + source = vector_oob.patch sha256sums = 4026f31fb4f8050e9aa9d4294f29c3410bfb38422dbbae4236ccd65fed4d55b2 sha256sums = 3a163aed24619b3faf5e8ba17325bdcedd1667a904ea20914ac6bdd33fcdbca8 sha256sums = ca8d6305ff0e620d9cb69ff7ac3898917db9e9b6996a7320244b48ab6511dd8e sha256sums = 7b93ab64d6894ff9b5ba0be35e3ed8501d6b18a2a14223d6311d72ab8a9cdba6 sha256sums = 3f158fb78296477db176c53a8df60b8034004c400b6c62f558c94663a5246883 + sha256sums = 8295e2d1b1d48da821f280e6a44f8376cbe73b77bd58bdceed38dbc2a100569f pkgname = hip-runtime-amd
• hip-runtime-amd/PKGBUILD
  • @@ -2,7 +2,7 @@
    # Contributor: acxz <akashpatel2008 at yahoo dot com> pkgname=hip-runtime-amd pkgver=4.5.0 - pkgrel=1 + pkgrel=2 pkgdesc="Heterogeneous Interface for Portability ROCm" arch=('x86_64') url='https://rocmdocs.amd.com/en/latest/Installation_Guide/HIP.html'
  • @@ -19,12 +19,14 @@ source=("$pkgname-$pkgver.tar.gz::$_hip/archive/rocm-$pkgver.tar.gz"
    "$pkgname-opencl-$pkgver.tar.gz::$_opencl/archive/rocm-$pkgver.tar.gz" "$pkgname-rocclr-$pkgver.tar.gz::$_rocclr/archive/rocm-$pkgver.tar.gz" "$pkgname-hipamd-$pkgver.tar.gz::$_hipamd/archive/rocm-$pkgver.tar.gz" - 'disable-testing.patch') + 'disable-testing.patch' + 'vector_oob.patch') sha256sums=('4026f31fb4f8050e9aa9d4294f29c3410bfb38422dbbae4236ccd65fed4d55b2' '3a163aed24619b3faf5e8ba17325bdcedd1667a904ea20914ac6bdd33fcdbca8' 'ca8d6305ff0e620d9cb69ff7ac3898917db9e9b6996a7320244b48ab6511dd8e' '7b93ab64d6894ff9b5ba0be35e3ed8501d6b18a2a14223d6311d72ab8a9cdba6' - '3f158fb78296477db176c53a8df60b8034004c400b6c62f558c94663a5246883') + '3f158fb78296477db176c53a8df60b8034004c400b6c62f558c94663a5246883' + '8295e2d1b1d48da821f280e6a44f8376cbe73b77bd58bdceed38dbc2a100569f') _dirhip="$(basename "$_hip")-$(basename "${source[0]}" ".tar.gz")" _diropencl="$(basename "$_opencl")-$(basename "${source[1]}" ".tar.gz")" _dirrocclr="$(basename "$_rocclr")-$(basename "${source[2]}" ".tar.gz")"
  • @@ -34,6 +36,9 @@ prepare() {
    cd "$_dirhipamd" # Tests are broken with cmake 3.21 patch -Np1 -i "$srcdir/disable-testing.patch" + cd "$srcdir/$_dirrocclr" + # https://github.com/ROCm-Developer-Tools/HIP/issues/2426 + patch -Np1 -i "$srcdir/vector_oob.patch" } build() {
• hip-runtime-amd/vector_oob.patch (new)
  • @@ -0,0 +1,29 @@
    + --- ROCclr-rocm-4.5.0/device/rocm/rocblit.cpp 2021-11-25 22:38:12.837707706 +0100 + +++ ROCclr-rocm-4.5.0/device/rocm/rocblit.cpp 2021-11-25 22:40:00.699796341 +0100 + @@ -460,7 +460,7 @@ + std::this_thread::get_id(), (wait_events.size() != 0) ? wait_events[0].handle : 0, + active.handle); + hsa_status_t status = hsa_amd_memory_async_copy_rect(&dstMem, &offset, + - &srcMem, &offset, &dim, agent, direction, wait_events.size(), &wait_events[0], active); + + &srcMem, &offset, &dim, agent, direction, wait_events.size(), wait_events.data(), active); + if (status != HSA_STATUS_SUCCESS) { + gpu().Barriers().ResetCurrentSignal(); + LogPrintfError("DMA buffer failed with code %d", status); + @@ -484,7 +484,7 @@ + hsa_status_t status = hsa_amd_memory_async_copy( + (reinterpret_cast<address>(dst) + dstOffset), dstAgent, + (reinterpret_cast<const_address>(src) + srcOffset), srcAgent, + - size[0], wait_events.size(), &wait_events[0], active); + + size[0], wait_events.size(), wait_events.data(), active); + if (status != HSA_STATUS_SUCCESS) { + gpu().Barriers().ResetCurrentSignal(); + LogPrintfError("DMA buffer failed with code %d", status); + @@ -671,7 +671,7 @@ + active.handle); + + status = hsa_amd_memory_async_copy(dst, dstAgent, src, srcAgent, + - size[0], wait_events.size(), &wait_events[0], active); + + size[0], wait_events.size(), wait_events.data(), active); + if (status == HSA_STATUS_SUCCESS) { + gpu().addSystemScope(); + } else {