Merge pull request ROCm#11 from PedramAlizadeh/pitchfork_layout

converting to Pitchfork layout standard

Author: PedramAlizadeh

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog for TransferBench
 
+## v1.13
+### Added
+- Added support for cmake
+
+### Changed
+- Converted to the Pitchfork layout standard
+
 ## v1.12
 ### Added
 - Added support for TransferBench on NVIDIA platforms (via HIP_PLATFORM=nvidia)

CMakeLists.txt

@@ -0,0 +1,15 @@
+# Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved.
+if (DEFINED ENV{ROCM_PATH})
+    set(ROCM_PATH "$ENV{ROCM_PATH}" CACHE STRING "ROCm install directory")
+else()
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "ROCm install directory")
+endif()
+cmake_minimum_required(VERSION 3.5)
+project(TransferBench CXX)
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -L${ROCM_PATH}/hsa/lib")
+include_directories(${ROCM_PATH}/hsa/include)
+link_libraries(numa hsa-runtime64)
+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ..)
+add_executable(TransferBench src/TransferBench.cpp)
+target_include_directories(TransferBench PRIVATE src/include)
+

Makefile

@@ -1,14 +1,9 @@
-# Copyright (c) 2019-2023 Advanced Micro Devices, Inc. All rights reserved.
-ROCM_PATH ?= /opt/rocm
-HIPCC=$(ROCM_PATH)/bin/hipcc
+#
+# Copyright (c) 2023      Advanced Micro Devices, Inc. All rights reserved.
+#
 
-EXE=TransferBench
-CXXFLAGS = -O3 -I. -I$(ROCM_PATH)/hsa/include -lnuma -L$(ROCM_PATH)/hsa/lib -lhsa-runtime64
-
-all: $(EXE)
-
-$(EXE): $(EXE).cpp $(shell find -regex ".*\.\hpp")
-	$(HIPCC) $(CXXFLAGS) $< -o $@
+all:
+	cd src ; make
 
 clean:
-	rm -f *.o $(EXE)
+	cd src ; make clean

README.md

@@ -8,8 +8,18 @@ TransferBench is a simple utility capable of benchmarking simultaneous copies be
 2. libnuma installed on system
 
 ## Building
-  To build TransferBench:
-* `make`
+  To build TransferBench using Makefile:
+ ```shell
+ $ make
+ ```
+
+  To build TransferBench using cmake:
+ ```shell 
+$ mkdir build
+$ cd build
+$ CXX=/opt/rocm/bin/hipcc cmake ..
+$ make
+ ```
 
   If ROCm is installed in a folder other than `/opt/rocm/`, set ROCM_PATH appropriately
 

example.cfg renamed to examples/example.cfg

@@ -0,0 +1,14 @@
+# Copyright (c) 2019-2023 Advanced Micro Devices, Inc. All rights reserved.
+ROCM_PATH ?= /opt/rocm
+HIPCC=$(ROCM_PATH)/bin/hipcc
+
+EXE=TransferBench
+CXXFLAGS = -O3 -I. -Iinclude -I$(ROCM_PATH)/hsa/include -lnuma -L$(ROCM_PATH)/hsa/lib -lhsa-runtime64
+
+all: $(EXE)
+
+$(EXE): $(EXE).cpp $(shell find -regex ".*\.\hpp")
+	$(HIPCC) $(CXXFLAGS) $< -o ../$@
+
+clean:
+	rm -f *.o ../$(EXE)

src/Makefile

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #include <time.h>
 #include "Kernels.hpp"
 
-#define TB_VERSION "1.12"
+#define TB_VERSION "1.13"
 
 extern char const MemTypeStr[];
 extern char const ExeTypeStr[];