AGS 5.4.2

GPUOpen-LibrariesAndSDKs · Aug 24, 2020 · 4c48321 · 4c48321
1 parent 4287d98
commit 4c48321
Show file tree

Hide file tree

Showing 20 changed files with 32 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,9 @@ In addition to the library itself, the AGS SDK includes several samples to demon
   <a href="https://github.com/GPUOpen-LibrariesAndSDKs/AGS_SDK/releases/latest/"><img src="http://gpuopen-librariesandsdks.github.io/media/latest-release-button.svg" alt="Latest release" title="Latest release"></a>
 </div>
 
+### What's new in AGS 5.4.2
+Version 5.4.2 reinstates the sharedMemoryInBytes field which is required when calculating the memory available on APUs.
+
 ### What's new in AGS 5.4.1
 Version 5.4.1 includes x86 libs and Visual Studio 2019 support.  There is also support for base vertex and base instance intrinsics as well as GetWaveSize intrinsics.  The samples have been ported from premake to cmake.
 

diff --git a/ags_lib/doc/amd_ags.chm b/ags_lib/doc/amd_ags.chm
diff --git a/ags_lib/inc/amd_ags.h b/ags_lib/inc/amd_ags.h
@@ -34,6 +34,13 @@
 /// \endinternal
 ///
 /// ---------------------------------------
+/// What's new in AGS 5.4.2 since version 5.4.1
+/// ---------------------------------------
+/// AGS 5.4.2 includes the following updates:
+/// * sharedMemoryInBytes has been reinstated.
+/// * Clock speed returned for APUs.
+///
+/// ---------------------------------------
 /// What's new in AGS 5.4.1 since version 5.4.0
 /// ---------------------------------------
 /// AGS 5.4.1 includes the following updates:
@@ -85,7 +92,7 @@
 
 #define AMD_AGS_VERSION_MAJOR 5             ///< AGS major version
 #define AMD_AGS_VERSION_MINOR 4             ///< AGS minor version
-#define AMD_AGS_VERSION_PATCH 1             ///< AGS patch version
+#define AMD_AGS_VERSION_PATCH 2             ///< AGS patch version
 
 #ifdef __cplusplus
 extern "C" {
@@ -336,7 +343,9 @@ struct AGSDeviceInfo
     float                           teraFlops;                      ///< Teraflops of GPU. Zero if not GCN onwards. Calculated from iCoreClock * iNumCUs * 64 Pixels/clk * 2 instructions/MAD
 
     int                             isPrimaryDevice;                ///< Whether or not this is the primary adapter in the system. Not set on the WACK version.
-    long long                       localMemoryInBytes;             ///< The size of local memory in bytes. 0 for non AMD hardware.
+    unsigned long long              localMemoryInBytes;             ///< The size of local memory in bytes. 0 for non AMD hardware.
+    unsigned long long              sharedMemoryInBytes;            ///< The size of system memory available to the GPU in bytes.  It is important to factor this into your VRAM budget for APUs
+                                                                    ///< as the reported local memory will only be a small fraction of the total memory available to the GPU.
 
     int                             numDisplays;                    ///< The number of active displays found to be attached to this adapter.
     AGSDisplayInfo*                 displays;                       ///< List of displays allocated by AGS to be numDisplays in length.

diff --git a/ags_lib/lib/amd_ags_x64.dll b/ags_lib/lib/amd_ags_x64.dll
diff --git a/ags_lib/lib/amd_ags_x64_2019_MD.lib b/ags_lib/lib/amd_ags_x64_2019_MD.lib
diff --git a/ags_lib/lib/amd_ags_x64_2019_MDd.lib b/ags_lib/lib/amd_ags_x64_2019_MDd.lib
diff --git a/ags_lib/lib/amd_ags_x64_2019_MT.lib b/ags_lib/lib/amd_ags_x64_2019_MT.lib
diff --git a/ags_lib/lib/amd_ags_x64_2019_MTd.lib b/ags_lib/lib/amd_ags_x64_2019_MTd.lib
diff --git a/ags_lib/lib/amd_ags_x86.dll b/ags_lib/lib/amd_ags_x86.dll
diff --git a/ags_lib/lib/amd_ags_x86_2019_MD.lib b/ags_lib/lib/amd_ags_x86_2019_MD.lib
diff --git a/ags_lib/lib/amd_ags_x86_2019_MDd.lib b/ags_lib/lib/amd_ags_x86_2019_MDd.lib
diff --git a/ags_lib/lib/amd_ags_x86_2019_MT.lib b/ags_lib/lib/amd_ags_x86_2019_MT.lib
diff --git a/ags_lib/lib/amd_ags_x86_2019_MTd.lib b/ags_lib/lib/amd_ags_x86_2019_MTd.lib
diff --git a/ags_sample/CMakeLists.txt b/ags_sample/CMakeLists.txt
@@ -3,9 +3,9 @@ set(CMAKE_GENERATOR_PLATFORM x64)
 set(CMAKE_CONFIGURATION_TYPES Debug Release)
 
 if(AGS_INTERNAL_DEBUG)
-project(ags_sample_internal VERSION 5.4.1)
+project(ags_sample_internal VERSION 5.4.2)
 else()
-project(ags_sample VERSION 5.4.1)
+project(ags_sample VERSION 5.4.2)
 endif()
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)

diff --git a/ags_sample/build/GenerateSolutions.bat b/ags_sample/build/GenerateSolutions.bat
@@ -0,0 +1,4 @@
+mkdir VS2019
+cd VS2019
+cmake ..\.. -G "Visual Studio 16 2019" -A x64
+cd ..
diff --git a/ags_sample/src/AGSSample.cpp b/ags_sample/src/AGSSample.cpp
@@ -78,10 +78,10 @@ void PrintDisplayInfo( const AGSGPUInfo& gpuInfo )
                 sprintf_s( wgpInfo, ", %d WGPs", device.numWGPs );
             }
 
-            printf( "Architecture: %s, %d CUs%s, %d ROPs\n", asicFamily[ device.asicFamily ], device.numCUs, wgpInfo, device.numROPs );
+            printf( "Architecture: %s, %s%d CUs%s, %d ROPs\n", asicFamily[ device.asicFamily ], device.isAPU ? "(APU), " : "", device.numCUs, wgpInfo, device.numROPs );
             printf( "    core clock %d MHz, memory clock %d MHz\n", device.coreClock, device.memoryClock );
             printf( "    %.1f Tflops\n", device.teraFlops );
-            printf( "local memory: %d MBs (%.1f GB/s)\n\n", (int)( device.localMemoryInBytes / ( 1024 * 1024 ) ), (float)device.memoryBandwidth / 1024.0f );
+            printf( "local memory: %d MBs (%.1f GB/s), shared memory: %d MBs\n\n", (int)( device.localMemoryInBytes / ( 1024 * 1024 ) ), (float)device.memoryBandwidth / 1024.0f, (int)( device.sharedMemoryInBytes / ( 1024 * 1024 ) ) );
         }
 
         printf( "\n" );

diff --git a/crossfire_sample/CMakeLists.txt b/crossfire_sample/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15)
 set(CMAKE_GENERATOR_PLATFORM x64)
 set(CMAKE_CONFIGURATION_TYPES Debug Release)
 
-project(crossfire_sample VERSION 5.4.1)
+project(crossfire_sample VERSION 5.4.2)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})

diff --git a/crossfire_sample/build/GenerateSolutions.bat b/crossfire_sample/build/GenerateSolutions.bat
@@ -0,0 +1,4 @@
+mkdir VS2019
+cd VS2019
+cmake ..\.. -G "Visual Studio 16 2019" -A x64
+cd ..
diff --git a/eyefinity_sample/CMakeLists.txt b/eyefinity_sample/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15)
 set(CMAKE_GENERATOR_PLATFORM x64)
 set(CMAKE_CONFIGURATION_TYPES Debug Release)
 
-project(eyefinity_sample VERSION 5.4.1)
+project(eyefinity_sample VERSION 5.4.2)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})

diff --git a/eyefinity_sample/build/GenerateSolutions.bat b/eyefinity_sample/build/GenerateSolutions.bat
@@ -0,0 +1,4 @@
+mkdir VS2019
+cd VS2019
+cmake ..\.. -G "Visual Studio 16 2019" -A x64
+cd ..