Updates for 2.6.1 release.

.gitignore

@@ -5,10 +5,13 @@ Output
 .vscode
 Output_Test
 *.vs
-buildOutput
+BuildOutput
 documentation/build
 *.csproj.user
 obj
 build/__pycache__
 external/code_sanitizer
 *.pyc
+*.msi
+RGA-Installer-cache
+source/common/vulkan_layer_launcher/RGALayerLauncher/bin

License.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2021 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2022 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

build/dependency_map.py

@@ -16,24 +16,25 @@
 
 # repositories.
 git_mapping = {
+    "device_info"                    : ["Common/Src/DeviceInfo",            "rga-v2.6.1"]
 }
 
 github_mapping = {
  # Lib.
-    "common-lib-amd-ADL"                  : ["Common/Lib/AMD/ADL",               "master"],
-    "common-lib-amd-APPSDK-3.0"           : ["Common/Lib/AMD/APPSDK",            "master"],
-    "common-lib-ext-Boost-1.59"           : ["Common/Lib/Ext/Boost",             "master"],
-    "common-lib-ext-WindowsKits"          : ["Common/Lib/Ext/Windows-Kits",      "master"],
-    "common-lib-ext-tinyxml2-5.0.1"       : ["Common/Lib/Ext/tinyxml2",          "master"],
-    "cxxopts"                             : ["Common/Lib/Ext/cxxopts",           "master"],
-    "volk"                                : ["Common/Lib/Ext/volk",              "master"],
+    "adl"                            : ["Common/Lib/AMD/ADL",               "master"],
+    "appsdk"                         : ["Common/Lib/AMD/APPSDK",            "master"],
+    "common_lib_ext_boost_1.59"      : ["Common/Lib/Ext/Boost",             "master"],
+    "windows_kits"                   : ["Common/Lib/Ext/Windows-Kits",      "master"],
+    "common_lib_ext_tinyxml2_5.0.1"  : ["Common/Lib/Ext/tinyxml2",          "master"],
+    "cxxopts"                        : ["Common/Lib/Ext/cxxopts",           "master"],
+    "volk"                           : ["Common/Lib/Ext/volk",              "master"],
  # Src.
-    "common-src-ADLUtil"                  : ["Common/Src/ADLUtil",               "master"],
-    "common-src-DynamicLibraryModule"     : ["Common/Src/DynamicLibraryModule",  "master"],
-    "common-src-TSingleton"               : ["Common/Src/TSingleton",            "master"],
-    "common-src-Miniz"                    : ["Common/Src/Miniz",                 "master"],
-    "update_check_api"                    : ["Common/Src/update_check_api",      "v2.0.0"],
-    "common-src-DeviceInfo"               : ["Common/Src/DeviceInfo",            "rga-v2.6"],
+    "adl_util"                       : ["Common/Src/ADLUtil",               "master"],
+    "dynamic_library_module"         : ["Common/Src/DynamicLibraryModule",  "master"],
+    "tsingleton"                     : ["Common/Src/TSingleton",            "master"],
+    "common_src_miniz"               : ["Common/Src/Miniz",                 "master"],
+    "update_check_api"               : ["Common/Src/update_check_api",      "v2.0.0"],
  # QtCommon.
-    "QtCommon"                            : ["QtCommon",                         "rga-2.5"],
+    "qt_common"                      : ["QtCommon",                         "rga-2.5"],
 }
+

build/fetch_dependencies.py

@@ -56,8 +56,8 @@
     print("Error: Unable to determine origin for RGA git project")
     exit(1)
 
-# Temporary while repositories are on gerrit and github.amd.com.  This is used to clone DeviceInfo repo.
-gerrit_root = "ssh://gerritgit/DevTools/ec/"
+# Temporary for development during server migration.
+gerrit_root = "git@github.amd.com:Developer-Solutions/"
 
 
 def parse_arguments():
@@ -197,6 +197,7 @@ def do_clone(repo_git_path, repo_target, repo_branch):
 
 
 def fetch_git_map(arguments, git_branch):
+    print("\nFetching dependencies from: " + gerrit_root)
     for key in git_mapping:
         # Target path, relative to workspace
         path = git_mapping[key][0]
@@ -223,6 +224,7 @@ def fetch_git_map(arguments, git_branch):
 
 
 def fetch_github_map(arguments, git_branch):
+    print("\nFetching dependencies from: " + github_root)
     for key in github_mapping:
         # Target path, relative to workspace
         path = github_mapping[key][0]
@@ -272,14 +274,6 @@ def do_fetch_dependencies(arguments):
     if "github.com" in amd_github_url:
         git_branch = "master"
 
-    repo_origin = amd_github_root
-
-    # Temporary during transition from gerrit to github.amd.com
-    if "github.amd.com" in amd_github_root:
-        repo_origin = gerrit_root
-
-    print("\nFetching dependencies from: " + repo_origin + " - using branch: " + git_branch)
-
     # The following section contains OS-specific dependencies that are downloaded and placed in the specified target directory.
     # for each dependency - test if it has already been fetched - if not, then fetch it, otherwise update it to top of tree
     fetch_git_map(arguments, git_branch)

build/prebuild.bat

@@ -1,5 +1,5 @@
 @echo off
-:: prebuild.bat --vs 2017 --qt <path_to_qt>
+:: prebuild.bat --vs 2019 --qt <path_to_qt>
 
 SETLOCAL enabledelayedexpansion
 
@@ -21,7 +21,7 @@ echo:
 echo Options:
 echo    --no-fetch           Do not call fetch_dependencies.py script before running cmake. The default is "false".
 echo    --cmake              Path to cmake executable to use. If not specified, the cmake from PATH env variable will be used.
-echo    --vs                 Microsoft Visual Studio version. Currently supported values are: "2015", "2017". The default is "2017".
+echo    --vs                 Microsoft Visual Studio version. Currently supported values are: "2015", "2017", "2019", and "2022".
 echo    --qt                 Path to Qt5 root folder. The default is empty (cmake will look for Qt5 package istalled on the system).
 echo    --cli-only           Build RGA command-line tool only (do not build GUI). The default is "false".
 echo    --gui-only           Build GUI only (do not build RGA command-line tool). The default is "false".
@@ -30,6 +30,7 @@ echo                         This option is only valid in conjunction with --cli
 echo    --vk-include         Path to the Vulkan SDK include folder.
 echo    --vk-lib             Path to the Vulkan SDK library folder.
 echo    --cppcheck           Add "-DCMAKE_CXX_CPPCHECK" to cmake command
+echo    --clean              Delete the cmake build and output folders
 echo:
 echo Examples:
 echo    prebuild.bat
@@ -65,6 +66,7 @@ if "%1"=="--automation" goto :set_automation
 if "%1"=="--internal" goto :set_internal
 if "%1"=="--verbose" goto :set_verbose
 if "%1"=="--cppcheck" goto :set_cppcheck
+if "%1"=="--clean" goto :run_clean
 goto :bad_arg
 
 :set_cmake
@@ -121,6 +123,21 @@ goto :shift_arg
 set CPPCHECK=-DCMAKE_CXX_CPPCHECK="C:\Program Files\Cppcheck\cppcheck.exe"
 goto :shift_arg
 
+:run_clean
+if exist %SCRIPT_DIR%windows (
+    echo INFO: Deleting %SCRIPT_DIR%\windows folder
+    del /s /f /q %SCRIPT_DIR%\windows
+)
+if exist %SCRIPT_DIR%..\output (
+    echo INFO: Deleting %SCRIPT_DIR%..\output folder
+    del /s /f /q %SCRIPT_DIR%..\output
+)
+if exist %SCRIPT_DIR%..\output_test (
+    echo INFO: Deleting %SCRIPT_DIR%..\output_test folder
+    del /s /f /q %SCRIPT_DIR%..\output_test
+)
+exit /b 0
+
 :shift_2args
 rem Shift to the next pair of arguments
 shift
@@ -151,8 +168,13 @@ if "%VS_VER%"=="2015" (
             set CMAKE_VS="Visual Studio 16 2019"
             set CMAKE_VSARCH=-A x64
         ) else (
-            echo Error: Unknown VisualStudio version provided. Aborting...
-            exit /b 1
+            if "%VS_VER%"=="2022" (
+                set CMAKE_VS="Visual Studio 17 2022"
+                set CMAKE_VSARCH=-A x64
+            ) else (
+                echo Error: Unknown VisualStudio version provided. Aborting...
+                exit /b 1
+            )
         )
     )
 )

build/prebuild.sh

@@ -19,6 +19,7 @@ if [[ "$1" == "-h" ]] || [[ "$1" == "-help" ]] || [[ "$1" == "--h" ]] || [[ "$1"
     echo "   --vk-include         Path to the Vulkan SDK include folder."
     echo "   --vk-lib             Path to the Vulkan SDK library folder."
     echo "   --cppcheck           Add CMAKE_CXX_CPPCHECK preprocess option to cmake."
+    echo "   --clean              Delete cmake files and build output folders."
     echo ""
     echo "Examples:"
     echo "   prebuild.sh"
@@ -45,6 +46,10 @@ NO_VULKAN=
 TEST_DIR_SUFFIX=""
 CMAKE_CPPCHECK=
 
+CURRENT_DIR=$(pwd)
+SCRIPT_DIR=$(dirname "$0")
+OUTPUT_LINUX_DIR="$SCRIPT_DIR/linux"
+
 # Parse command line arguments
 args=("$@")
 for ((i=0; i<$#; i++)); do
@@ -83,12 +88,32 @@ for ((i=0; i<$#; i++)); do
         TEST_DIR_SUFFIX="_test"
     elif [ "$arg" == "--cppcheck" ]; then
         CMAKE_CPPCHECK="-DCMAKE_CXX_CPPCHECK=cppcheck"
+    elif [ "$arg" == "--clean" ]; then
+        if [ -d "$OUTPUT_LINUX_DIR" ]; then
+            echo "INFO: Deleting $OUTPUT_LINUX_DIR"
+            rm -rf "$OUTPUT_LINUX_DIR"
+        fi
+        if [ -d "$SCRIPT_DIR/../build_output" ]; then
+            echo "INFO: Deleting $SCRIPT_DIR/../build_output"
+            rm -rf "$SCRIPT_DIR/../build_output"
+        fi
+        if [ -d "$SCRIPT_DIR/../output" ]; then
+            echo "INFO: Deleting $SCRIPT_DIR/../output"
+            rm -rf "$SCRIPT_DIR/../output"
+        fi
+        if [ -d "$SCRIPT_DIR/../output_test" ]; then
+            echo "INFO: Deleting $SCRIPT_DIR/../output_test"
+            rm -rf "$SCRIPT_DIR/../output_test"
+        fi
+        exit 0
     else
         echo "Unexpected argument: $arg. Aborting...";
         exit 1
     fi
 done
 
+OUTPUT_DIR="$OUTPUT_LINUX_DIR/make$TEST_DIR_SUFFIX"
+
 if [ "$NO_VULKAN" == "-DRGA_ENABLE_VULKAN=OFF" ]; then
     if [ ! "$CLI_ONLY" == "-DBUILD_CLI_ONLY=ON" ]; then
         echo "ERROR: Invalid syntax: must use --cli-only with --no-vulkan"
@@ -108,11 +133,6 @@ if [ -n "$VULKAN_LIB_DIR" ]; then
     CMAKE_VK_LIB="-DVULKAN_SDK_LIB_DIR=$VULKAN_LIB_DIR"
 fi
 
-CURRENT_DIR=$(pwd)
-SCRIPT_DIR=$(dirname "$0")
-OUTPUT_LINUX_DIR="$SCRIPT_DIR/linux"
-OUTPUT_DIR="$OUTPUT_LINUX_DIR/make$TEST_DIR_SUFFIX"
-
 # Create output folder
 if [ ! -d "$OUTPUT_LINUX_DIR" ]; then
     mkdir $OUTPUT_LINUX_DIR