[Media Common] Revert/re-implement 0c545e1 to use VE copy as default fast dump copy method and enable changing copy method through CodecDbgSetting.cfg

To set VE copy as default copy method, prefer to change the input params instead of making internal code change.

Author: walter-bai

media_softlet/agnostic/common/codec/hal/codechal_debug.cpp

@@ -3543,22 +3543,19 @@ MOS_STATUS CodechalDebugInterface::SetFastDumpConfig(MediaCopyWrapper *mediaCopy
     }
     else
     {
-        cfg.allowDataLoss = false;
+        cfg.allowDataLoss = m_configMgr->AttrIsEnabled(MediaDbgAttr::attrFastDumpAllowDataLoss);
         cfg.informOnError = false;
 
-        MediaUserSetting::Value outValue{};
-        ReadUserSettingForDebug(
-            m_userSettingPtr,
-            outValue,
-            "Enable VECopy For Surface Dump",
-            MediaUserSetting::Group::Sequence);
-
-        if (outValue.Get<bool>())
+        // E.g., when FastDumpRenderCpyEn:1, FastDumpVeCpyEn:0, FastDumpBltCpyEn:0, only use render copy
+        //       when FastDumpRenderCpyEn:1, FastDumpVeCpyEn:1, FastDumpBltCpyEn:0, randomly use render and VE copy
+        //       when FastDumpRenderCpyEn:1, FastDumpVeCpyEn:1, FastDumpBltCpyEn:1, randomly use render, VE and BLT copy
+        //       when FastDumpRenderCpyEn:0, FastDumpVeCpyEn:0, FastDumpBltCpyEn:0, use FastDump default copy method, which is VE copy
+        if (m_configMgr->AttrIsEnabled(MediaDbgAttr::attrFastDumpRenderCpyEn) || m_configMgr->AttrIsEnabled(MediaDbgAttr::attrFastDumpVeCpyEn)
+            || m_configMgr->AttrIsEnabled(MediaDbgAttr::attrFastDumpBltCpyEn))
         {
-            // use VE copy
-            cfg.weightRenderCopy = 0;
-            cfg.weightVECopy     = 100;
-            cfg.weightBLTCopy    = 0;
+            cfg.weightRenderCopy = m_configMgr->AttrIsEnabled(MediaDbgAttr::attrFastDumpRenderCpyEn) ? 100 : 0;
+            cfg.weightVECopy     = m_configMgr->AttrIsEnabled(MediaDbgAttr::attrFastDumpVeCpyEn) ? 100 : 0;
+            cfg.weightBLTCopy    = m_configMgr->AttrIsEnabled(MediaDbgAttr::attrFastDumpBltCpyEn) ? 100 : 0;
         }
     }
 

media_softlet/agnostic/common/shared/media_debug_config_manager.cpp

@@ -413,6 +413,10 @@ void MediaDebugConfigMgr::GenerateDefaultConfig(std::string configFileName)
     ofs << "#" << MediaDbgAttr::attrDumpToThreadFolder << ":0" << std::endl;
     ofs << "#" << MediaDbgAttr::attrDumpCmdBufInBinary << ":0" << std::endl;
     ofs << "#" << MediaDbgAttr::attrEnableFastDump << ":1" << std::endl;
+    ofs << "#" << MediaDbgAttr::attrFastDumpAllowDataLoss << ":0" << std::endl;
+    ofs << "#" << MediaDbgAttr::attrFastDumpRenderCpyEn << ":0" << std::endl;
+    ofs << "#" << MediaDbgAttr::attrFastDumpVeCpyEn << ":0" << std::endl;
+    ofs << "#" << MediaDbgAttr::attrFastDumpBltCpyEn << ":0" << std::endl;
     ofs << "#" << MediaDbgAttr::attrStatusReport << ":0" << std::endl;
     ofs << std::endl;
 

media_softlet/agnostic/common/shared/media_debug_fast_dump.h

@@ -83,9 +83,9 @@ class MediaDebugFastDump
         RangedUint8<>     maxDeprioritizedMem = 75;  // max percentage of deprioritized memory can be used for fast dump, 0% - 100%
 
         // media copy configurations
-        RangedUint8<> weightRenderCopy = 100;  // weight for render copy, 0 - 100
-        RangedUint8<> weightVECopy     = 80;   // weight for VE copy, 0 - 100
-        RangedUint8<> weightBLTCopy    = 20;   // weight for BLT copy, 0 - 100
+        RangedUint8<> weightRenderCopy = 0;    // weight for render copy, 0 - 100
+        RangedUint8<> weightVECopy     = 100;  // weight for VE copy, 0 - 100
+        RangedUint8<> weightBLTCopy    = 0;    // weight for BLT copy, 0 - 100
                                                // when weightRenderCopy, weightVECopy and weightBLTCopy are all 0, use default copy method,
                                                // otherwise randomly select 1 of the 3 methods based on their weights, e.g., the chance of
                                                // selecting render copy is weightRenderCopy/(weightRenderCopy+weightVECopy+weightBLTCopy)

media_softlet/agnostic/common/shared/media_debug_fast_dump_imp.hpp

@@ -622,18 +622,25 @@ class MediaDebugFastDumpImp : public MediaDebugFastDump
         }
         else
         {
-            if (cfg.weightVECopy == 100) //Force VE-Copy
-            {
-                m_copyMethod = [=] {
-                    return MCPY_METHOD_BALANCE;
-                };
-            }
-            else
-            {
-                m_copyMethod = [] {
-                    return MCPY_METHOD_DEFAULT;
+            const auto weightRenderCopy = static_cast<double>(cfg.weightRenderCopy);
+            const auto weightVECopy     = static_cast<double>(cfg.weightVECopy);
+            const auto weightBLTCopy    = static_cast<double>(cfg.weightBLTCopy);
+
+            m_copyMethod = [=] {
+                const MCPY_METHOD methods[] = {
+                    MCPY_METHOD_PERFORMANCE,
+                    MCPY_METHOD_BALANCE,
+                    MCPY_METHOD_POWERSAVING,
                 };
-            }
+                std::random_device           rd;
+                std::mt19937                 gen(rd());
+                std::discrete_distribution<> distribution({
+                    weightRenderCopy,
+                    weightVECopy,
+                    weightBLTCopy,
+                });
+                return methods[distribution(gen)];
+            };
         }
     }
 

media_softlet/agnostic/common/shared/media_debug_serializer.h

@@ -27,14 +27,14 @@
 
 #if USE_MEDIA_DEBUG_TOOL
 
+#include <cstdint>
 #include <cstring>
 #include <iomanip>
 #include <ostream>
 #include <sstream>
 #include <string>
 #include <typeinfo>
 #include <type_traits>
-#include <stdint.h>
 #include "media_class_trace.h"
 
 template <typename T, typename = void>

media_softlet/agnostic/common/shared/media_debug_utils.h

@@ -41,6 +41,10 @@ static const char *attrDumpBufferInBinary    = "DumpBufferInBinary";
 static const char *attrDumpToThreadFolder    = "DumpToThreadFolder";
 static const char *attrDumpCmdBufInBinary    = "DumpCmdBufInBinary";
 static const char *attrEnableFastDump        = "EnableFastDump";
+static const char *attrFastDumpAllowDataLoss = "FastDumpAllowDataLoss";
+static const char *attrFastDumpRenderCpyEn   = "FastDumpRenderCpyEn";
+static const char *attrFastDumpVeCpyEn       = "FastDumpVeCpyEn";
+static const char *attrFastDumpBltCpyEn      = "FastDumpBltCpyEn";
 
 //Codec Attr 
 static const char *attrPicParams               = "PicParams";

media_softlet/agnostic/common/shared/pipeline/media_user_setting.cpp

@@ -39,14 +39,5 @@ MOS_STATUS MediaPipeline::InitUserSetting(MediaUserSettingSharedPtr userSettingP
         int32_t(1),
         false);
 
-#if (_DEBUG || _RELEASE_INTERNAL)
-    DeclareUserSettingKeyForDebug(
-        userSettingPtr,
-        "Enable VECopy For Surface Dump",
-        MediaUserSetting::Group::Sequence,
-        false,
-        false);
-#endif  // _DEBUG || _RELEASE_INTERNAL
-
     return MOS_STATUS_SUCCESS;
 }