derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arch-vega: Fix GCC 13 build errors (#1162)

Browse Source 
The new static analysis in GCC 13 finds issues with operand.hh. This
commit fixes the error so that gem5 compiles when BUILD_GPU is true.

Change-Id: I6f4b0d350f0cabb6e356de20a46e1ca65fd0da55
This commit is contained in:
Matthew Poremba
2024-05-28 07:58:28 -07:00
committed by GitHub
parent 10dbfb8bb7
commit 1dfaa224ff
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/arch/amdgpu/vega/operand.hh
View File

@@ -514,6 +514,29 @@ namespace VegaISA
{
assert(NumDwords == 1 || NumDwords == 2);
if (_opIdx >= REG_INT_CONST_POS_MIN &&
_opIdx <= REG_INT_CONST_NEG_MAX) {
assert(sizeof(DataType) <= sizeof(srfData));
DataType misc_val(0);
assert(isConstVal(_opIdx));
misc_val = (DataType)_gpuDynInst
->readConstVal<DataType>(_opIdx);
std::memcpy((void*)srfData.data(), (void*)&misc_val,
sizeof(DataType));
return;
}
if (_opIdx == REG_M0 || _opIdx == REG_ZERO || _opIdx == REG_SCC) {
assert(sizeof(DataType) <= sizeof(srfData));
DataType misc_val(0);
misc_val = (DataType)_gpuDynInst->readMiscReg(_opIdx);
std::memcpy((void*)srfData.data(), (void*)&misc_val,
sizeof(DataType));
return;
}
switch(_opIdx) {
case REG_EXEC_LO:
{
@@ -682,18 +705,8 @@ namespace VegaISA
}
break;
default:
{
assert(sizeof(DataType) <= sizeof(srfData));
DataType misc_val(0);
if (isConstVal(_opIdx)) {
misc_val = (DataType)_gpuDynInst
->readConstVal<DataType>(_opIdx);
} else {
misc_val = (DataType)_gpuDynInst->readMiscReg(_opIdx);
}
std::memcpy((void*)srfData.data(), (void*)&misc_val,
sizeof(DataType));
}
panic("Invalid special register index: %d\n", _opIdx);
break;
}
}