Updates for RGA 1.4 release.

Change-Id: I21d57c3d19014f0da26c238cdf128af2fa046db4

.gitignore

@@ -0,0 +1,2 @@
+Build/CMake
+output

Build/JenkinsConfigPostBuild.txt

@@ -1,56 +1,42 @@
-/// RGA
-
-// "P4ROOT" is passed in to this build script from Jenkins
-
-// "SOLUTION" is passed in to this build script from Jenkins
-
+// RGA
+// "RGA_ROOT" is passed in to this build script from Jenkins
+// "SOLUTION_PATH" is passed in to this build script from Jenkins
 // "ARCH" is passed in to this build script from Jenkins (must be "x64" or "x86")
-
 // "ARCHIVE_NAME" is passed in to this build script from Jenkins
 
-
-Define "RGAPATH" "[P4ROOT]\RGA"
-
+Define "RGAPATH" "[RGA_ROOT]\RGA"
 Define "BUILDPATH" "[RGAPATH]\BuildOutput"
 
 Always
+    Log "[RGA_ROOT]\RGA_Build.log"
 
-    Log "[P4ROOT]\RGA_Build.log"
+Debug
+    Define "OUTPUT_BLD_DIR" "Debug"
 
+Release
+    Define "OUTPUT_BLD_DIR" "Release"
 
 Image
-
     // Make zip files for CodeXL bits
-
     Define "ZIPDIRRGA" "[BUILDPATH]"
-
     MKDIR "[ZIPDIRRGA]"
-
     MKDIR "[ZIPDIRRGA]\bin"
 
     // Copy release binaries to the zip file dir
-
-    XCopy "[OUTPUT_PATH]\Release_Static\bin\rga.exe" "[ZIPDIRRGA]\bin\rga.exe*"
-
-    XCopy "[OUTPUT_PATH]\Release_Static\bin\[ARCH]\VirtualContext.exe" "[ZIPDIRRGA]\bin\[ARCH]\VirtualContext.exe*"
-
-    XCopy "[OUTPUT_PATH]\Release_Static\bin\[ARCH]\amdspv.exe" "[ZIPDIRRGA]\bin\[ARCH]\amdspv.exe*"
-
-    XCopy "[OUTPUT_PATH]\Release_Static\bin\[ARCH]\spvgen.dll" "[ZIPDIRRGA]\bin\[ARCH]\spvgen.dll*"
-
-    XCopy "[OUTPUT_PATH]\Release_Static\bin\[ARCH]\shae.exe" "[ZIPDIRRGA]\bin\[ARCH]\shae.exe*"
-
-    XCopy "[OUTPUT_PATH]\Release_Static\bin\[ARCH]\RGADX11.exe" "[ZIPDIRRGA]\bin\[ARCH]\RGADX11.exe*"
-
+    XCopy "[OUTPUT_PATH]\[ARCH]\bin\[OUTPUT_BLD_DIR]\rga.exe" "[ZIPDIRRGA]\bin\rga.exe*"
+    XCopy "[OUTPUT_PATH]\[ARCH]\bin\[OUTPUT_BLD_DIR]\[ARCH]\VirtualContext.exe" "[ZIPDIRRGA]\bin\[ARCH]\VirtualContext.exe*"
+    XCopy "[OUTPUT_PATH]\[ARCH]\bin\[OUTPUT_BLD_DIR]\[ARCH]\amdspv.exe" "[ZIPDIRRGA]\bin\[ARCH]\amdspv.exe*"
+    XCopy "[OUTPUT_PATH]\[ARCH]\bin\[OUTPUT_BLD_DIR]\[ARCH]\spvgen.dll" "[ZIPDIRRGA]\bin\[ARCH]\spvgen.dll*"
+    XCopy "[OUTPUT_PATH]\[ARCH]\bin\[OUTPUT_BLD_DIR]\[ARCH]\shae.exe" "[ZIPDIRRGA]\bin\[ARCH]\shae.exe*"
+    XCopy "[OUTPUT_PATH]\[ARCH]\bin\[OUTPUT_BLD_DIR]\[ARCH]\RGADX11.exe" "[ZIPDIRRGA]\bin\[ARCH]\RGADX11.exe*"
+    XCopy /e "[OUTPUT_PATH]\[ARCH]\bin\[OUTPUT_BLD_DIR]\[ARCH]\ROCm" "[ZIPDIRRGA]\bin\[ARCH]\ROCm\"
+
+    // Copy the system d3d compiler
     XCopy "C:\Program Files (x86)\Windows Kits\10\bin\[ARCH]\d3dcompiler_47.dll" "[ZIPDIRRGA]\bin\[ARCH]\d3dcompiler_47.dll*"
 
     // Copy the VC++ Redistributable package binaries
-
     XCopy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\[ARCH]\Microsoft.VC140.CRT\concrt140.dll" "[ZIPDIRRGA]\bin\concrt140.dll*"
-
     XCopy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\[ARCH]\Microsoft.VC140.CRT\msvcp140.dll" "[ZIPDIRRGA]\bin\msvcp140.dll*"
-
     XCopy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\[ARCH]\Microsoft.VC140.CRT\vccorlib140.dll" "[ZIPDIRRGA]\bin\vccorlib140.dll*"
     XCopy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\[ARCH]\Microsoft.VC140.CRT\vcruntime140.dll" "[ZIPDIRRGA]\bin\vcruntime140.dll*"
-
-    Zip "[BUILDPATH]\[ARCHIVE_NAME].[BUILD]_[DATE].zip"                  "[ZIPDIRRGA]\bin"
+    Zip "[BUILDPATH]\[ARCHIVE_NAME].[BUILD]_[DATE].zip"                  "[ZIPDIRRGA]\bin"

Build/JenkinsConfigPreBuild.txt

@@ -1,30 +1,18 @@
 // RGA
-
-// "P4ROOT" is passed in to this build script from Jenkins
-
-// "SOLUTION" is passed in to this build script from Jenkins
-
+// "RGA_ROOT" is passed in to this build script from Jenkins
+// "SOLUTION_PATH" is passed in to this build script from Jenkins
 // "ARCH" is passed in to this build script from Jenkins (must be "x64" or "x86")
-
 // "ARCHIVE_NAME" is passed in to this build script from Jenkins
-
-
-Define "RGAPATH" "[P4ROOT]\RGA"
-
+
+Define "RGAPATH" "[RGA_ROOT]\RGA"
 Define "BUILDPATH" "[RGAPATH]\BuildOutput"
-
+
 Always
-
-    Log "[P4ROOT]\RGA_Build.log"
-
+    Log "[RGA_ROOT]\RGA_Build.log"
+
 Image
-
     // Make zip files for CodeXL bits
-
     Define "ZIPDIRRGA" "[BUILDPATH]"
-
     MKDIR "[ZIPDIRRGA]"
-
     MKDIR "[ZIPDIRRGA]\bin"
-
 

Build/JenkinsConfiguration.txt

@@ -1,45 +1,52 @@
 // RGA
-// "P4ROOT" is passed in to this build script from Jenkins
-// "SOLUTION" is passed in to this build script from Jenkins
+// "RGA_ROOT" is passed in to this build script from Jenkins
+// "SOLUTION_PATH" is passed in to this build script from Jenkins
 // "ARCH" is passed in to this build script from Jenkins (must be "x64" or "x86")
 // "ARCHIVE_NAME" is passed in to this build script from Jenkins
 
-Define "RGAPATH" "[P4ROOT]\RGA"
+Define "RGAPATH" "[RGA_ROOT]\RGA"
 Define "BUILDPATH" "[RGAPATH]\BuildOutput"
+
 Always
-    Log "[P4ROOT]\RGA_Build.log"
+    Log "[RGA_ROOT]\RGA_Build.log"
+
 Image
     // Make zip files for CodeXL bits
     Define "ZIPDIRRGA" "[BUILDPATH]"
     MKDIR "[ZIPDIRRGA]"
     MKDIR "[ZIPDIRRGA]\bin"
+
 Clean
     // Clean all files from prior builds - note, this clean section does not need to be called from Jenkins.
-    BuildSln "[SOLUTION_PATH]" "" "Clean"   "Debug_Static|x86"
-    BuildSln "[SOLUTION_PATH]" "" "Clean"   "Debug_Static|x64"
-    BuildSln "[SOLUTION_PATH]" "" "Clean"   "Release_Static|x86"
-    BuildSln "[SOLUTION_PATH]" "" "Clean"   "Release_Static|x64"
-// Build the Public Version
+    BuildSln "[SOLUTION_PATH]" "" "Clean"   "Debug|[ARCH]"
+    BuildSln "[SOLUTION_PATH]" "" "Clean"   "Release|[ARCH]"
+
 Debug
-    BuildSln "[SOLUTION_PATH]" "" "Build"     "Debug_Static|[ARCH]"
-    SendBuildErrors "[EMAIL]" "Radeon GPU Analyzer Debug Static Build Failed"
-Debug Release
-    BuildSln "[SOLUTION_PATH]" "" "Clean"    "Debug_Static|[ARCH]"
+    Define "OUTPUT_BLD_DIR" "Debug"
+    BuildSln "[SOLUTION_PATH]" "" "Build"   "Debug|[ARCH]"
+    SendBuildErrors "[EMAIL]" "Radeon GPU Analyzer Debug Build Failed"
+
 Release
-    BuildSln "[SOLUTION_PATH]" "" "Build"   "Release_Static|[ARCH]"
-    SendBuildErrors "[EMAIL]" "Radeon GPU Analyzer Release Static Build Failed"
+    Define "OUTPUT_BLD_DIR" "Release"
+    BuildSln "[SOLUTION_PATH]" "" "Build"   "Release|[ARCH]"
+    SendBuildErrors "[EMAIL]" "Radeon GPU Analyzer Release Build Failed"
+
 Image
     // Copy release binaries to the zip file dir
-    XCopy "[OUTPUT_PATH]\Release_Static\bin\rga.exe" "[ZIPDIRRGA]\bin\rga.exe*"
-    XCopy "[OUTPUT_PATH]\Release_Static\bin\[ARCH]\VirtualContext.exe" "[ZIPDIRRGA]\bin\[ARCH]\VirtualContext.exe*"
-    XCopy "[OUTPUT_PATH]\Release_Static\bin\[ARCH]\amdspv.exe" "[ZIPDIRRGA]\bin\[ARCH]\amdspv.exe*"
-    XCopy "[OUTPUT_PATH]\Release_Static\bin\[ARCH]\spvgen.dll" "[ZIPDIRRGA]\bin\[ARCH]\spvgen.dll*"
-    XCopy "[OUTPUT_PATH]\Release_Static\bin\[ARCH]\shae.exe" "[ZIPDIRRGA]\bin\[ARCH]\shae.exe*"
-	XCopy "[OUTPUT_PATH]\Release_Static\bin\[ARCH]\RGADX11.exe" "[ZIPDIRRGA]\bin\[ARCH]\RGADX11.exe*"
+    XCopy "[OUTPUT_PATH]\[ARCH]\bin\[OUTPUT_BLD_DIR]\rga.exe" "[ZIPDIRRGA]\bin\rga.exe*"
+    XCopy "[OUTPUT_PATH]\[ARCH]\bin\[OUTPUT_BLD_DIR]\[ARCH]\VirtualContext.exe" "[ZIPDIRRGA]\bin\[ARCH]\VirtualContext.exe*"
+    XCopy "[OUTPUT_PATH]\[ARCH]\bin\[OUTPUT_BLD_DIR]\[ARCH]\amdspv.exe" "[ZIPDIRRGA]\bin\[ARCH]\amdspv.exe*"
+    XCopy "[OUTPUT_PATH]\[ARCH]\bin\[OUTPUT_BLD_DIR]\[ARCH]\spvgen.dll" "[ZIPDIRRGA]\bin\[ARCH]\spvgen.dll*"
+    XCopy "[OUTPUT_PATH]\[ARCH]\bin\[OUTPUT_BLD_DIR]\[ARCH]\shae.exe" "[ZIPDIRRGA]\bin\[ARCH]\shae.exe*"
+    XCopy "[OUTPUT_PATH]\[ARCH]\bin\[OUTPUT_BLD_DIR]\[ARCH]\RGADX11.exe" "[ZIPDIRRGA]\bin\[ARCH]\RGADX11.exe*"
+    XCopy /e "[OUTPUT_PATH]\[ARCH]\bin\[OUTPUT_BLD_DIR]\[ARCH]\ROCm" "[ZIPDIRRGA]\bin\[ARCH]\ROCm\"
+
+    // Copy the system d3d compiler
     XCopy "C:\Program Files (x86)\Windows Kits\10\bin\[ARCH]\d3dcompiler_47.dll" "[ZIPDIRRGA]\bin\[ARCH]\d3dcompiler_47.dll*"
+
     // Copy the VC++ Redistributable package binaries
     XCopy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\[ARCH]\Microsoft.VC140.CRT\concrt140.dll" "[ZIPDIRRGA]\bin\concrt140.dll*"
     XCopy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\[ARCH]\Microsoft.VC140.CRT\msvcp140.dll" "[ZIPDIRRGA]\bin\msvcp140.dll*"
     XCopy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\[ARCH]\Microsoft.VC140.CRT\vccorlib140.dll" "[ZIPDIRRGA]\bin\vccorlib140.dll*"
     XCopy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\[ARCH]\Microsoft.VC140.CRT\vcruntime140.dll" "[ZIPDIRRGA]\bin\vcruntime140.dll*"
-    Zip "[BUILDPATH]\[ARCHIVE_NAME].[BUILD]_[DATE].zip"                  "[ZIPDIRRGA]\bin"
+    Zip "[BUILDPATH]\[ARCHIVE_NAME].[BUILD]_[DATE].zip"                  "[ZIPDIRRGA]\bin"

Build/JenkinsMSBuildClean.bat

@@ -1,8 +1,15 @@
-REM Clean all configurations of RGA builds
+REM Clean specified RGA project or solution configuration
 REM Usage:
-REM   .\JenkinsMSBuildClean.bat
+REM   OUTPUT_PATH defined by parent script, WindowsBuild.bat
+REM   cd <workspace>\RGA\Build
+REM   .\JenkinsMSBuildClean.bat <solution-path> <platform> <configuration>
+set SOLUTION_PATH=%1
+set ARCH=%2
+set CONFIG=%3
+
+msbuild /m:6 /t:Clean /p:Configuration=%CONFIG% /p:Platform=%ARCH% /p:OutputPath=%OUTPUT_PATH% %SOLUTION_PATH%
+if not %ERRORLEVEL%==0 (
+    echo Clean of solution %SOLUTION_PATH% failed!
+    exit 1
+)
 
-msbuild /m:6 /t:Clean /p:Configuration=Debug_Static /p:Platform=x86 .\VS2015\RadeonGPUAnalyzer.sln
-msbuild /m:6 /t:Clean /p:Configuration=Debug_Static /p:Platform=x64 .\VS2015\RadeonGPUAnalyzer.sln
-msbuild /m:6 /t:Clean /p:Configuration=Release_Static /p:Platform=x86 .\VS2015\RadeonGPUAnalyzer.sln
-msbuild /m:6 /t:Clean /p:Configuration=Release_Static /p:Platform=x64 .\VS2015\RadeonGPUAnalyzer.sln

Build/JenkinsMSBuildClean_gui.bat

@@ -0,0 +1,20 @@
+REM Clean all configurations of RGA builds
+REM Usage:
+REM   .\JenkinsMSBuildClean.bat
+
+msbuild /m:6 /t:Clean /p:Configuration=Debug /p:Platform=x86 .\CMake\VS2015\RGA.sln
+if not %ERRORLEVEL%==0 (
+    echo Clean of Debug x86 failed for RGA.sln
+)
+msbuild /m:6 /t:Clean /p:Configuration=Debug /p:Platform=x64 .\CMake\VS2015\RGA.sln
+if not %ERRORLEVEL%==0 (
+    echo Clean of Debug x64 failed for RGA.sln
+)
+msbuild /m:6 /t:Clean /p:Configuration=Release /p:Platform=x86 .\CMake\VS2015\RGA.sln
+if not %ERRORLEVEL%==0 (
+    echo Clean of Release x86 failed for RGA.sln
+)
+msbuild /m:6 /t:Clean /p:Configuration=Release /p:Platform=x64 .\CMake\VS2015\RGA.sln
+if not %ERRORLEVEL%==0 (
+    echo Clean of Release x64 failed for RGA.sln
+)

Build/JenkinsMSBuildDebug.bat

@@ -0,0 +1,15 @@
+REM Debug Builds
+REM Usage:
+REM   OUTPUT_PATH set by WindowsBuild.bat
+REM   cd <workspace>\RGA\Build
+REM   .\JenkinsMSBuildDebug.bat <solution-path> <platform>
+REM       <platform>    x86 or x64
+
+set SOLUTION_PATH=%1
+set ARCH=%2
+msbuild /m:6 /t:Rebuild /p:Configuration=Debug /p:Platform=%ARCH%  /p:OutputPath=%OUTPUT_PATH% %SOLUTION_PATH%
+if not %ERRORLEVEL%==0 (
+    echo Debug build of solution %SOLUTION_PATH% failed!
+    exit 1
+)
+

Build/JenkinsMSBuildDebug_gui.bat

@@ -0,0 +1,12 @@
+REM Debug Builds
+REM Usage:
+REM   cd <workspace>\RGA\Build
+REM   .\JenkinsMSBuildDebug.bat <platform>
+REM       <platform>    x86 or x64
+
+set ARCH=%1
+msbuild /m:6 /t:Build /p:Configuration=Debug /p:Platform=%ARCH%  /p:OutputPath= ..\output .\CMake\VS2015\RGA.sln
+if not %ERRORLEVEL%==0 (
+    echo Build of Debug %ARCH% for RGA.sln failed
+    exit 1
+)

Build/JenkinsMSBuildRelease.bat

@@ -0,0 +1,16 @@
+REM Release Builds
+REM Usage:
+REM   OUTPUT_PATH set by WindowsBuild.bat
+REM   cd <workspace>\RGA\Build
+REM   .\JenkinsMSBuildRelease.bat <solution-path> <platform>
+REM      <platform>        x86 or x64
+
+set SOLUTION_PATH=%1
+set ARCH=%2
+
+msbuild /m:6 /t:Rebuild /p:Configuration=Release /p:Platform=%ARCH% /p:OutputPath=%OUTPUT_PATH% %SOLUTION_PATH%
+if not %ERRORLEVEL%==0 (
+    echo Release build of solution %SOLUTION_PATH% failed!
+    exit 1
+
+)

Build/JenkinsMSBuildRelease_gui.bat

@@ -0,0 +1,13 @@
+REM Release Builds
+REM Usage:
+REM   .\JenkinsMSBuildRelease.bat <platform>
+REM      <platform>        x86 or x64
+
+set ARCH=%1
+
+msbuild /m:6 /t:Build /p:Configuration=Release /p:Platform=%ARCH% /p:OutputPath=..\output .\CMake\VS2015\RGA.sln
+if not %ERRORLEVEL%==0 (
+    echo Build of Release %ARCH% failed for RGA.sln
+    exit 1
+)
+