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

arch-vega: Issue flat insts using on executedAs()

Browse Source 
Similar to the flags issue in the previous patch, the FlatGlobal flag
does not exist. Change all of the flat instructions to use the same
issue logic as GCN3. A helper function is also added as loads and stores
use the same interface. The helper function can be more easily updated
to support global and scratch subtypes of flat instructions.

Change-Id: I394f1d4c59b029201fe2f6075c9dedb3a37dbe31
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/50827
Reviewed-by: Matt Sinclair <mattdsinclair@gmail.com>
Reviewed-by: Kyle Roarty <kyleroarty1716@gmail.com>
Maintainer: Matt Sinclair <mattdsinclair@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Matthew Poremba
2021-09-22 12:42:53 -05:00
parent 753a2c8aac
commit dca86ddb8d
2 changed files with 36 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
src/arch/amdgpu/vega/insts/instructions.cc
View File

@@ -42814,12 +42814,7 @@ namespace VegaISA
calcAddr(gpuDynInst, addr, instData.OFFSET);
if (isFlatGlobal()) {
gpuDynInst->computeUnit()->globalMemoryPipe
.issueRequest(gpuDynInst);
} else {
fatal("Non global flat instructions not implemented yet.\n");
}
issueRequestHelper(gpuDynInst);
} // execute
void
@@ -42907,12 +42902,7 @@ namespace VegaISA
calcAddr(gpuDynInst, addr, instData.OFFSET);
if (isFlatGlobal()) {
gpuDynInst->computeUnit()->globalMemoryPipe
.issueRequest(gpuDynInst);
} else {
fatal("Non global flat instructions not implemented yet.\n");
}
issueRequestHelper(gpuDynInst);
} // execute
void
@@ -43001,12 +42991,7 @@ namespace VegaISA
calcAddr(gpuDynInst, addr, instData.OFFSET);
if (isFlatGlobal()) {
gpuDynInst->computeUnit()->globalMemoryPipe
.issueRequest(gpuDynInst);
} else {
fatal("Non global flat instructions not implemented yet.\n");
}
issueRequestHelper(gpuDynInst);
} // execute
void
@@ -43065,12 +43050,7 @@ namespace VegaISA
calcAddr(gpuDynInst, addr, instData.OFFSET);
if (isFlatGlobal()) {
gpuDynInst->computeUnit()->globalMemoryPipe
.issueRequest(gpuDynInst);
} else {
fatal("Non global flat instructions not implemented yet.\n");
}
issueRequestHelper(gpuDynInst);
} // execute
void
@@ -43129,12 +43109,7 @@ namespace VegaISA
calcAddr(gpuDynInst, addr, instData.OFFSET);
if (isFlatGlobal()) {
gpuDynInst->computeUnit()->globalMemoryPipe
.issueRequest(gpuDynInst);
} else {
fatal("Non global flat instructions not implemented yet.\n");
}
issueRequestHelper(gpuDynInst);
} // execute
void
@@ -43202,12 +43177,7 @@ namespace VegaISA
calcAddr(gpuDynInst, addr, instData.OFFSET);
if (isFlatGlobal()) {
gpuDynInst->computeUnit()->globalMemoryPipe
.issueRequest(gpuDynInst);
} else {
fatal("Non global flat instructions not implemented yet.\n");
}
issueRequestHelper(gpuDynInst);
} // execute
void
@@ -43279,7 +43249,6 @@ namespace VegaISA
addr.read();
data.read();
calcAddr(gpuDynInst, addr, instData.OFFSET);
for (int lane = 0; lane < NumVecElemPerVecReg; ++lane) {
@@ -43289,12 +43258,7 @@ namespace VegaISA
}
}
if (isFlatGlobal()) {
gpuDynInst->computeUnit()->globalMemoryPipe
.issueRequest(gpuDynInst);
} else {
fatal("Non global flat instructions not implemented yet.\n");
}
issueRequestHelper(gpuDynInst);
} // execute
void
@@ -43353,12 +43317,7 @@ namespace VegaISA
}
}
if (isFlatGlobal()) {
gpuDynInst->computeUnit()->globalMemoryPipe
.issueRequest(gpuDynInst);
} else {
fatal("Non global flat instructions not implemented yet.\n");
}
issueRequestHelper(gpuDynInst);
} // execute
void
@@ -43417,12 +43376,7 @@ namespace VegaISA
}
}
if (isFlatGlobal()) {
gpuDynInst->computeUnit()->globalMemoryPipe
.issueRequest(gpuDynInst);
} else {
fatal("Non global flat instructions not implemented yet.\n");
}
issueRequestHelper(gpuDynInst);
} // execute
void
@@ -43473,6 +43427,8 @@ namespace VegaISA
addr.read();
data.read();
calcAddr(gpuDynInst, addr, instData.OFFSET);
for (int lane = 0; lane < NumVecElemPerVecReg; ++lane) {
if (gpuDynInst->exec_mask[lane]) {
(reinterpret_cast<VecElemU64*>(gpuDynInst->d_data))[lane]
@@ -43480,14 +43436,7 @@ namespace VegaISA
}
}
calcAddr(gpuDynInst, addr, instData.OFFSET);
if (isFlatGlobal()) {
gpuDynInst->computeUnit()->globalMemoryPipe
.issueRequest(gpuDynInst);
} else {
fatal("Non global flat instructions not implemented yet.\n");
}
issueRequestHelper(gpuDynInst);
} // execute
void
@@ -43555,12 +43504,7 @@ namespace VegaISA
}
}
if (isFlatGlobal()) {
gpuDynInst->computeUnit()->globalMemoryPipe
.issueRequest(gpuDynInst);
} else {
fatal("Non global flat instructions not implemented yet.\n");
}
issueRequestHelper(gpuDynInst);
} // execute
void
@@ -43632,13 +43576,7 @@ namespace VegaISA
}
}
if (isFlatGlobal()) {
gpuDynInst->computeUnit()->globalMemoryPipe
.issueRequest(gpuDynInst);
} else {
fatal("Non global flat instructions not implemented yet.\n");
}
issueRequestHelper(gpuDynInst);
} // execute
void
@@ -43704,12 +43642,7 @@ namespace VegaISA
}
}
if (isFlatGlobal()) {
gpuDynInst->computeUnit()->globalMemoryPipe.
issueRequest(gpuDynInst);
} else {
fatal("Non global flat instructions not implemented yet.\n");
}
issueRequestHelper(gpuDynInst);
} // execute
void
@@ -43795,12 +43728,7 @@ namespace VegaISA
}
}
if (isFlatGlobal()) {
gpuDynInst->computeUnit()->globalMemoryPipe.
issueRequest(gpuDynInst);
} else {
fatal("Non global flat instructions not implemented yet.\n");
}
issueRequestHelper(gpuDynInst);
} // execute
void
@@ -43870,6 +43798,7 @@ namespace VegaISA
data.read();
calcAddr(gpuDynInst, addr, instData.OFFSET);
for (int lane = 0; lane < NumVecElemPerVecReg; ++lane) {
if (gpuDynInst->exec_mask[lane]) {
(reinterpret_cast<VecElemU32*>(gpuDynInst->a_data))[lane]
@@ -43877,12 +43806,7 @@ namespace VegaISA
}
}
if (isFlatGlobal()) {
gpuDynInst->computeUnit()->globalMemoryPipe.
issueRequest(gpuDynInst);
} else {
fatal("Non global flat instructions not implemented yet.\n");
}
issueRequestHelper(gpuDynInst);
} // execute
void
@@ -44265,6 +44189,8 @@ namespace VegaISA
data.read();
cmp.read();
calcAddr(gpuDynInst, addr, instData.OFFSET);
for (int lane = 0; lane < NumVecElemPerVecReg; ++lane) {
if (gpuDynInst->exec_mask[lane]) {
(reinterpret_cast<VecElemU64*>(gpuDynInst->x_data))[lane]
@@ -44274,14 +44200,7 @@ namespace VegaISA
}
}
calcAddr(gpuDynInst, addr, instData.OFFSET);
if (isFlatGlobal()) {
gpuDynInst->computeUnit()->globalMemoryPipe.
issueRequest(gpuDynInst);
} else {
fatal("Non global flat instructions not implemented yet.\n");
}
issueRequestHelper(gpuDynInst);
} // execute
void
@@ -44360,12 +44279,7 @@ namespace VegaISA
}
}
if (isFlatGlobal()) {
gpuDynInst->computeUnit()->globalMemoryPipe.
issueRequest(gpuDynInst);
} else {
fatal("Non global flat instructions not implemented yet.\n");
}
issueRequestHelper(gpuDynInst);
} // execute
void

14
src/arch/amdgpu/vega/insts/op_encodings.hh
View File

@@ -804,6 +804,20 @@ namespace VegaISA
gpuDynInst->resolveFlatSegment(gpuDynInst->exec_mask);
}
void
issueRequestHelper(GPUDynInstPtr gpuDynInst)
{
if (gpuDynInst->executedAs() == enums::SC_GLOBAL) {
gpuDynInst->computeUnit()->globalMemoryPipe
.issueRequest(gpuDynInst);
} else if (gpuDynInst->executedAs() == enums::SC_GROUP) {
gpuDynInst->computeUnit()->localMemoryPipe
.issueRequest(gpuDynInst);
} else {
fatal("Unsupported scope for flat instruction.\n");
}
}
// first instruction DWORD
InFmt_FLAT instData;
// second instruction DWORD