Skip to content

Commit

Permalink
Add hsakmt_roct 5.2.3 (#5469)
Browse files Browse the repository at this point in the history
* Add hsakmt_roct 5.2.3

* Install license
  • Loading branch information
pxl-th authored Sep 12, 2022
1 parent 8d027e7 commit b027bbc
Show file tree
Hide file tree
Showing 3 changed files with 79 additions and 6 deletions.
13 changes: 7 additions & 6 deletions H/hsakmt_roct/common.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
const NAME = "hsakmt_roct"

const ROCM_GIT = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
const ROCM_TAGS = Dict(
v"4.2.0" => "cc325d4b9a96062f2ad0515fce724a8c64ba56a7d7f1ac4a0753941b8599c52e",
v"4.5.2" => "fb8e44226b9e393baf51bfcb9873f63ce7e4fcf7ee7f530979cf51857ea4d24b")
v"4.5.2" => "fb8e44226b9e393baf51bfcb9873f63ce7e4fcf7ee7f530979cf51857ea4d24b",
v"5.2.3" => "8d313b8fd945a8d7248c00a2de9a2ee896fe77e464430a91b63400a986ec0bf0")
const ROCM_PLATFORMS = [
Platform("x86_64", "linux"; libc="glibc", cxxstring_abi="cxx11"),
Platform("x86_64", "linux"; libc="musl", cxxstring_abi="cxx11"),
Expand All @@ -23,6 +26,8 @@ cmake \
make -j${nproc}
make install
install_license ${WORKSPACE}/srcdir/ROCT-Thunk-Interface*/LICENSE.md
"""

function configure_build(version)
Expand All @@ -33,9 +38,5 @@ function configure_build(version)
]
products = [LibraryProduct(["libhsakmt"], :libhsakmt)]
dependencies = [Dependency("NUMA_jll"), Dependency("libdrm_jll")]
name = "hsakmt_roct"

(
name, version, sources, BUILDSCRIPT,
ROCM_PLATFORMS, products, dependencies)
NAME, version, sources, BUILDSCRIPT, ROCM_PLATFORMS, products, dependencies
end
7 changes: 7 additions & 0 deletions H/hsakmt_roct/[email protected]/build_tarballs.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
using Pkg
using BinaryBuilder

include("../common.jl")
build_tarballs(
ARGS, configure_build(v"5.2.3")...;
preferred_gcc_version=v"7", preferred_llvm_version=v"9", julia_compat="1.9")
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
From f9d0ce5726b6050dc7486a91dbfa16a9a3df90e4 Mon Sep 17 00:00:00 2001
From: Julian P Samaroo <[email protected]>
Date: Sat, 3 Oct 2020 15:27:40 -0500
Subject: [PATCH] Build correctly on musl

---
CMakeLists.txt | 2 +-
src/libhsakmt.h | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ccf7747..8871f45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -159,7 +159,7 @@ get_os_info()

find_package(PkgConfig)
# Check for libraries required for building
-find_library(LIBC NAMES libc.so.6 REQUIRED)
+find_library(LIBC NAMES libc.so REQUIRED)
find_library(NUMA NAMES libnuma.so REQUIRED)
message(STATUS "LIBC:" ${LIBC})
message(STATUS "NUMA:" ${NUMA})
diff --git a/src/libhsakmt.h b/src/libhsakmt.h
index d531e87..1240bcd 100644
--- a/src/libhsakmt.h
+++ b/src/libhsakmt.h
@@ -31,6 +31,7 @@
#include <pthread.h>
#include <stdint.h>
#include <limits.h>
+#include <sys/param.h>

extern int kfd_fd;
extern unsigned long kfd_open_count;
@@ -56,6 +57,9 @@ extern HsaVersionInfo kfd_version_info;
do { if ((minor) > kfd_version_info.KernelInterfaceMinorVersion)\
return HSAKMT_STATUS_NOT_SUPPORTED; } while (0)

+#ifdef PAGE_SIZE
+#undef PAGE_SIZE
+#endif
extern int PAGE_SIZE;
extern int PAGE_SHIFT;

@@ -202,13 +206,17 @@ extern int kmtIoctl(int fd, unsigned long request, void *arg);
#define VOID_PTR_SUB(ptr,n) (void*)((uint8_t*)(ptr) - n)/*ptr - offset*/
#define VOID_PTRS_SUB(ptr1,ptr2) (uint64_t)((uint8_t*)(ptr1) - (uint8_t*)(ptr2)) /*ptr1 - ptr2*/

+#ifndef MIN
#define MIN(a, b) ({ \
typeof(a) tmp1 = (a), tmp2 = (b); \
tmp1 < tmp2 ? tmp1 : tmp2; })
+#endif

+#ifndef MIN
#define MAX(a, b) ({ \
typeof(a) tmp1 = (a), tmp2 = (b); \
tmp1 > tmp2 ? tmp1 : tmp2; })
+#endif

void clear_events_page(void);
void fmm_clear_all_mem(void);
--
2.35.0

0 comments on commit b027bbc

Please sign in to comment.