Update pal from commit: 59416f33

* Add ReadSetting cross-platform wrapper
* Correct RereadSetting name
* dEQP-VK.dynamic_rendering.*cmdbuffer* - failing on Linux
* Incorrect CPU logical cores shown in the RGP Device Configuration
* WriteBufferImmediate  CP copydata top: ME->PFP and Cleanup
* Implementation of device info trace source
* Add option to open shared memory with globalGpuVa
* [Streaming SDK 1.5] Pass frame index from the app to KMD
* Debug logging support in PAL
* Fixup Linux ArchiveFile implementation
* Adjust default tessFactorBufferSizePerSe
* Tweak Shader Cache Hash Map settings to reduce memory usage
* StringView class implementation
*  Hook up memory budget value in PAL to SW addrlib
* Add ICmdBuffer::CmdCopyMemoryByGpuVa
* Fix settings script
* PAL_NOT_IMPLEMENTED Assert triggers with MGPU
* Fix for SPM regr
* Remove pointless cache layer alerts
* Null device dummy values for swizzling
* Add utility function to read a file into memory
* Use old SPM layout until RGP is ready
* Ubuntu21.04+Wayland Vulkan perf ~40% lower compared U20.04
* Add sample info to ShaderEarlyCompileInfo
* Fix InitBusAddressableGpuMemory decorator
* Updated waForce1kHtileMin size in Gfx9
* RDF lib update
* Clean up NullDevice tables

Author: JaxLinAMD

CMakeLists.txt

@@ -27,36 +27,24 @@ cmake_minimum_required(VERSION 3.13...3.21)
 include(cmake/PalVersionHelper.cmake)
 project(PAL LANGUAGES CXX)
 
-### Build Parameters ###################################################################################################
 include(PalBuildParameters)
-
-### Project Options ####################################################################################################
 include(PalOptions)
-
-### Option Overrides ###################################################################################################
 include(PalOverrides)
 
-### Create PAL Library #################################################################################################
 set(CMAKE_FOLDER "${CMAKE_FOLDER}/PAL Libs")
 add_library(pal STATIC)
 add_library(AMD::PAL ALIAS pal)
 
-### Add Subdirectories #################################################################################################
 add_subdirectory(cmake)
 add_subdirectory(inc)
 add_subdirectory(res)
 add_subdirectory(shared)
 add_subdirectory(src)
+add_subdirectory(tools)
 
-### Build Definitions ##################################################################################################
 pal_compile_definitions(pal)
-
-### Compiler Options ###################################################################################################
 pal_compiler_options(pal)
 
-### Custom Commands ####################################################################################################
-
-### IDE support ########################################################################################################
 get_target_property(pal_sources pal SOURCES)
 source_group(TREE ${PAL_SOURCE_DIR}/
              FILES ${pal_sources}

cmake/CMakeLists.txt

@@ -23,7 +23,15 @@
  #
  #######################################################################################################################
 
-if (MSVC_IDE)
-    file(GLOB_RECURSE PAL_CMAKE_SOURCES CONFIGURE_DEPENDS *.cmake)
-    target_sources(pal PRIVATE ${PAL_CMAKE_SOURCES} CMakeLists.txt)
-endif()
+add_subdirectory(Modules)
+
+target_sources(pal PRIVATE
+    CMakeLists.txt
+    PalBuildParameters.cmake
+    PalCompileDefinitions.cmake
+    PalCompilerOptions.cmake
+    PalCompilerWarnings.cmake
+    PalOptions.cmake
+    PalOverrides.cmake
+    PalVersionHelper.cmake
+)

cmake/Modules/CMakeLists.txt

@@ -0,0 +1,31 @@
+##
+ #######################################################################################################################
+ #
+ #  Copyright (c) 2021 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
+ #  in the Software without restriction, including without limitation the rights
+ #  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ #  copies of the Software, and to permit persons to whom the Software is
+ #  furnished to do so, subject to the following conditions:
+ #
+ #  The above copyright notice and this permission notice shall be included in all
+ #  copies or substantial portions of the Software.
+ #
+ #  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ #  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ #  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ #  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ #  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ #  SOFTWARE.
+ #
+ #######################################################################################################################
+
+target_sources(pal PRIVATE
+    CMakeLists.txt
+    FindDRM.cmake
+    FindWayland.cmake
+    FindXCB.cmake
+)

cmake/PalCompileDefinitions.cmake

@@ -140,6 +140,12 @@ function(pal_compile_definitions TARGET)
         )
     endif()
 
+    if(PAL_ENABLE_LOGGING)
+        target_compile_definitions(${TARGET} PUBLIC
+            $<$<CONFIG:Debug>:PAL_ENABLE_LOGGING=1>
+        )
+    endif()
+
     target_compile_definitions(${TARGET} PUBLIC
         # Turn on memory tracking in Debug builds or when the user asks for it
         $<$<OR:$<CONFIG:Debug>,$<BOOL:${PAL_MEMTRACK}>>:

cmake/PalOptions.cmake

@@ -32,5 +32,7 @@ include_guard()
 option(PAL_ENABLE_PRINTS_ASSERTS "Enable print assertions?")
 option(PAL_ENABLE_PRINTS_ASSERTS_DEBUG "Enable print assertions on debug builds?" ON)
 
+option(PAL_ENABLE_LOGGING "Enable debug logging?" OFF)
+
 option(PAL_MEMTRACK "Enable PAL memory tracker?")
 

doc/process/palCodingStandards.md

@@ -152,6 +152,9 @@ General Language Restrictions
         -   In cases where the type is specified in the right-hand
             initialization expression.
 
+-   **Avoid** overloading function names for class hierarchies. This can
+    lead to tedious casting of the class that defines the function.
+
 Preprocessor
 ------------
 

inc/CMakeLists.txt

@@ -23,15 +23,16 @@
  #
  #######################################################################################################################
 
-if (MSVC_IDE)
-    file(GLOB_RECURSE PAL_HEADER_SOURCES CONFIGURE_DEPENDS *.h *.hpp)
-    target_sources(pal PRIVATE ${PAL_HEADER_SOURCES} CMakeLists.txt)
+target_include_directories(pal PUBLIC .)
+
+if (PAL_BUILD_CORE)
+    add_subdirectory(core)
+endif()
+
+if (PAL_BUILD_GPUUTIL)
+    add_subdirectory(gpuUtil)
 endif()
 
-target_include_directories(pal PUBLIC
-    .
-    core
-    gpuUtil
-    util
-)
+add_subdirectory(util)
 
+target_sources(pal PRIVATE CMakeLists.txt)

inc/core/CMakeLists.txt

@@ -0,0 +1,73 @@
+##
+ #######################################################################################################################
+ #
+ #  Copyright (c) 2021 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
+ #  in the Software without restriction, including without limitation the rights
+ #  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ #  copies of the Software, and to permit persons to whom the Software is
+ #  furnished to do so, subject to the following conditions:
+ #
+ #  The above copyright notice and this permission notice shall be included in all
+ #  copies or substantial portions of the Software.
+ #
+ #  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ #  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ #  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ #  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ #  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ #  SOFTWARE.
+ #
+ #######################################################################################################################
+
+target_include_directories(pal PUBLIC .)
+
+target_sources(pal PRIVATE
+    CMakeLists.txt
+    g_palPipelineAbiMetadata.h
+    g_palPipelineAbiMetadataImpl.h
+    pal.h
+    palBorderColorPalette.h
+    palCmdAllocator.h
+    palCmdBuffer.h
+    palColorBlendState.h
+    palColorTargetView.h
+    palDepthStencilState.h
+    palDepthStencilView.h
+    palDestroyable.h
+    palDeveloperHooks.h
+    palDevice.h
+    palEventDefs.h
+    palFence.h
+    palFormat.h
+    palFormatInfo.h
+    palGpuEvent.h
+    palGpuMemory.h
+    palGpuMemoryBindable.h
+    palHsaAbiMetadata.h
+    palImage.h
+    palIndirectCmdGenerator.h
+    palLib.h
+    palMotionEstimator.h
+    palMsaaState.h
+    palOglPresent.h
+    palPerfExperiment.h
+    palPipeline.h
+    palPipelineAbi.h
+    palPipelineAbiProcessor.h
+    palPipelineAbiProcessorImpl.h
+    palPipelineAbiReader.h
+    palPipelineAbiUtils.h
+    palPlatform.h
+    palPrivateScreen.h
+    palQueryPool.h
+    palQueue.h
+    palQueueSemaphore.h
+    palScreen.h
+    palSettingsLoader.h
+    palShaderLibrary.h
+    palSwapChain.h
+)

inc/core/pal.h

@@ -431,7 +431,12 @@ struct ExternalResourceOpenInfo
                                             ///  instead of fd.
             uint32 isDopp             :  1; ///< This is a Dopp texture, doppDesktopInfo is in use.
             uint32 isDirectCapture    :  1; ///< This is a Direct Capture resource, directCaptureInfo is in use.
-            uint32 reserved           : 28; ///< Reserved for future use.
+#if PAL_CLIENT_INTERFACE_MAJOR_VERSION >= 696
+            uint32 globalGpuVa        : 1;  ///< The GPU virtual address must be visible to all devices.
+#else
+            uint32 placeholder695     : 1;
+#endif
+            uint32 reserved           : 27; ///< Reserved for future use.
         };
         uint32 u32All;            ///< Flags packed as 32-bit uint.
     } flags;                      ///< External resource open flags.

inc/core/palCmdBuffer.h

@@ -1777,6 +1777,10 @@ struct CmdBufInfo
     const IGpuMemory* pPrivFlipMemory;  ///< The gpu memory object of the private flip primary surface for the
                                         ///  DirectCapture feature.
 #endif
+#if PAL_CLIENT_INTERFACE_MAJOR_VERSION >= 695
+    uint64            frameIndex;       ///< The frame index of this command buffer. It is only required for the
+                                        ///  DirectCapture feature
+#endif
 };
 
 /// Specifies rotation angle between two images.  Used as input to ICmdBuffer::CmdScaledCopyImage.
@@ -2741,6 +2745,29 @@ class ICmdBuffer : public IDestroyable
         uint32                  regionCount,
         const MemoryCopyRegion* pRegions) = 0;
 
+    /// Copies multiple regions from one GPU memory virtual address to another.
+    ///
+    /// @note  The CmdCopyMemory() path should be preferred because it contains more optimizations due to more
+    ///        knowledge about the memory itself that is lost when only virtual addresses are passed in.
+    ///
+    ///
+    /// None of the destination regions are allowed to overlap each other, nor are destination and source regions
+    /// allowed to overlap when the source and destination GPU memory virtual address are the same.  Any illegal
+    /// overlapping will cause undefined results.
+    ///
+    /// For best performance, addresses, offsets, and copy sizes should be 4-byte aligned.
+    ///
+    /// @param [in] srcGpuVirtAddr  GPU memory vitrual address where the source regions are located.
+    /// @param [in] dstGpuVirtAddr  GPU memory virtual address where the destination regions are located.
+    /// @param [in] regionCount     Number of regions to copy; size of the pRegions array.
+    /// @param [in] pRegions        Array of copy regions, each entry specifynig a source offset, destination offset,
+    ///                             and copy size.
+    virtual void CmdCopyMemoryByGpuVa(
+        gpusize                 srcGpuVirtAddr,
+        gpusize                 dstGpuVirtAddr,
+        uint32                  regionCount,
+        const MemoryCopyRegion* pRegions) = 0;
+
     /// Copies multiple regions from one image to another.
     ///
     /// The source and destination subresource of a particular region are not allowed to be the same, and will produce
@@ -3385,16 +3412,17 @@ class ICmdBuffer : public IDestroyable
         uint32            startQuery,
         uint32            queryCount) = 0;
 
-    /// Writes a top-of-pipe or bottom-of-pipe timestamp to the specified memory location.
+    /// Writes a HwPipePostIndexFetch or HwPipeBottom timestamp to the specified memory location.
     ///
     /// The timestamp data is a 64-bit value that increments once per clock.  timestampFrequency in DeviceProperties
     /// reports the frequency the timestamps are clocked at.
     ///
     /// Timestamps are only supported by engines that report supportsTimestamps in DeviceProperties.
     ///
-    /// @param [in] pipePoint    Specifies where in the pipeline the timestamp should be sampled and written.  The only
-    ///                          valid choices are HwPipeTop and HwPipeBottom.  Top-of-pipe timestamps are not supported
-    ///                          on the SDMA engine, so all timestamps will be executed as bottom-of-pipe.
+    /// @param [in] pipePoint    Specifies where in the pipeline the timestamp should be sampled and written. The only
+    ///                          valid choices are HwPipePostIndexFetch and HwPipeBottom. HwPipePostIndexFetch timestamps
+    ///                          are not supported on the SDMA engine, so all timestamps will be executed as
+    ///                          bottom-of-pipe.
     /// @param [in] dstGpuMemory GPU memory object where timestamp should be written.
     /// @param [in] dstOffset    Offset into pDstGpuMemory where the timestamp should be written.  Must be aligned to
     ///                          minTimestampAlignment in DeviceProperties.
@@ -3405,12 +3433,10 @@ class ICmdBuffer : public IDestroyable
 
     /// Writes a top-of-pipe or bottom-of-pipe immediate value to the specified memory location.
     ///
-    /// Timestamps are only supported by engines that report supportsTimestamps in DeviceProperties.
-    ///
     /// @param [in] pipePoint          Specifies where in the pipeline the timestamp should be sampled and written.
-    ///                                The only valid choices are HwPipeTop and HwPipeBottom.  Top-of-pipe timestamps
-    ///                                are not supported on the SDMA engine, so all timestamps will be executed as
-    ///                                bottom-of-pipe.
+    ///                                The only valid choices are HwPipeTop, HwPipePostIndexFetch and HwPipeBottom.
+    ///                                Top-of-pipe timestamps are not supported on the SDMA engine, so all timestamps
+    ///                                will be executed as bottom-of-pipe.
     /// @param [in] data               Value to be written to gpu address.
     /// @param [in] ImmediateDataWidth Size of the data to be written out.
     /// @param [in] address            GPU address where immediate value should be written.

inc/core/palDevice.h

@@ -2109,8 +2109,8 @@ struct CustomPowerProfile
 /// directed by the application or hard-code them to a single value.  Driver-internal memory references should be marked
 /// as CantTrim unless the client explicitly handles trim support.
 ///
-/// Note that the CantTrim and MustSucceed flags are based on the same WDDM2 flags; it is expected that PAL will ignore
-/// them on non-WDDM2 platforms.
+/// Note that the CantTrim and MustSucceed flags are based on the same WDDM flags; it is expected that PAL will ignore
+/// them on non-WDDM platforms.
 enum GpuMemoryRefFlags : uint32
 {
     GpuMemoryRefCantTrim    = 0x1, ///< The caller can't or won't free this allocation on OS request.

inc/core/palImage.h

@@ -291,6 +291,16 @@ struct ImageCreateInfo
     MetadataTcCompatMode metadataTcCompatMode; ///< TC compat mode for this image.
     uint32             maxBaseAlign;      ///< Maximum address alignment for this image or zero for an unbounded
                                           ///  alignment.
+#if PAL_CLIENT_INTERFACE_MAJOR_VERSION >= 694
+    float              imageMemoryBudget; ///< The memoryBudget value used in SW addrlib to determine the minSizeBlk for
+                                          ///  textures. It must be >= 0.0.
+                                          ///  When in [0.0, 1.0), addrlib uses legacy logic to decide minSizeBlk.
+                                          ///  When == 1.0, addrlib uses minimizeAlign.
+                                          ///  When > 1.0, addrlib applies memory budget algorithm.
+                                          ///  Despite 1.5 in tests show significant texture allocation size reduction,
+                                          ///  default value 0.0 (legacy behavior) is recommended if not specified by
+                                          ///  client.
+#endif
 
     struct
     {
@@ -497,6 +507,10 @@ struct SubresLayout
     ///
     /// This value is only valid if supportSplitReleaseAcquire is set in @ref DeviceProperties.
     ImageLayout defaultGfxLayout;
+
+    SwizzledFormat planeFormat; ///< Swizzled format for plane. Planar resource like D32-S8
+                                /// will have different swizzled format per plane.
+
 };
 
 /// Selects a specific subresource of an image resource.

inc/core/palLib.h

@@ -43,7 +43,7 @@
 ///            compatible, it is not assumed that the client will initialize all input structs to 0.
 ///
 /// @ingroup LibInit
-#define PAL_INTERFACE_MAJOR_VERSION 691
+#define PAL_INTERFACE_MAJOR_VERSION 697
 
 /// Minor interface version.  Note that the interface version is distinct from the PAL version itself, which is returned
 /// in @ref Pal::PlatformProperties.
@@ -53,7 +53,7 @@
 /// of the existing enum values will change.  This number will be reset to 0 when the major version is incremented.
 ///
 /// @ingroup LibInit
-#define PAL_INTERFACE_MINOR_VERSION 2
+#define PAL_INTERFACE_MINOR_VERSION 0
 
 /// Minimum major interface version. This is the minimum interface version PAL supports in order to support backward
 /// compatibility. When it is equal to PAL_INTERFACE_MAJOR_VERSION, only the latest interface version is supported.