intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-19 06:24:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix convert timestamp to use double values

Browse Source 
to avoid division by 0
Resolves: HSD-18025033373
Signed-off-by: Cencelewska, Katarzyna <katarzyna.cencelewska@intel.com>
This commit is contained in:
Cencelewska, Katarzyna
2022-10-31 11:05:26 +00:00
committed by Compute-Runtime-Automation
parent 7f38c5e633
commit a094a9bafe
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
shared/source/os_interface/windows/device_time_wddm.cpp
View File

@@ -73,10 +73,9 @@ uint64_t DeviceTimeWddm::getDynamicDeviceTimerClock(HardwareInfo const &hwInfo)
void DeviceTimeWddm::convertTimestampsFromOaToCsDomain(HardwareInfo const &hwInfo, uint64_t &timestampData, uint64_t freqOA, uint64_t freqCS) {
auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
if (hwHelper.isTimestampShiftRequired() && freqCS > 0) {
auto freqRatio = freqOA / freqCS;
timestampData /= freqRatio;
if (hwHelper.isTimestampShiftRequired() && freqCS > 0 && freqOA > 0) {
auto freqRatio = static_cast<double>(freqOA) / static_cast<double>(freqCS);
timestampData = static_cast<uint64_t>(timestampData / freqRatio);
}
};
} // namespace NEO

31
shared/test/unit_test/device/windows/neo_device_windows_tests.cpp
View File

@@ -87,7 +87,7 @@ class TestMockHwHelper : public HwHelperHw<GfxFamily> {
uint32_t shiftRequired = true;
};
HWTEST_F(MockOSTimeWinTest, whenConvertingTimestampsToCsDomainThenTimestampDataAreSetCorrectly) {
HWTEST_F(MockOSTimeWinTest, whenConvertingTimestampsToCsDomainThenTimestampDataAreConvertedCorrectly) {
MockExecutionEnvironment executionEnvironment;
RootDeviceEnvironment rootDeviceEnvironment(executionEnvironment);
auto wddmMock = new WddmMock(rootDeviceEnvironment);
@@ -97,19 +97,32 @@ HWTEST_F(MockOSTimeWinTest, whenConvertingTimestampsToCsDomainThenTimestampDataA
RAIIHwHelperFactory<TestMockHwHelper<FamilyType>> hwHelperBackup{hwInfo->platform.eRenderCoreFamily};
std::unique_ptr<MockOSTimeWin> timeWin(new MockOSTimeWin(wddmMock));
uint64_t timestampData = 0x1234;
uint64_t freqOA = 1;
uint64_t freqCS = 0;
uint64_t freqOA = 5;
uint64_t freqCS = 2;
double ratio = static_cast<double>(freqOA) / static_cast<double>(freqCS);
auto expectedGpuTicksWhenOAfreqBiggerThanCSfreq = static_cast<uint64_t>(timestampData / ratio);
timeWin->convertTimestampsFromOaToCsDomain(*hwInfo, timestampData, freqOA, freqCS);
EXPECT_EQ(expectedGpuTicksWhenOAfreqBiggerThanCSfreq, timestampData);
freqOA = 2;
freqCS = 5;
ratio = static_cast<double>(freqCS) / static_cast<double>(freqOA);
auto expectedGpuTicksWhenCSfreqBiggerThanOAfreq = static_cast<uint64_t>(timestampData * ratio);
timeWin->convertTimestampsFromOaToCsDomain(*hwInfo, timestampData, freqOA, freqCS);
EXPECT_EQ(expectedGpuTicksWhenCSfreqBiggerThanOAfreq, timestampData);
freqOA = 1;
freqCS = 0;
auto expectedGpuTicksWhenNotChange = timestampData;
timeWin->convertTimestampsFromOaToCsDomain(*hwInfo, timestampData, freqOA, freqCS);
EXPECT_EQ(expectedGpuTicksWhenNotChange, timestampData);
freqOA = 1;
freqCS = 1;
timeWin->convertTimestampsFromOaToCsDomain(*hwInfo, timestampData, freqOA, freqCS);
EXPECT_EQ(expectedGpuTicksWhenNotChange, timestampData);
freqOA = 2;
uint64_t ratio = freqOA / freqCS;
auto expectedGpuTicksWhenRatioBiggerThanOne = timestampData / ratio;
freqOA = 0;
freqCS = 1;
timeWin->convertTimestampsFromOaToCsDomain(*hwInfo, timestampData, freqOA, freqCS);
EXPECT_EQ(expectedGpuTicksWhenRatioBiggerThanOne, timestampData);
EXPECT_EQ(expectedGpuTicksWhenNotChange, timestampData);
hwHelperBackup.mockHwHelper.shiftRequired = false;
freqOA = 1;
@@ -117,10 +130,12 @@ HWTEST_F(MockOSTimeWinTest, whenConvertingTimestampsToCsDomainThenTimestampDataA
expectedGpuTicksWhenNotChange = timestampData;
timeWin->convertTimestampsFromOaToCsDomain(*hwInfo, timestampData, freqOA, freqCS);
EXPECT_EQ(expectedGpuTicksWhenNotChange, timestampData);
freqOA = 0;
freqCS = 1;
timeWin->convertTimestampsFromOaToCsDomain(*hwInfo, timestampData, freqOA, freqCS);
EXPECT_EQ(expectedGpuTicksWhenNotChange, timestampData);
freqOA = 2;
freqCS = 1;
timeWin->convertTimestampsFromOaToCsDomain(*hwInfo, timestampData, freqOA, freqCS);
EXPECT_EQ(expectedGpuTicksWhenNotChange, timestampData);
}
}