Merge pull request #5 from GPUOpen-LibrariesAndSDKs/fixes-public-repo

Fixes public repo

Author: RichardGe

.gitmodules

@@ -4,6 +4,3 @@
 [submodule "contrib/easy-encryption"]
 	path = contrib/easy-encryption
 	url = https://github.com/amdadvtech/easy-encryption
-[submodule "test/common/meshes/lfs"]
-	path = test/common/meshes/lfs
-	url = https://github.com/amdadvtech/TestModels

premake5.lua

@@ -110,7 +110,8 @@ function get_hip_sdk_verion()
             if string.sub(HIP_PATH, -1, -1) == '\\' or string.sub(HIP_PATH, -1, -1) == '/' then
                 HIP_PATH = string.sub(HIP_PATH, 1, -2)
             end
-			hipCommand = HIP_PATH..'\\'..hipCommand
+			-- HIP_PATH is expected to look like:   C:\Program Files\AMD\ROCm\5.7
+			hipCommand = '\"' .. HIP_PATH..'\\bin\\'..hipCommand .. '\"'
 		end
 	end
 
@@ -194,6 +195,10 @@ workspace "hiprt"
     end
     defines {"__USE_HIP__"}
 
+    -- this define is to identify that we are on the public repository of HIPRT.
+    -- it helps AMD to maintain both a public and a private repo for experimentation.
+    defines {"HIPRT_PUBLIC_REPO"}
+
     targetdir "dist/bin/%{cfg.buildcfg}"    
     location "build/"
 

test/common/meshes/lfs

@@ -31,6 +31,7 @@
 #include <map>
 #include <chrono>
 
+#ifndef HIPRT_PUBLIC_REPO
 TEST_F( PerformanceTestCases, AoRayEmbreeHairball )
 {
 	constexpr bool	Timings	 = true;
@@ -48,7 +49,9 @@ TEST_F( PerformanceTestCases, AoRayEmbreeHairball )
 	render( "AoRayHairball.png", "../test/kernels/AoRayKernel.h", "AoRayKernel", "AoRayHairball.png", Timings, AoRadius );
 	deleteScene( m_scene );
 }
+#endif
 
+#ifndef HIPRT_PUBLIC_REPO
 TEST_F( PerformanceTestCases, AoRayHairball )
 {
 	constexpr bool	Timings	 = true;
@@ -66,7 +69,9 @@ TEST_F( PerformanceTestCases, AoRayHairball )
 	render( "AoRayHairball.png", "../test/kernels/AoRayKernel.h", "AoRayKernel", "AoRayHairball.png", Timings, AoRadius );
 	deleteScene( m_scene );
 }
+#endif
 
+#ifndef HIPRT_PUBLIC_REPO
 TEST_F( PerformanceTestCases, AoRayEmbreeBistro )
 {
 	constexpr bool	Timings	 = true;
@@ -84,7 +89,9 @@ TEST_F( PerformanceTestCases, AoRayEmbreeBistro )
 	render( "AoRayEmbreeBistro.png", "../test/kernels/AoRayKernel.h", "AoRayKernel", "AoRayBistro.png", Timings, AoRadius );
 	deleteScene( m_scene );
 }
+#endif
 
+#ifndef HIPRT_PUBLIC_REPO
 TEST_F( PerformanceTestCases, AoRayBistro )
 {
 	constexpr bool	Timings	 = true;
@@ -102,7 +109,9 @@ TEST_F( PerformanceTestCases, AoRayBistro )
 	render( "AoRayBistro.png", "../test/kernels/AoRayKernel.h", "AoRayKernel", "AoRayBistro.png", Timings, AoRadius );
 	deleteScene( m_scene );
 }
+#endif
 
+#ifndef HIPRT_PUBLIC_REPO
 TEST_F( PerformanceTestCases, PrimaryRayBistro )
 {
 	constexpr uint32_t Option	  = VisualizeColor;
@@ -121,7 +130,9 @@ TEST_F( PerformanceTestCases, PrimaryRayBistro )
 	render( "PrimaryRayBistro.png", "../test/kernels/PrimaryRayKernel.h", kernelName, "PrimaryRayBistro.png", Timings );
 	deleteScene( m_scene );
 }
+#endif
 
+#ifndef HIPRT_PUBLIC_REPO
 TEST_F( PerformanceTestCases, BvhFastBistro )
 {
 	constexpr uint32_t Option	  = VisualizeColor;
@@ -140,7 +151,9 @@ TEST_F( PerformanceTestCases, BvhFastBistro )
 	render( "BvhFastBistro.png", "../test/kernels/PrimaryRayKernel.h", kernelName, "PrimaryRayBistro.png", Timings );
 	deleteScene( m_scene );
 }
+#endif
 
+#ifndef HIPRT_PUBLIC_REPO
 TEST_F( PerformanceTestCases, BvhHighQBistro )
 {
 	constexpr uint32_t Option	  = VisualizeColor;
@@ -159,7 +172,9 @@ TEST_F( PerformanceTestCases, BvhHighQBistro )
 	render( "BvhHighQBistro.png", "../test/kernels/PrimaryRayKernel.h", kernelName, "PrimaryRayBistro.png", Timings );
 	deleteScene( m_scene );
 }
+#endif
 
+#ifndef HIPRT_PUBLIC_REPO
 TEST_F( PerformanceTestCases, BvhBalancedBistro )
 {
 	constexpr uint32_t Option	  = VisualizeColor;
@@ -178,6 +193,7 @@ TEST_F( PerformanceTestCases, BvhBalancedBistro )
 	render( "BvhBalancedBistro.png", "../test/kernels/PrimaryRayKernel.h", kernelName, "PrimaryRayBistro.png", getTimings );
 	deleteScene( m_scene );
 }
+#endif
 
 TEST_F( ObjTestCases, TranslateCornellBox )
 {
@@ -2683,5 +2699,6 @@ int main( int argc, const char* argv[] )
 #endif
 
 	::testing::AddGlobalTestEnvironment( new InitCommandlineArgs( parsedArgs ) );
-	return RUN_ALL_TESTS();
+	int ret = RUN_ALL_TESTS();
+	return ret;
 }