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

arch-vega: Fix clang comp error due to constant exp (#1183)

Browse Source 
The lines `constexpr int B_I = std::ceil(64.0f / (N * M / H));` caused
the following compilation error in clang Version 16:

```
error: constexpr variable 'B_I' must be initialized by a constant
expression
```

`std::ceil` is not a const expression. Therefore instances of this
expression in instructions.hh have been replaced with a constant
expression friendly alternative.

This is calling our compiler tests to fail:
https://github.com/gem5/gem5/actions/runs/9288296434/job/25559409142

Change-Id: I74da1dab08b335c59bdddef6581746a94107f370
This commit is contained in:
Bobby R. Bruce
2024-05-30 09:44:34 -07:00
committed by GitHub
parent efbfdeabd7
commit a0de33110b
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/arch/amdgpu/vega/insts/instructions.hh
View File

@@ -44202,7 +44202,15 @@ namespace VegaISA
// Output layout
constexpr int H = _delta == 2 ? 1 : 4;
constexpr int B_I = std::ceil(64.0f / (N * M / H));
// This replaces `constexpr int B_I = std::ceil(64.0f / (N * M / H));`
// which failed clang compiler tests as it's not a constant expression.
constexpr float B_I_f = 64.0f / (N * M / H);
constexpr int B_I =
(static_cast<float>(static_cast<int>(B_I_f)) == B_I_f)
? static_cast<int32_t>(B_I_f)
: static_cast<int32_t>(B_I_f) + ((B_I_f > 0) ? 1 : 0);
constexpr int M_I = (64 / B_I) / N;
constexpr int G = M / (H * M_I);
@@ -44431,7 +44439,14 @@ namespace VegaISA
// Output layout
constexpr int H = 4;
constexpr int B_I = std::ceil(64.0f / (N * M / H));
// This replaces `constexpr int B_I = std::ceil(64.0f / (N * M / H));`
// which failed clang compiler tests as it's not a constant expression.
constexpr float B_I_f = 64.0f / (N * M / H);
constexpr int B_I =
(static_cast<float>(static_cast<int>(B_I_f)) == B_I_f)
? static_cast<int32_t>(B_I_f)
: static_cast<int32_t>(B_I_f) + ((B_I_f > 0) ? 1 : 0);
constexpr int M_I = (64 / B_I) / N;
constexpr int G = M / (H * M_I);
@@ -44670,7 +44685,15 @@ namespace VegaISA
// Output layout
constexpr int H = 4;
constexpr int B_I = std::ceil(64.0f / (N * M / H));
// This replaces `constexpr int B_I = std::ceil(64.0f / (N * M / H));`
// which failed clang compiler tests as it's not a constant expression.
constexpr float B_I_f = 64.0f / (N * M / H);
constexpr int B_I =
(static_cast<float>(static_cast<int>(B_I_f)) == B_I_f)
? static_cast<int32_t>(B_I_f)
: static_cast<int32_t>(B_I_f) + ((B_I_f > 0) ? 1 : 0);
constexpr int M_I = (64 / B_I) / N;
constexpr int G = M / (H * M_I);