remove HIPRT_PREFER_HIP_5 - and re-order lib path

Author: RichardGe

CMakeLists.txt

@@ -14,7 +14,6 @@ option(PRECOMPILE "Precompile kernels" OFF)
 option(HIPRTEW "Use hiprtew" OFF)
 option(NO_ENCRYPT "Don't encrypt kernel source and binaries" OFF)
 option(NO_UNITTEST "Don't build unit tests" OFF)
-option(HIPRT_PREFER_HIP_5 "Prefer HIP 5" OFF)
 option(COMPILED_COMPRESSION "enable compression of compiled kernels" ON) # this argument is only used if BAKE_COMPILED_KERNEL is enabled -- advised to let it 'ON' as it's the path tested by the HIPRT team.
 
 option(FORCE_DISABLE_CUDA "By default Cuda support is automatically added if a Cuda install is detected. Turn this flag to ON to force Cuda to be disabled." OFF)
@@ -373,10 +372,6 @@ else()
 	set(ENV{HIPRT_NO_ENCRYPT} "ON")
 endif()
 
-if(HIPRT_PREFER_HIP_5)
-	add_definitions(-DHIPRT_PREFER_HIP_5)
-endif()
-
 
 
 # files generated by compile.py and precompile_bitcode.py

hiprt/hiprt_libpath.h

@@ -31,11 +31,11 @@
 
 #ifdef _WIN32
 
-#ifdef HIPRT_PREFER_HIP_5
-const char* g_hip_paths[] = { "amdhip64.dll", "amdhip64_6.dll", "amdhip64_7.dll", NULL };
-#else
-const char* g_hip_paths[] = { "amdhip64_7.dll", "amdhip64_6.dll", "amdhip64.dll", NULL };
-#endif
+const char* g_hip_paths[] = {
+	"amdhip64_7.dll",
+	"amdhip64_6.dll",
+	"amdhip64.dll", // <- hip '5.x' DLL.
+	NULL };
 
 const char* g_hiprtc_paths[] = {
 	"hiprtc0700.dll",
@@ -57,8 +57,14 @@ const char** g_hip_paths	= nullptr;
 const char** g_hiprtc_paths = nullptr;
 #else
 
-#ifdef HIPRT_PREFER_HIP_5
 const char* g_hip_paths[] = {
+
+	// first, we try with the generic symbolic link.
+	"libamdhip64.so",
+	"/opt/rocm/lib/libamdhip64.so",
+	"/opt/rocm/hip/lib/libamdhip64.so",
+
+	// .. if it doesn't exist, we try the specific versions
 	"libamdhip64.so.7",
 	"/opt/rocm/lib/libamdhip64.so.7",
 	"/opt/rocm/hip/lib/libamdhip64.so.7",
@@ -71,31 +77,16 @@ const char* g_hip_paths[] = {
 	"/opt/rocm/lib/libamdhip64.so.5",
 	"/opt/rocm/hip/lib/libamdhip64.so.5",
 
-	"libamdhip64.so",
-	"/opt/rocm/lib/libamdhip64.so",
-	"/opt/rocm/hip/lib/libamdhip64.so",
 	NULL };
-#else
-const char* g_hip_paths[] = {
-	"libamdhip64.so",
-	"/opt/rocm/lib/libamdhip64.so",
-	"/opt/rocm/hip/lib/libamdhip64.so",
-
-	"libamdhip64.so.5",
-	"/opt/rocm/lib/libamdhip64.so.5",
-	"/opt/rocm/hip/lib/libamdhip64.so.5",
 
-	"libamdhip64.so.6",
-	"/opt/rocm/lib/libamdhip64.so.6",
-	"/opt/rocm/hip/lib/libamdhip64.so.6",
+const char* g_hiprtc_paths[] = {
 
-	"libamdhip64.so.7",
-	"/opt/rocm/lib/libamdhip64.so.7",
-	"/opt/rocm/hip/lib/libamdhip64.so.7",
-	NULL };
-#endif
+	// first, we try with the generic symbolic link.
+	"/opt/rocm/hip/lib/libhiprtc.so",
+	"/opt/rocm/lib/libhiprtc.so",
+	"libhiprtc.so",
 
-const char* g_hiprtc_paths[] = {
+	// .. if it doesn't exist, we try the specific versions
 	"/opt/rocm/hip/lib/libhiprtc.so.7",
 	"/opt/rocm/lib/libhiprtc.so.7",
 	"libhiprtc.so.7",
@@ -108,9 +99,5 @@ const char* g_hiprtc_paths[] = {
 	"/opt/rocm/lib/libhiprtc.so.5",
 	"libhiprtc.so.5",
 
-	"/opt/rocm/hip/lib/libhiprtc.so",
-	"/opt/rocm/lib/libhiprtc.so",
-	"libhiprtc.so",
-
 	NULL };
 #endif