[gem5-dev] changeset in gem5: gpu-compute: mark functions with override if ...

[Brandon Potter]

changeset 68dd3c3349aa in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=68dd3c3349aa
description:
        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.

diffstat:

 src/arch/hsail/insts/gpu_static_inst.hh |   2 +-
 src/gpu-compute/gpu_static_inst.hh      |  24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diffs (62 lines):

diff -r f0a07f1e8ee2 -r 68dd3c3349aa src/arch/hsail/insts/gpu_static_inst.hh
--- a/src/arch/hsail/insts/gpu_static_inst.hh   Mon Feb 27 12:06:00 2017 +0000
+++ b/src/arch/hsail/insts/gpu_static_inst.hh   Mon Feb 27 13:18:38 2017 -0500
@@ -54,7 +54,7 @@
     {
       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 -r f0a07f1e8ee2 -r 68dd3c3349aa src/gpu-compute/gpu_static_inst.hh
--- a/src/gpu-compute/gpu_static_inst.hh        Mon Feb 27 12:06:00 2017 +0000
+++ b/src/gpu-compute/gpu_static_inst.hh        Mon Feb 27 13:18:38 2017 -0500
@@ -271,24 +271,24 @@
     }
 
     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 @@
         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; }
 };
 
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev