refactor: use legacy versions of injectMMIOList and setTbxServerIp

Related-To: NEO-7539
Signed-off-by: Pawel Cieslak <pawel.cieslak@intel.com>
This commit is contained in:
Pawel Cieslak
2024-05-14 16:26:05 +00:00
committed by Compute-Runtime-Automation
parent 03d87d27ef
commit 84ba633098
5 changed files with 8 additions and 8 deletions

View File

@@ -44,7 +44,7 @@ AubCenter::AubCenter(const RootDeviceEnvironment &rootDeviceEnvironment, bool lo
extraMmioList.insert(extraMmioList.end(), debugMmioList.begin(), debugMmioList.end());
aub_stream::injectMMIOList(extraMmioList);
aub_stream::injectMMIOListLegacy(extraMmioList);
AubHelper::setTbxConfiguration();
aub_stream::setAubStreamCaller(aub_stream::caller::neo);

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021-2023 Intel Corporation
* Copyright (C) 2021-2024 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -14,7 +14,7 @@
namespace NEO {
void AubHelper::setTbxConfiguration() {
aub_stream::setTbxServerIp(debugManager.flags.TbxServer.get());
aub_stream::setTbxServerIpLegacy(debugManager.flags.TbxServer.get());
aub_stream::setTbxServerPort(debugManager.flags.TbxPort.get());
aub_stream::setTbxFrontdoorMode(debugManager.flags.TbxFrontdoorMode.get());
}

View File

@@ -12,9 +12,9 @@
namespace aub_stream {
extern "C" {
void injectMMIOList(MMIOList mmioList){};
void injectMMIOListLegacy(MMIOList mmioList){};
void setTbxServerPort(uint16_t port){};
void setTbxServerIp(std::string server){};
void setTbxServerIpLegacy(std::string server){};
void setTbxFrontdoorMode(bool frontdoor){};
void setAubStreamCaller(uint32_t caller){};
}

View File

@@ -34,7 +34,7 @@ void BaseUltConfigListener::OnTestEnd(const ::testing::TestInfo &) {
if (enableAlarm) {
EXPECT_LT(std::chrono::duration_cast<std::chrono::milliseconds>(testEnd - testStart).count(), testCaseMaxTimeInMs);
}
aub_stream::injectMMIOList(aub_stream::MMIOList{});
aub_stream::injectMMIOListLegacy(aub_stream::MMIOList{});
#undef DECLARE_DEBUG_VARIABLE
#define DECLARE_DEBUG_VARIABLE(dataType, variableName, defaultValue, description) \

View File

@@ -16,14 +16,14 @@ aub_stream::MMIOList mmioListInjected;
namespace aub_stream {
void injectMMIOList(MMIOList mmioList) {
void injectMMIOListLegacy(MMIOList mmioList) {
aub_stream_stubs::mmioListInjected = mmioList;
aub_stream_stubs::mmioListInjected.shrink_to_fit();
}
void setTbxServerPort(uint16_t port) {
aub_stream_stubs::tbxServerPort = port;
}
void setTbxServerIp(std::string server) {
void setTbxServerIpLegacy(std::string server) {
// better to avoid reassigning global variables which assume memory allocations since
// we could step into false-positive memory leak detection with embedded leak check helper
if (aub_stream_stubs::tbxServerIp != server) {