summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Potter <brandon.potter@amd.com>2017-02-27 13:18:38 -0500
committerBrandon Potter <brandon.potter@amd.com>2017-02-27 13:18:38 -0500
commit833fb10ed48ea3bcd7dff5ae0768a119db415f4e (patch)
treec0d86a44ffd8488c3cf2199f0cbebf277db20fa4
parent8d2c3735d9ccb36341a31a86d82907b31edd52ef (diff)
downloadgem5-833fb10ed48ea3bcd7dff5ae0768a119db415f4e.tar.xz
gpu-compute: mark functions with override if replacing virtual
The clang compiler is more stringent than the recent versions of GCC when dealing with overrides. This changeset adds the specifier to the methods which need it to silence the compiler.
-rw-r--r--src/arch/hsail/insts/gpu_static_inst.hh2
-rw-r--r--src/gpu-compute/gpu_static_inst.hh24
2 files changed, 13 insertions, 13 deletions
diff --git a/src/arch/hsail/insts/gpu_static_inst.hh b/src/arch/hsail/insts/gpu_static_inst.hh
index bb40411ed..0bddcac80 100644
--- a/src/arch/hsail/insts/gpu_static_inst.hh
+++ b/src/arch/hsail/insts/gpu_static_inst.hh
@@ -54,7 +54,7 @@ namespace HsailISA
{
public:
HsailGPUStaticInst(const BrigObject *obj, const std::string &opcode);
- void generateDisassembly();
+ void generateDisassembly() override;
int instSize() const override { return sizeof(RawMachInst); }
bool isValid() const override { return true; }
diff --git a/src/gpu-compute/gpu_static_inst.hh b/src/gpu-compute/gpu_static_inst.hh
index 372eee8df..23a14f5a7 100644
--- a/src/gpu-compute/gpu_static_inst.hh
+++ b/src/gpu-compute/gpu_static_inst.hh
@@ -271,24 +271,24 @@ class KernelLaunchStaticInst : public GPUStaticInst
}
void
- execute(GPUDynInstPtr gpuDynInst)
+ execute(GPUDynInstPtr gpuDynInst) override
{
fatal("kernel launch instruction should not be executed\n");
}
void
- generateDisassembly()
+ generateDisassembly() override
{
disassembly = opcode;
}
- int getNumOperands() { return 0; }
- bool isCondRegister(int operandIndex) { return false; }
- bool isScalarRegister(int operandIndex) { return false; }
- bool isVectorRegister(int operandIndex) { return false; }
- bool isSrcOperand(int operandIndex) { return false; }
- bool isDstOperand(int operandIndex) { return false; }
- int getOperandSize(int operandIndex) { return 0; }
+ int getNumOperands() override { return 0; }
+ bool isCondRegister(int operandIndex) override { return false; }
+ bool isScalarRegister(int operandIndex) override { return false; }
+ bool isVectorRegister(int operandIndex) override { return false; }
+ bool isSrcOperand(int operandIndex) override { return false; }
+ bool isDstOperand(int operandIndex) override { return false; }
+ int getOperandSize(int operandIndex) override { return 0; }
int
getRegisterIndex(int operandIndex, GPUDynInstPtr gpuDynInst) override
@@ -296,9 +296,9 @@ class KernelLaunchStaticInst : public GPUStaticInst
return 0;
}
- int numDstRegOperands() { return 0; }
- int numSrcRegOperands() { return 0; }
- bool isValid() const { return true; }
+ int numDstRegOperands() override { return 0; }
+ int numSrcRegOperands() override { return 0; }
+ bool isValid() const override { return true; }
int instSize() const override { return 0; }
};