Skip to content

Commit

Permalink
Updates for 2.4 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
AmitBM committed Nov 30, 2020
1 parent dab9f35 commit 537c895
Show file tree
Hide file tree
Showing 433 changed files with 65,389 additions and 47,691 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,9 @@ Build/Linux
Output
.vscode
Output_Test
*.vs
BuildOutput
Documentation/build
*.csproj.user
obj
bin
6 changes: 3 additions & 3 deletions Build/FetchDependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,16 @@
"common-src-AMDTOSWrappers.git" : ["Common/Src/AMDTOSWrappers", "6a5293d6a4f00c70747f935a4122a1b986129396"],
"common-src-AMDTMutex.git" : ["Common/Src/AMDTMutex", "master"],
"common-src-CElf.git" : ["Common/Src/CElf", "master"],
ghRoot + "common-src-DeviceInfo.git" : ["Common/Src/DeviceInfo", "master"],
"common-src-DeviceInfo.git" : ["Common/Src/DeviceInfo", "master"],
"common-src-DynamicLibraryModule.git" : ["Common/Src/DynamicLibraryModule", "master"],
"common-src-TSingleton.git" : ["Common/Src/TSingleton", "master"],
"common-src-VersionInfo.git" : ["Common/Src/VersionInfo", "master"],
"common-src-Vsprops.git" : ["Common/Src/Vsprops", "master"],
"common-src-Miniz.git" : ["Common/Src/Miniz", "master"],
"common-src-Misc.git" : ["Common/Src/Misc", "master"],
"UpdateCheckAPI.git" : ["Common/Src/UpdateCheckAPI", "master"],
"UpdateCheckAPI.git" : ["Common/Src/UpdateCheckAPI", "amd-1.1.0"],
# QtCommon.
"QtCommon" : ["QtCommon", "rga-2.3"]
"QtCommon" : ["QtCommon", "rga-2.4"]
}

# The following section contains OS-specific dependencies that are downloaded and placed in the specified target directory.
Expand Down
14 changes: 10 additions & 4 deletions Build/Prebuild.bat
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,21 @@ goto :begin
echo Error: Unexpected argument: %1%. Aborting...
exit /b 1

:start_cmake
:start_cmake
set CMAKE_VSARCH=
if "%VS_VER%"=="2015" (
set CMAKE_VS="Visual Studio 14 2015 Win64"
) else (
if "%VS_VER%"=="2017" (
set CMAKE_VS="Visual Studio 15 2017 Win64"
) else (
echo Error: Unknows VisualStudio version provided. Aborting...
exit /b 1
if "%VS_VER%"=="2019" (
set CMAKE_VS="Visual Studio 16 2019"
set CMAKE_VSARCH=-A x64
) else (
echo Error: Unknows VisualStudio version provided. Aborting...
exit /b 1
)
)
)

Expand Down Expand Up @@ -179,7 +185,7 @@ rem Invoke cmake with required arguments.
echo:
echo Running cmake to generate a VisualStudio solution...
cd %OUTPUT_FOLDER%
%CMAKE_PATH% -G %CMAKE_VS% %CMAKE_QT% %CMAKE_VK_INCLUDE% %CMAKE_VK_LIB% %CLI_ONLY% %GUI_ONLY% %NO_VULKAN% %AUTOMATION% %AMD_INTERNAL% ..\..\..
%CMAKE_PATH% -G %CMAKE_VS% %CMAKE_VSARCH% %CMAKE_QT% %CMAKE_VK_INCLUDE% %CMAKE_VK_LIB% %CLI_ONLY% %GUI_ONLY% %NO_VULKAN% %AUTOMATION% %AMD_INTERNAL% ..\..\..
if not %ERRORLEVEL%==0 (
echo "ERROR: cmake failed. Aborting..."
exit /b 1
Expand Down
32 changes: 32 additions & 0 deletions Build/Util/Linux/RadeonGPUAnalyzer
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#!/bin/bash

# ----------------------------------------------------------------------------------------------------------------------------------
# This script launches the rga GUI executable after configuring the environment.
# (c) 2017-2020 Advanced Micro Devices Inc. All Rights Reserved.
# ----------------------------------------------------------------------------------------------------------------------------------

if echo "$0" | grep '^/' ; then
thisScriptFullPath="$0"
else
thisScriptFullPath=`pwd`/$0
fi

# Use the amdgpu-pro driver Vulkan ICD files
if [ -d /opt/amdgpu-pro/etc/vulkan/icd.d ]
then
export VK_ICD_FILENAMES=/opt/amdgpu-pro/etc/vulkan/icd.d/amd_icd64.json
fi

RGA_GUI_BIN_PATH=`dirname "$thisScriptFullPath"`

# Add RGA's bin and lib directories to LD_LIBRARY_PATH:
export LD_LIBRARY_PATH="$RGA_GUI_BIN_PATH":"$RGA_GUI_BIN_PATH/lib":"$RGA_BIN_PATH/utils":$LD_LIBRARY_PATH

# Add RGA/utils folder to PATH:
export PATH="$RGA_GUI_BIN_PATH":"$RGA_GUI_BIN_PATH/utils":$PATH

# Set path to the Qt platform plugin.
export QT_QPA_PLATFORM_PLUGIN_PATH="$RGA_GUI_BIN_PATH/lib/platforms"

# Call RGA GUI executable
"$RGA_GUI_BIN_PATH"/RadeonGPUAnalyzer-bin "$@"
23 changes: 0 additions & 23 deletions Build/Util/Linux/RadeonGPUAnalyzerGUI

This file was deleted.

74 changes: 43 additions & 31 deletions Build/Util/Linux/copy_post_build_cli.sh
Original file line number Diff line number Diff line change
@@ -1,74 +1,83 @@
#!bash
OUTPUT_DIR=$1

set -e
if [ "$2" = "-internal" ]; then
INTERNAL=true
fi

set -x

X64_DIR=$OUTPUT_DIR/utils

# Get the build version string
export MAJOR=`python3 ../../../Build/Util/get_version.py --major`
export MINOR=`python3 ../../../Build/Util/get_version.py --minor`

# Copy the Vulkan offline backend.
cp ../../../Core/VulkanOffline/lnx64/* $OUTPUT_DIR/
chmod +x $OUTPUT_DIR/amdspv
chmod +x $OUTPUT_DIR/spvgen.so
if [ ! -d "$X64_DIR" ]; then
mkdir -p $X64_DIR
fi
cp ../../../Core/VulkanOffline/lnx64/* $X64_DIR/
chmod +x $X64_DIR/amdspv
chmod +x $X64_DIR/spvgen.so

# Copy the OpenGL backend.
cp ../../../Core/OpenGL/VirtualContext/Release/lnx64/VirtualContext $OUTPUT_DIR/
chmod +x $OUTPUT_DIR/VirtualContext
cp ../../../Core/OpenGL/VirtualContext/Release/lnx64/VirtualContext $X64_DIR/
chmod +x $X64_DIR/VirtualContext

# Copy the LC Compiler.
if [ ! -d "$OUTPUT_DIR/LC" ]; then
mkdir $OUTPUT_DIR/LC
if [ ! -d "$X64_DIR/LC" ]; then
mkdir -p $X64_DIR/LC
fi
cp -rf ../../../Core/LC/OpenCL/linux $OUTPUT_DIR/LC/OpenCL
cp -f ../../../Core/LC/OpenCL/additional-targets $OUTPUT_DIR/LC/OpenCL/
cp -rf ../../../Core/LC/OpenCL/linux $X64_DIR/LC/OpenCL
cp -f ../../../Core/LC/OpenCL/additional-targets $X64_DIR/LC/OpenCL/

# Copy the LC disassembler.
if [ ! -d "$OUTPUT_DIR/LC/Disassembler" ]; then
mkdir $OUTPUT_DIR/LC/Disassembler
if [ ! -d "$X64_DIR/LC/Disassembler" ]; then
mkdir $X64_DIR/LC/Disassembler
fi
cp ../../../Core/LC/Disassembler/Linux/amdgpu-dis $OUTPUT_DIR/LC/Disassembler
cp ../../../Core/LC/Disassembler/Linux/amdgpu-dis $X64_DIR/LC/Disassembler

# make sure LC/OpenCL/bin/clang is link to clang-7
CURDIR=`pwd`
rm -f $OUTPUT_DIR/LC/OpenCL/bin/clang
cd $OUTPUT_DIR/LC/OpenCL/bin/
rm -f $X64_DIR/LC/OpenCL/bin/clang
cd $X64_DIR/LC/OpenCL/bin/
ln -s clang-7 clang
cd $CURDIR
chmod +x $OUTPUT_DIR/LC/OpenCL/bin/l* $OUTPUT_DIR/LC/OpenCL/bin/clang*
chmod +x $OUTPUT_DIR/LC/OpenCL/lib/bitcode/*.bc
chmod +x $X64_DIR/LC/OpenCL/bin/l* $X64_DIR/LC/OpenCL/bin/clang*
chmod +x $X64_DIR/LC/OpenCL/lib/bitcode/*.bc

# Copy the static analysis backend.
if [ "$INTERNAL" = true ]; then
cp ../../../../RGA-Internal/Core/ShaderAnalysis/Linux/x64/shae-internal $OUTPUT_DIR/
chmod +x $OUTPUT_DIR/shae-internal
if [ -e $OUTPUT_DIR/shae ]; then
cp ../../../../RGA-Internal/core/shader_analysis/linux/x64/shae-internal $X64_DIR/
chmod +x $X64_DIR/shae-internal
if [ -e $X64_DIR/shae ]; then
rm bin/shae
fi
if [ -e $OUTPUT_DIR/rga-bin ]; then
rm $OUTPUT_DIR/rga-bin
fi
else
cp ../../../Core/ShaderAnalysis/Linux/x64/shae $OUTPUT_DIR/
chmod +x $OUTPUT_DIR/shae
if [ -e b$OUTPUT_DIR/shae-internal ]; then
rm $OUTPUT_DIR/shae-internal
cp ../../../Core/ShaderAnalysis/Linux/x64/shae $X64_DIR/
chmod +x $X64_DIR/shae
if [ -e b$X64_DIR/shae-internal ]; then
rm $X64_DIR/shae-internal
fi
if [ -e $OUTPUT_DIR/rga-bin-internal ]; then
rm $OUTPUT_DIR/rga-bin-internal
fi
fi

# Copy the Vulkan tools.
if [ ! -d "$OUTPUT_DIR/Vulkan" ]; then
mkdir $OUTPUT_DIR/Vulkan
if [ ! -d "$X64_DIR/Vulkan" ]; then
mkdir -p $X64_DIR/Vulkan
fi
cp ../../../Core/Vulkan/tools/Lnx64/bin/* "$OUTPUT_DIR/Vulkan/"
chmod +x $OUTPUT_DIR/Vulkan/*
cp ../../../Core/Vulkan/tools/Lnx64/bin/* "$X64_DIR/Vulkan/"
chmod +x $X64_DIR/Vulkan/*

# Copy the AMDToolsDownloader.
cp ../../../../Common/Src/UpdateCheckAPI/AMDToolsDownloader/Linux/AMDToolsDownloader $OUTPUT_DIR/
chmod +x $OUTPUT_DIR/AMDToolsDownloader
# Copy the Radeon Tools Download Assistant.
cp ../../../../Common/Src/UpdateCheckAPI/rtda/linux/rtda $OUTPUT_DIR/
chmod +x $OUTPUT_DIR/rtda

# Copy the launch script.
cp ./rga $OUTPUT_DIR/
Expand All @@ -78,3 +87,6 @@ chmod +x $OUTPUT_DIR/rga
cp ../../../License.txt $OUTPUT_DIR/
cp ../../../RGAThirdPartyLicenses.txt $OUTPUT_DIR/

# Copy README.md and Release notes
cp ../../../README.md $OUTPUT_DIR/
cp ../../../Documentation/releases/$MAJOR.$MINOR/RGA_RELEASE_NOTES_v$MAJOR.$MINOR.txt $OUTPUT_DIR/
50 changes: 22 additions & 28 deletions Build/Util/Linux/copy_post_build_gui.sh
Original file line number Diff line number Diff line change
@@ -1,48 +1,42 @@

set -e
OUTPUT_DIR=$1
QT_LIB_DIR=$2
QT_PLUGINS_DIR=$3
AUTOMATION=$4

# Copy the Qt5 dynamic libs
if [ -n "$QT_LIB_DIR" ]; then
if [ ! -d "$OUTPUT_DIR/Qt" ]; then
mkdir $OUTPUT_DIR/Qt
fi
if [ ! -d "$OUTPUT_DIR/Qt/platforms" ]; then
mkdir $OUTPUT_DIR/Qt/platforms
fi
if [ ! -d "$OUTPUT_DIR/Qt/platforms/imageformats" ]; then
mkdir $OUTPUT_DIR/Qt/platforms/imageformats
if [ ! -d "$OUTPUT_DIR/lib/platforms/imageformats" ]; then
mkdir -p $OUTPUT_DIR/lib/platforms/imageformats
fi
cp -d $QT_LIB_DIR/libQt5Core.so* $OUTPUT_DIR/Qt/
cp -d $QT_LIB_DIR/libQt5DBus.so* $OUTPUT_DIR/Qt/
cp -d $QT_LIB_DIR/libQt5Gui.so* $OUTPUT_DIR/Qt/
cp -d $QT_LIB_DIR/libQt5Widgets.so* $OUTPUT_DIR/Qt/
cp -d $QT_LIB_DIR/libQt5XcbQpa.so* $OUTPUT_DIR/Qt/
cp -d $QT_LIB_DIR/libicui18n.so* $OUTPUT_DIR/Qt/
cp -d $QT_LIB_DIR/libicudata.so* $OUTPUT_DIR/Qt/
cp -d $QT_LIB_DIR/libicuuc.so* $OUTPUT_DIR/Qt/
cp -d $QT_LIB_DIR/libQt5Svg.so.* $OUTPUT_DIR/Qt/
cp -d $QT_PLUGINS_DIR/imageformats/libqsvg.so $OUTPUT_DIR/Qt/platforms/imageformats
cp -d $QT_PLUGINS_DIR/platforms/libqxcb.so $OUTPUT_DIR/Qt/platforms
cp $QT_LIB_DIR/libQt5Core.so.5 $OUTPUT_DIR/lib/
cp $QT_LIB_DIR/libQt5DBus.so.5 $OUTPUT_DIR/lib/
cp $QT_LIB_DIR/libQt5Gui.so.5 $OUTPUT_DIR/lib/
cp $QT_LIB_DIR/libQt5Widgets.so.5 $OUTPUT_DIR/lib/
cp $QT_LIB_DIR/libQt5XcbQpa.so.5 $OUTPUT_DIR/lib/
cp $QT_LIB_DIR/libicui18n.so.56 $OUTPUT_DIR/lib/
cp $QT_LIB_DIR/libicudata.so.56 $OUTPUT_DIR/lib/
cp $QT_LIB_DIR/libicuuc.so.56 $OUTPUT_DIR/lib/
cp $QT_LIB_DIR/libQt5Svg.so.5 $OUTPUT_DIR/lib/
cp $QT_PLUGINS_DIR/imageformats/libqsvg.so $OUTPUT_DIR/lib/platforms/imageformats/
cp $QT_PLUGINS_DIR/platforms/libqxcb.so $OUTPUT_DIR/lib/platforms/
if [ "$AUTOMATION" = "-automation" ]; then
cp -d $QT_LIB_DIR/libQt5Test.so* $OUTPUT_DIR/Qt/
cp $QT_LIB_DIR/libQt5Test.so.5 $OUTPUT_DIR/lib/
fi
fi

# Copy the GUI launch script.
cp ./RadeonGPUAnalyzerGUI $OUTPUT_DIR/
chmod +x $OUTPUT_DIR/RadeonGPUAnalyzerGUI
cp ./RadeonGPUAnalyzer $OUTPUT_DIR/
chmod +x $OUTPUT_DIR/RadeonGPUAnalyzer

# Copy the automation files/folders.
if [ "$AUTOMATION" = "-automation" ]; then
cp -rf ../../../../RGA-Internal/Tests/data $OUTPUT_DIR/
cp ../../../../RGA-Internal/Tests-GUI/run.py $OUTPUT_DIR/
cp -rf ../../../../RGA-Internal/tests/data $OUTPUT_DIR/
cp ../../../../RGA-Internal/tests_gui/run.py $OUTPUT_DIR/
chmod +x $OUTPUT_DIR/run.py
fi

# Copy the AMDToolsDownloader.
cp ../../../../Common/Src/UpdateCheckAPI/AMDToolsDownloader/Linux/AMDToolsDownloader $OUTPUT_DIR/
chmod +x $OUTPUT_DIR/AMDToolsDownloader
# Copy the Radeon Tools Download Assistant.
cp ../../../../Common/Src/UpdateCheckAPI/rtda/linux/rtda $OUTPUT_DIR/
chmod +x $OUTPUT_DIR/rtda

69 changes: 0 additions & 69 deletions Build/Util/Linux/jenkins_build_rga.sh

This file was deleted.

0 comments on commit 537c895

Please sign in to comment.