Update xgl from commit: 7a802c91

* Move pointSizeUsed to PipelineMetadata * Enhance ASTC software Gpu decode pass: add cache for pipeline binaries, improve CPU performance,fix memory leak * Update PAL Version in XGL to 696 * Change order of exception handling, and add attachment count guard * Sampler compareFunc with disabled data comparison * PAL Version in XGL Clean Up * Cleanup VK_IGNORE macros * Extract command buffer ring to new class * Add change to enable overriding the VRAM size with a value higher than actually present on the GPU * Add 3rd heap choice * Avoid redundant get PAL device props call
dstutt · Jan 13, 2022 · 412fc2a · 412fc2a
1 parent 0453432
commit 412fc2a
Show file tree

Hide file tree

Showing 208 changed files with 1,169 additions and 761 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 ##
  #######################################################################################################################
  #
- #  Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+ #  Copyright (c) 2017-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

diff --git a/cmake/Modules/AmdCmakeHelper.cmake b/cmake/Modules/AmdCmakeHelper.cmake
@@ -1,7 +1,7 @@
 ##
  #######################################################################################################################
  #
- #  Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+ #  Copyright (c) 2017-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

diff --git a/cmake/Modules/FindAMDBoost.cmake b/cmake/Modules/FindAMDBoost.cmake
@@ -1,7 +1,7 @@
 ##
  #######################################################################################################################
  #
- #  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

diff --git a/cmake/Modules/FindAMDNinja.cmake b/cmake/Modules/FindAMDNinja.cmake
@@ -1,7 +1,7 @@
 ##
  #######################################################################################################################
  #
- #  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

diff --git a/cmake/Modules/FindDRM.cmake b/cmake/Modules/FindDRM.cmake
@@ -1,7 +1,7 @@
 ##
  #######################################################################################################################
  #
- #  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

diff --git a/cmake/Modules/FindKernelHeaders.cmake b/cmake/Modules/FindKernelHeaders.cmake
@@ -1,7 +1,7 @@
 ##
  #######################################################################################################################
  #
- #  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

diff --git a/cmake/Modules/FindXCB.cmake b/cmake/Modules/FindXCB.cmake
@@ -1,7 +1,7 @@
 ##
  #######################################################################################################################
  #
- #  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

diff --git a/cmake/Modules/XglSetupAmdGlobalRoots.cmake b/cmake/Modules/XglSetupAmdGlobalRoots.cmake
@@ -1,7 +1,7 @@
 ##
  #######################################################################################################################
  #
- #  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

diff --git a/cmake/XglCompileDefinitions.cmake b/cmake/XglCompileDefinitions.cmake
@@ -1,7 +1,7 @@
 ##
  #######################################################################################################################
  #
- #  Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+ #  Copyright (c) 2017-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

diff --git a/cmake/XglCompilerOptions.cmake b/cmake/XglCompilerOptions.cmake
@@ -1,7 +1,7 @@
 ##
  #######################################################################################################################
  #
- #  Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+ #  Copyright (c) 2017-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

diff --git a/cmake/XglHelper.cmake b/cmake/XglHelper.cmake
@@ -1,7 +1,7 @@
 ##
  #######################################################################################################################
  #
- #  Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+ #  Copyright (c) 2017-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

diff --git a/cmake/XglOptions.cmake b/cmake/XglOptions.cmake
@@ -1,7 +1,7 @@
 ##
  #######################################################################################################################
  #
- #  Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+ #  Copyright (c) 2017-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

diff --git a/cmake/XglOverrides.cmake b/cmake/XglOverrides.cmake
@@ -1,7 +1,7 @@
 ##
  #######################################################################################################################
  #
- #  Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+ #  Copyright (c) 2017-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

diff --git a/cmake/XglPackaging.cmake b/cmake/XglPackaging.cmake
@@ -1,7 +1,7 @@
 ##
  #######################################################################################################################
  #
- #  Copyright (c) 2021 Advanced Micro Devices, Inc. All Rights Reserved.
+ #  Copyright (c) 2021-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

diff --git a/icd/CMakeLists.txt b/icd/CMakeLists.txt
@@ -1,7 +1,7 @@
 ##
  #######################################################################################################################
  #
- #  Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+ #  Copyright (c) 2017-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
@@ -87,6 +87,7 @@ target_sources(xgl PRIVATE
     api/app_resource_optimizer.cpp
     api/app_shader_optimizer.cpp
     api/barrier_policy.cpp
+    api/cmd_buffer_ring.cpp
     api/color_space_helper.cpp
     api/compiler_solution.cpp
     api/internal_mem_mgr.cpp

diff --git a/icd/api/app_profile.cpp b/icd/api/app_profile.cpp
@@ -1,7 +1,7 @@
 /*
  ***********************************************************************************************************************
  *
- *  Copyright (c) 2014-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+ *  Copyright (c) 2014-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

diff --git a/icd/api/app_resource_optimizer.cpp b/icd/api/app_resource_optimizer.cpp
@@ -1,7 +1,7 @@
 /*
  ***********************************************************************************************************************
  *
- *  Copyright (c) 2019-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+ *  Copyright (c) 2019-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

diff --git a/icd/api/app_shader_optimizer.cpp b/icd/api/app_shader_optimizer.cpp
@@ -1,7 +1,7 @@
 /*
  ***********************************************************************************************************************
  *
- *  Copyright (c) 2014-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+ *  Copyright (c) 2014-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

diff --git a/icd/api/appopt/barrier_filter_layer.cpp b/icd/api/appopt/barrier_filter_layer.cpp
@@ -1,7 +1,7 @@
 /*
  ***********************************************************************************************************************
  *
- *  Copyright (c) 2019-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+ *  Copyright (c) 2019-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

diff --git a/icd/api/appopt/barrier_filter_layer.h b/icd/api/appopt/barrier_filter_layer.h
@@ -1,7 +1,7 @@
 /*
  ***********************************************************************************************************************
  *
- *  Copyright (c) 2019-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+ *  Copyright (c) 2019-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

diff --git a/icd/api/appopt/gpu_decode_layer.cpp b/icd/api/appopt/gpu_decode_layer.cpp
@@ -1,7 +1,7 @@
 /*
  ***********************************************************************************************************************
  *
- *  Copyright (c) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+ *  Copyright (c) 2020-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
@@ -186,6 +186,23 @@ namespace GpuTexDecoder
 
         return result == VK_SUCCESS ? Pal::Result::Success : Pal::Result::ErrorUnknown;
     }
+
+    void ClientDestroyInternalComputePipeline(
+        const DeviceInitInfo& initInfo,
+        Pal::IPipeline*       pPipeline,
+        void*                 pMemory)
+    {
+        vk::Device* pDevice = reinterpret_cast<vk::Device*>(initInfo.pClientUserData);
+
+        if (pMemory == nullptr)
+        {
+            pMemory = pPipeline;
+        }
+
+        pPipeline->Destroy();
+        pPipeline = nullptr;
+        pDevice->VkInstance()->FreeMem(pMemory);
+    }
 }
 
 namespace vk
@@ -203,7 +220,7 @@ GpuDecoderLayer::~GpuDecoderLayer()
 {
     if(m_pGpuTexDecoder != nullptr)
     {
-        m_pDevice->VkInstance()->FreeMem(m_pGpuTexDecoder);
+        Util::Destructor(m_pGpuTexDecoder);
         m_pGpuTexDecoder = nullptr;
     }
 }

diff --git a/icd/api/appopt/gpu_decode_layer.h b/icd/api/appopt/gpu_decode_layer.h
@@ -1,7 +1,7 @@
 /*
  ***********************************************************************************************************************
  *
- *  Copyright (c) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+ *  Copyright (c) 2020-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

diff --git a/icd/api/appopt/opt_layer.h b/icd/api/appopt/opt_layer.h
@@ -1,7 +1,7 @@
 /*
  ***********************************************************************************************************************
  *
- *  Copyright (c) 2019-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+ *  Copyright (c) 2019-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

diff --git a/icd/api/appopt/strange_brigade_layer.cpp b/icd/api/appopt/strange_brigade_layer.cpp
@@ -1,7 +1,7 @@
 /*
  ***********************************************************************************************************************
  *
- *  Copyright (c) 2014-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+ *  Copyright (c) 2014-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

diff --git a/icd/api/appopt/strange_brigade_layer.h b/icd/api/appopt/strange_brigade_layer.h
@@ -1,7 +1,7 @@
 /*
  ***********************************************************************************************************************
  *
- *  Copyright (c) 2014-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+ *  Copyright (c) 2014-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

diff --git a/icd/api/barrier_policy.cpp b/icd/api/barrier_policy.cpp
@@ -1,7 +1,7 @@
 /*
  ***********************************************************************************************************************
  *
- *  Copyright (c) 2014-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+ *  Copyright (c) 2014-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
@@ -907,7 +907,6 @@ void ImageBarrierPolicy::InitImageLayoutUsagePolicy(
     }
 
     // We don't do anything special in case of transient attachment images
-    VK_IGNORE(VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT);
 }
 
 // =====================================================================================================================
@@ -1031,9 +1030,6 @@ void ImageBarrierPolicy::InitImageCachePolicy(
         supportedInputCacheMask  |= Pal::CoherDepthStencilTarget | Pal::CoherClear;
     }
 
-    // We don't do anything special in case of transient attachment images
-    VK_IGNORE(VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT);
-
     // Apply device specific supported cache masks to limit the scope.
     supportedOutputCacheMask &= pDevice->GetBarrierPolicy().GetSupportedOutputCacheMask();
     supportedInputCacheMask  &= pDevice->GetBarrierPolicy().GetSupportedInputCacheMask();
@@ -1328,8 +1324,7 @@ void BufferBarrierPolicy::InitBufferCachePolicy(
         supportedOutputCacheMask |= Pal::CoherStreamOut;
     }
 
-    // Nothing to do since Pal::CoherMemory is already set
-    VK_IGNORE(usage & VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT);
+    // Nothing to do for VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT since Pal::CoherMemory is already set
 
     // Apply device specific supported cache masks to limit the scope.
     supportedOutputCacheMask &= pDevice->GetBarrierPolicy().GetSupportedOutputCacheMask();

diff --git a/icd/api/binary_cache_serialization.cpp b/icd/api/binary_cache_serialization.cpp
@@ -1,7 +1,7 @@
 /*
  ***********************************************************************************************************************
  *
- *  Copyright (c) 2018-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+ *  Copyright (c) 2018-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

diff --git a/icd/api/cache_adapter.cpp b/icd/api/cache_adapter.cpp
@@ -1,7 +1,7 @@
 /*
  ***********************************************************************************************************************
  *
- *  Copyright (c) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+ *  Copyright (c) 2020-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