Make directed_test support static libs

1.Make directed_test apps linked against static libs
of hip, rocclr, rocr, roct and amd_comgr.
2.Remove custom_target amdhip64_static_combiner.
3.Support EXCLUDE_HIP_LIB_TYPE <static|shared>.
4.Simplify argument list parsing.
5.Fix hip_pch.o missing issue in samples' build.
6.Fix some original small bugs.

Change-Id: I30f5e65367613152ce86b80b13e1c9f2a28da803
Tento commit je obsažen v:
Tao Sang
2020-09-27 12:57:36 -04:00
odevzdal Tao Sang
rodič 71319d9d2c
revize d00d627b9d
6 změnil soubory, kde provedl 46 přidání a 6 odebrání
+8
Zobrazit soubor
@@ -2,6 +2,14 @@ project(bit_extract)
cmake_minimum_required(VERSION 3.10)
if(NOT DEFINED __HIP_ENABLE_PCH)
set(__HIP_ENABLE_PCH ON CACHE BOOL "enable/disable pre-compiled hip headers")
endif()
if(${__HIP_ENABLE_PCH})
add_definitions(-D__HIP_ENABLE_PCH)
endif()
# Search for rocm in common locations
list(APPEND CMAKE_PREFIX_PATH /opt/rocm/hip /opt/rocm)
+14
Zobrazit soubor
@@ -54,6 +54,20 @@ int main(int argc, char* argv[]) {
size_t N = 1000000;
size_t Nbytes = N * sizeof(uint32_t);
#ifdef __HIP_ENABLE_PCH
// Verify hip_pch.o
const char* pch = nullptr;
unsigned int size = 0;
__hipGetPCH(&pch, &size);
printf("pch size: %u\n", size);
if (size == 0) {
printf("__hipGetPCH failed!\n");
return -1;
} else {
printf("__hipGetPCH succeeded!\n");
}
#endif
int deviceId;
CHECK(hipGetDevice(&deviceId));
hipDeviceProp_t props;
+3
Zobrazit soubor
@@ -7,6 +7,9 @@ cmake_minimum_required(VERSION 3.10)
# Search for rocm in common locations
list(APPEND CMAKE_PREFIX_PATH /opt/rocm/hip /opt/rocm)
# create square.cpp
execute_process(COMMAND sh -c "/opt/rocm/hip/bin/hipify-perl ../square.cu > ../square.cpp")
# Find hip
find_package(hip)
+3
Zobrazit soubor
@@ -9,6 +9,9 @@ if(NOT DEFINED HIP_PATH)
endif()
set(CMAKE_MODULE_PATH "${HIP_PATH}/cmake" ${CMAKE_MODULE_PATH})
# Search for rocm in common locations
list(APPEND CMAKE_PREFIX_PATH ${HIP_PATH} /opt/rocm)
project(12_cmake)
set(HIP_CLANG_NUM_PARALLEL_JOBS 2)
+6
Zobrazit soubor
@@ -37,7 +37,13 @@ Use the following commands to build and execute the sample
```
mkdir build
cd build
For shared lib of hip rt,
cmake ..
Or for static lib of hip rt,
cmake -DCMAKE_PREFIX_PATH="/opt/rocm/llvm/lib/cmake" ..
Then,
make
./MatrixTranspose
```
+12 -6
Zobrazit soubor
@@ -12,16 +12,22 @@ make
2.CMakeLists.txt can support shared and static libs of hip-rocclr runtime.
To build a sample, type in sample folder,
To build a sample, run in the sample folder,
mkdir build (if build folder is missing)
mkdir -p build && cd build
cd build
rm -rf * (to clear up)
a. to build with shared libs, run
cmake ..
b. to build with static libs, run
cmake -DCMAKE_PREFIX_PATH="/opt/rocm/llvm/lib/cmake" ..
Then run,
make
If you want debug version, follow,
cmake -DCMAKE_BUILD_TYPE=Debug ..
Note that if you want debug version, add "-DCMAKE_BUILD_TYPE=Debug" in cmake cmd.