Add API name to aub file name

BartoszDunajski · Compute-Runtime-Automation · commit 9ff91defba20 · 2021-09-16T14:50:25.000+02:00
Signed-off-by: Bartosz Dunajski &lt;bartosz.dunajski@intel.com&gt;
diff --git a/level_zero/core/source/helpers/api_specific_config_l0.cpp b/level_zero/core/source/helpers/api_specific_config_l0.cpp
@@ -29,8 +29,8 @@ ApiSpecificConfig::ApiType ApiSpecificConfig::getApiType() {
     return ApiSpecificConfig::L0;
 }
 
-const char *ApiSpecificConfig::getAubPrefixForSpecificApi() {
-    return "l0_";
+std::string ApiSpecificConfig::getName() {
+    return "l0";
 }
 
 uint64_t ApiSpecificConfig::getReducedMaxAllocSize(uint64_t maxAllocSize) {
diff --git a/level_zero/core/test/unit_tests/sources/helper/api_specific_config_l0_tests.cpp b/level_zero/core/test/unit_tests/sources/helper/api_specific_config_l0_tests.cpp
@@ -16,7 +16,11 @@ TEST(ApiSpecificConfigL0Tests, WhenGettingApiTypeThenCorrectTypeIsReturned) {
 }
 
 TEST(ApiSpecificConfigL0Tests, WhenGettingAUBPrefixByApiTypeL0IsReturned) {
-    EXPECT_EQ(0, strcmp("l0_", ApiSpecificConfig::getAubPrefixForSpecificApi()));
+    EXPECT_EQ(0, strcmp("l0_", ApiSpecificConfig::getAubPrefixForSpecificApi().c_str()));
+}
+
+TEST(ApiSpecificConfigL0Tests, WhenGettingNameL0IsReturned) {
+    EXPECT_EQ(0, strcmp("l0", ApiSpecificConfig::getName().c_str()));
 }
 
 TEST(ApiSpecificConfigL0Tests, WhenCheckingIfStatelessCompressionIsSupportedThenReturnFalse) {
diff --git a/opencl/source/command_stream/create_command_stream_impl.cpp b/opencl/source/command_stream/create_command_stream_impl.cpp
@@ -9,6 +9,7 @@
 #include "shared/source/command_stream/tbx_command_stream_receiver.h"
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/os_interface/device_factory.h"
 
 #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h"
@@ -29,12 +30,13 @@ CommandStreamReceiver *createCommandStreamImpl(ExecutionEnvironment &executionEn
     if (csr < 0) {
         csr = CommandStreamReceiverType::CSR_HW;
     }
+
     switch (csr) {
     case CSR_HW:
         commandStreamReceiver = funcCreate(false, executionEnvironment, rootDeviceIndex, deviceBitfield);
         break;
     case CSR_AUB:
-        commandStreamReceiver = AUBCommandStreamReceiver::create("aubfile", true, executionEnvironment, rootDeviceIndex, deviceBitfield);
+        commandStreamReceiver = AUBCommandStreamReceiver::create(ApiSpecificConfig::getName(), true, executionEnvironment, rootDeviceIndex, deviceBitfield);
         break;
     case CSR_TBX:
         commandStreamReceiver = TbxCommandStreamReceiver::create("", false, executionEnvironment, rootDeviceIndex, deviceBitfield);
@@ -43,7 +45,7 @@ CommandStreamReceiver *createCommandStreamImpl(ExecutionEnvironment &executionEn
         commandStreamReceiver = funcCreate(true, executionEnvironment, rootDeviceIndex, deviceBitfield);
         break;
     case CSR_TBX_WITH_AUB:
-        commandStreamReceiver = TbxCommandStreamReceiver::create("aubfile", true, executionEnvironment, rootDeviceIndex, deviceBitfield);
+        commandStreamReceiver = TbxCommandStreamReceiver::create(ApiSpecificConfig::getName(), true, executionEnvironment, rootDeviceIndex, deviceBitfield);
         break;
     default:
         break;
diff --git a/opencl/source/helpers/api_specific_config_ocl.cpp b/opencl/source/helpers/api_specific_config_ocl.cpp
@@ -29,8 +29,8 @@ ApiSpecificConfig::ApiType ApiSpecificConfig::getApiType() {
     return ApiSpecificConfig::OCL;
 }
 
-const char *ApiSpecificConfig::getAubPrefixForSpecificApi() {
-    return "ocl_";
+std::string ApiSpecificConfig::getName() {
+    return "ocl";
 }
 
 uint64_t ApiSpecificConfig::getReducedMaxAllocSize(uint64_t maxAllocSize) {
diff --git a/opencl/source/os_interface/linux/device_command_stream.inl b/opencl/source/os_interface/linux/device_command_stream.inl
@@ -7,6 +7,7 @@
 
 #include "shared/source/command_stream/device_command_stream.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/helpers/api_specific_config.h"
 
 #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h"
 #include "opencl/source/os_interface/linux/drm_command_stream.h"
@@ -19,7 +20,7 @@ CommandStreamReceiver *createDrmCommandStreamReceiver(bool withAubDump,
                                                       uint32_t rootDeviceIndex,
                                                       const DeviceBitfield deviceBitfield) {
     if (withAubDump) {
-        return new CommandStreamReceiverWithAUBDump<DrmCommandStreamReceiver<GfxFamily>>("aubfile",
+        return new CommandStreamReceiverWithAUBDump<DrmCommandStreamReceiver<GfxFamily>>(ApiSpecificConfig::getName(),
                                                                                          executionEnvironment,
                                                                                          rootDeviceIndex,
                                                                                          deviceBitfield);
diff --git a/opencl/source/os_interface/windows/device_command_stream.inl b/opencl/source/os_interface/windows/device_command_stream.inl
@@ -10,6 +10,7 @@
 #pragma warning(push)
 #pragma warning(disable : 4005)
 #include "shared/source/command_stream/device_command_stream.h"
+#include "shared/source/helpers/api_specific_config.h"
 
 #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h"
 #include "opencl/source/os_interface/windows/wddm_device_command_stream.h"
@@ -25,7 +26,7 @@ CommandStreamReceiver *createWddmCommandStreamReceiver(bool withAubDump,
                                                        uint32_t rootDeviceIndex,
                                                        const DeviceBitfield deviceBitfield) {
     if (withAubDump) {
-        return new CommandStreamReceiverWithAUBDump<WddmCommandStreamReceiver<GfxFamily>>("aubfile",
+        return new CommandStreamReceiverWithAUBDump<WddmCommandStreamReceiver<GfxFamily>>(ApiSpecificConfig::getName(),
                                                                                           executionEnvironment,
                                                                                           rootDeviceIndex,
                                                                                           deviceBitfield);
diff --git a/opencl/source/os_interface/windows/wddm_device_command_stream.inl b/opencl/source/os_interface/windows/wddm_device_command_stream.inl
@@ -166,7 +166,7 @@ CommandStreamReceiver *createWddmDeviceCommandStreamReceiver(bool withAubDump,
                                                              uint32_t rootDeviceIndex,
                                                              const DeviceBitfield deviceBitfield) {
     if (withAubDump) {
-        return new CommandStreamReceiverWithAUBDump<WddmCommandStreamReceiver<GfxFamily>>("aubfile",
+        return new CommandStreamReceiverWithAUBDump<WddmCommandStreamReceiver<GfxFamily>>(ApiSpecificConfig::getName(),
                                                                                           executionEnvironment,
                                                                                           rootDeviceIndex,
                                                                                           deviceBitfield);
diff --git a/opencl/test/unit_test/helpers/api_specific_config_ocl_tests.cpp b/opencl/test/unit_test/helpers/api_specific_config_ocl_tests.cpp
@@ -16,7 +16,11 @@ TEST(ApiSpecificConfigOclTests, WhenGettingApiTypeThenCorrectTypeIsReturned) {
 }
 
 TEST(ApiSpecificConfigOclTests, WhenGettingAUBPrefixByApiTypeOCLIsReturned) {
-    EXPECT_EQ(0, strcmp("ocl_", ApiSpecificConfig::getAubPrefixForSpecificApi()));
+    EXPECT_EQ(0, strcmp("ocl_", ApiSpecificConfig::getAubPrefixForSpecificApi().c_str()));
+}
+
+TEST(ApiSpecificConfigOclTests, WhenGettingNameOCLIsReturned) {
+    EXPECT_EQ(0, strcmp("ocl", ApiSpecificConfig::getName().c_str()));
 }
 
 TEST(ApiSpecificConfigOclTests, WhenCheckingIfStatelessCompressionIsSupportedThenReturnTrue) {
diff --git a/shared/source/helpers/api_specific_config.h b/shared/source/helpers/api_specific_config.h
@@ -6,6 +6,7 @@
  */
 
 #include <cstdint>
+#include <string>
 
 #pragma once
 namespace NEO {
@@ -16,7 +17,11 @@ struct ApiSpecificConfig {
     static bool getHeapConfiguration();
     static bool getBindlessConfiguration();
     static ApiType getApiType();
-    static const char *getAubPrefixForSpecificApi();
+    static std::string getName();
     static uint64_t getReducedMaxAllocSize(uint64_t maxAllocSize);
+
+    static std::string getAubPrefixForSpecificApi() {
+        return (getName() + "_");
+    }
 };
 } // namespace NEO
diff --git a/shared/test/common/helpers/api_specific_config_shared_tests.cpp b/shared/test/common/helpers/api_specific_config_shared_tests.cpp
@@ -30,4 +30,8 @@ uint64_t ApiSpecificConfig::getReducedMaxAllocSize(uint64_t maxAllocSize) {
     return maxAllocSize / 2;
 }
 
+std::string ApiSpecificConfig::getName() {
+    return "shared";
+}
+
 } // namespace NEO

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ ApiSpecificConfig::ApiType ApiSpecificConfig::getApiType() {`
`29`	`29`	`return ApiSpecificConfig::L0;`
`30`	`30`	`}`
`31`	`31`
`32`		`-const char *ApiSpecificConfig::getAubPrefixForSpecificApi() {`
`33`		`- return "l0_";`
	`32`	`+std::string ApiSpecificConfig::getName() {`
	`33`	`+ return "l0";`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`uint64_t ApiSpecificConfig::getReducedMaxAllocSize(uint64_t maxAllocSize) {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,11 @@ TEST(ApiSpecificConfigL0Tests, WhenGettingApiTypeThenCorrectTypeIsReturned) {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`TEST(ApiSpecificConfigL0Tests, WhenGettingAUBPrefixByApiTypeL0IsReturned) {`
`19`		`- EXPECT_EQ(0, strcmp("l0_", ApiSpecificConfig::getAubPrefixForSpecificApi()));`
	`19`	`+ EXPECT_EQ(0, strcmp("l0_", ApiSpecificConfig::getAubPrefixForSpecificApi().c_str()));`
	`20`	`+}`
	`21`	`+`
	`22`	`+TEST(ApiSpecificConfigL0Tests, WhenGettingNameL0IsReturned) {`
	`23`	`+ EXPECT_EQ(0, strcmp("l0", ApiSpecificConfig::getName().c_str()));`
`20`	`24`	`}`
`21`	`25`
`22`	`26`	`TEST(ApiSpecificConfigL0Tests, WhenCheckingIfStatelessCompressionIsSupportedThenReturnFalse) {`
Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,8 @@ uint64_t ApiSpecificConfig::getReducedMaxAllocSize(uint64_t maxAllocSize) {`
`30`	`30`	`return maxAllocSize / 2;`
`31`	`31`	`}`
`32`	`32`
	`33`	`+std::string ApiSpecificConfig::getName() {`
	`34`	`+ return "shared";`
	`35`	`+}`
	`36`	`+`
`33`	`37`	`} // namespace NEO`