summaryrefslogtreecommitdiff
path: root/src/gpu-compute
diff options
context:
space:
mode:
authorTony Gutierrez <anthony.gutierrez@amd.com>2016-10-26 22:48:45 -0400
committerTony Gutierrez <anthony.gutierrez@amd.com>2016-10-26 22:48:45 -0400
commit74249f80df4e6128da38dfb5dbf5f61285c673a2 (patch)
treebf03a3c62b5a3e5f3f363edd5b56d399758b003a /src/gpu-compute
parentdc16c1ceb806135dddb8c79ef4d5ecf1336f21bc (diff)
downloadgem5-74249f80df4e6128da38dfb5dbf5f61285c673a2.tar.xz
hsail,gpu-compute: fixes to appease clang++
fixes to appease clang++. tested on: Ubuntu clang version 3.5.0-4ubuntu2~trusty2 (tags/RELEASE_350/final) (based on LLVM 3.5.0) Ubuntu clang version 3.6.0-2ubuntu1~trusty1 (tags/RELEASE_360/final) (based on LLVM 3.6.0) the fixes address the following five issues: 1) the exec continuations in gpu_static_inst.hh were marked as protected when they should be public. here we mark them as public 2) the Abs instruction uses std::abs() in its execute method. because Abs is templated, it can also operate on U32 and U64, types, which cause Abs::execute() to pass uint32_t and uint64_t types to std::abs() respectively. this triggers a warning because std::abs() has no effect in this case. to rememdy this we add template specialization for the execute() method of Abs when its template paramter is U32 or U64. 3) Some potocols that utilize the code in cprintf.hh were missing includes to BoolVec.hh, which defines operator<< for the BoolVec type. This would cause issues when the generated code would try to pass a BoolVec type to a method in cprintf.hh that used operator<< on an instance of a BoolVec. 4) Surprise, clang doesn't like it when you clobber all the bits in a newly allocated object. I.e., this code: tlb = new GpuTlbEntry\[size\]; std::memset(tlb, 0, sizeof(GpuTlbEntry) \* size); Let's use std::vector to track the TLB entries in the GpuTlb now... 5) There were a few variables used only in DPRINTFs, so we mark them with M5_VAR_USED.
Diffstat (limited to 'src/gpu-compute')
-rw-r--r--src/gpu-compute/gpu_static_inst.hh2
-rw-r--r--src/gpu-compute/gpu_tlb.cc10
-rw-r--r--src/gpu-compute/gpu_tlb.hh2
3 files changed, 5 insertions, 9 deletions
diff --git a/src/gpu-compute/gpu_static_inst.hh b/src/gpu-compute/gpu_static_inst.hh
index e851c52e6..372eee8df 100644
--- a/src/gpu-compute/gpu_static_inst.hh
+++ b/src/gpu-compute/gpu_static_inst.hh
@@ -221,7 +221,6 @@ class GPUStaticInst : public GPUStaticInstFlags
void setFlag(Flags flag) { _flags[flag] = true; }
- protected:
virtual void
execLdAcq(GPUDynInstPtr gpuDynInst)
{
@@ -246,6 +245,7 @@ class GPUStaticInst : public GPUStaticInstFlags
fatal("calling execAtomicAcq() on a non-atomic instruction.\n");
}
+ protected:
const std::string opcode;
std::string disassembly;
int _instNum;
diff --git a/src/gpu-compute/gpu_tlb.cc b/src/gpu-compute/gpu_tlb.cc
index 2021af9a9..1f1a4cc61 100644
--- a/src/gpu-compute/gpu_tlb.cc
+++ b/src/gpu-compute/gpu_tlb.cc
@@ -71,16 +71,15 @@ namespace X86ISA
accessDistance = p->accessDistance;
clock = p->clk_domain->clockPeriod();
- tlb = new GpuTlbEntry[size];
- std::memset(tlb, 0, sizeof(GpuTlbEntry) * size);
+ tlb.assign(size, GpuTlbEntry());
freeList.resize(numSets);
entryList.resize(numSets);
for (int set = 0; set < numSets; ++set) {
for (int way = 0; way < assoc; ++way) {
- int x = set*assoc + way;
- freeList[set].push_back(&tlb[x]);
+ int x = set * assoc + way;
+ freeList[set].push_back(&tlb.at(x));
}
}
@@ -133,9 +132,6 @@ namespace X86ISA
{
// make sure all the hash-maps are empty
assert(translationReturnEvent.empty());
-
- // delete the TLB
- delete[] tlb;
}
BaseSlavePort&
diff --git a/src/gpu-compute/gpu_tlb.hh b/src/gpu-compute/gpu_tlb.hh
index 3549c598b..9c1a7b326 100644
--- a/src/gpu-compute/gpu_tlb.hh
+++ b/src/gpu-compute/gpu_tlb.hh
@@ -170,7 +170,7 @@ namespace X86ISA
*/
bool accessDistance;
- GpuTlbEntry *tlb;
+ std::vector<GpuTlbEntry> tlb;
/*
* It's a per-set list. As long as we have not reached