intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-04 07:14:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: refactor aub tests to create Aub/Tbx csr

Browse Source 
- aub_tests should create AUB/TBX csr, this will prevent using empty
UltCommandStreamRecevier if CSR is not overriden in device

Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
This commit is contained in:
Mateusz Hoppe
2023-11-17 17:01:46 +00:00
committed by Compute-Runtime-Automation
parent 1b62e5018a
commit 2b35c2374b
6 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
level_zero/core/test/aub_tests/fixtures/aub_fixture.cpp
View File

@@ -10,6 +10,7 @@
#include "shared/source/command_stream/aub_command_stream_receiver.h"
#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
#include "shared/source/helpers/api_specific_config.h"
#include "shared/source/helpers/gfx_core_helper.h"
#include "shared/source/helpers/hw_info.h"
#include "shared/test/common/mocks/mock_device.h"
#include "shared/test/common/tests_configuration.h"
@@ -41,6 +42,7 @@ void AUBFixtureL0::setUp() {
void AUBFixtureL0::setUp(const NEO::HardwareInfo *hardwareInfo, bool debuggingEnabled) {
ASSERT_NE(nullptr, hardwareInfo);
const auto &hwInfo = *hardwareInfo;
backupUltConfig = std::make_unique<VariableBackup<NEO::UltHwConfig>>(&NEO::ultHwConfig);
executionEnvironment = new NEO::ExecutionEnvironment();
executionEnvironment->prepareRootDeviceEnvironments(1u);
@@ -50,9 +52,8 @@ void AUBFixtureL0::setUp(const NEO::HardwareInfo *hardwareInfo, bool debuggingEn
if (debuggingEnabled) {
executionEnvironment->setDebuggingMode(NEO::DebuggingMode::Online);
}
neoDevice = NEO::MockDevice::createWithExecutionEnvironment<NEO::MockDevice>(&hwInfo, executionEnvironment, 0u);
auto &gfxCoreHelper = neoDevice->getGfxCoreHelper();
auto &gfxCoreHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper<NEO::GfxCoreHelper>();
auto engineType = getChosenEngineType(hwInfo);
const ::testing::TestInfo *const testInfo = ::testing::UnitTest::GetInstance()->current_test_info();
@@ -61,6 +62,11 @@ void AUBFixtureL0::setUp(const NEO::HardwareInfo *hardwareInfo, bool debuggingEn
strfilename << NEO::ApiSpecificConfig::getAubPrefixForSpecificApi();
strfilename << testInfo->test_case_name() << "_" << testInfo->name() << "_" << gfxCoreHelper.getCsTraits(engineType).name;
aubFileName = strfilename.str();
NEO::ultHwConfig.aubTestName = aubFileName.c_str();
neoDevice = NEO::MockDevice::createWithExecutionEnvironment<NEO::MockDevice>(&hwInfo, executionEnvironment, 0u);
if (NEO::testMode == NEO::TestMode::AubTestsWithTbx) {
this->csr = NEO::TbxCommandStreamReceiver::create(strfilename.str(), true, *executionEnvironment, 0, neoDevice->getDeviceBitfield());
} else {

5
level_zero/core/test/aub_tests/fixtures/aub_fixture.h
View File

@@ -11,6 +11,8 @@
#include "shared/source/command_stream/command_stream_receiver_simulated_common_hw.h"
#include "shared/source/command_stream/command_stream_receiver_with_aub_dump.h"
#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
#include "shared/test/common/helpers/ult_hw_config.h"
#include "shared/test/common/helpers/variable_backup.h"
#include "level_zero/core/test/unit_tests/mock.h"
@@ -99,6 +101,9 @@ class AUBFixtureL0 {
}
}
std::string aubFileName;
std::unique_ptr<VariableBackup<NEO::UltHwConfig>> backupUltConfig;
const uint32_t rootDeviceIndex = 0;
NEO::ExecutionEnvironment *executionEnvironment;
NEO::MemoryManager *memoryManager = nullptr;