Merge pull request #47 from ROCm-Developer-Tools/AlexVlx/issue42

Fix #42.
ROCm · Aug 30, 2023 · 719abc2 · 719abc2
2 parents 2f23731 + c2783da
commit 719abc2
Show file tree

Hide file tree

Showing 22 changed files with 1,150 additions and 5,042 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,20 +11,20 @@ on:
 jobs:
  test-macOS-GCC:
  name: macOS-GCC
- runs-on: macos-11.0
+ runs-on: macos-latest
  steps:
  - name: Fetch TBB
- run: brew install tbb@2020 # Version lock due to temporary PSTL incompatibility with 2021+
+ run: brew install tbb
 
  - name: Checkout HIP CPU Runtime
- uses: actions/checkout@v2
+ uses: actions/checkout@v3.6.0
 
  - name: Build HIP CPU Runtime tests
  run: |
  cd ${{github.workspace}}
  mkdir build
  cd build
- cmake ../ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_CXX_COMPILER=g++-11
+ cmake ../ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_CXX_COMPILER=g++-12
  cmake --build ${{github.workspace}}/build --config RelWithDebInfo -j 3
 
  - name: Run Tests
@@ -39,7 +39,7 @@ jobs:
  run: sudo apt-get install libtbb-dev
 
  - name: Checkout HIP CPU Runtime
- uses: actions/checkout@v2
+ uses: actions/checkout@v3.6.0
 
  - name: Build HIP CPU Runtime tests
  run: |
@@ -58,7 +58,7 @@ jobs:
  runs-on: windows-latest
  steps:
  - name: Checkout HIP CPU Runtime
- uses: actions/checkout@v2
+ uses: actions/checkout@v3.6.0
 
  - name: Build HIP CPU Runtime tests
  run: |

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Advanced Micro Devices, Inc.
+Copyright (c) 2023 Advanced Micro Devices, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/external/catch2/catch.hpp b/external/catch2/catch.hpp
diff --git a/external/libco/amd64.inl b/external/libco/amd64.inl
@@ -136,7 +136,7 @@ inline cothread_t co_derive(void* memory, unsigned int size, void (*entrypoint)(
  cothread_t handle;
  if(!co_swap) {
  co_init();
- co_swap = (void (*)(cothread_t, cothread_t))co_swap_function;
+ co_swap = (void (*)(cothread_t, cothread_t))&co_swap_function[0];
  }
  if(!co_active_handle) co_active_handle = &co_active_buffer;
 

diff --git a/external/libco/settings.h b/external/libco/settings.h
@@ -116,11 +116,11 @@
 #endif
 
 #if defined(_MSC_VER)
- #define section(name) __declspec(allocate("." #name))
+ #define LIBCO_SECTION(name) __declspec(allocate(#name))
 #elif defined(__APPLE__)
- #define section(name) __attribute__((section("__TEXT,__" #name)))
+ #define LIBCO_SECTION(name) __attribute__((section("__TEXT,__" #name)))
 #else
- #define section(name) __attribute__((section("." #name "#")))
+ #define LIBCO_SECTION(name) __attribute__((section(#name)))
 #endif
 
 

diff --git a/external/libco/x86.inl b/external/libco/x86.inl
@@ -21,7 +21,7 @@ inline void (fastcall *co_swap)(cothread_t, cothread_t) = 0;
 #ifdef LIBCO_MPROTECT
  alignas(4096)
 #else
- section(text)
+ LIBCO_SECTION(text)
 #endif
 /* ABI: fastcall */
 static const unsigned char co_swap_function[4096] = {

diff --git a/external/moodycamel/LICENSE.md b/external/moodycamel/LICENSE.md