diff --git a/src/arch/hsail/insts/gpu_static_inst.hh b/src/arch/hsail/insts/gpu_static_inst.hh --- a/src/arch/hsail/insts/gpu_static_inst.hh +++ b/src/arch/hsail/insts/gpu_static_inst.hh @@ -54,7 +54,6 @@ public: HsailGPUStaticInst(const BrigObject *obj, const std::string &opcode); void generateDisassembly(); - const std::string &disassemble(); uint32_t instSize() { return 4; } protected: # Node ID d57db184b6485b918c533f3da9ca496e842cd5f4 # Parent 61a90ab5356e0ae7ce5d50586443bb6f95072714 diff --git a/src/arch/hsail/insts/gpu_static_inst.cc b/src/arch/hsail/insts/gpu_static_inst.cc --- a/src/arch/hsail/insts/gpu_static_inst.cc +++ b/src/arch/hsail/insts/gpu_static_inst.cc @@ -50,15 +50,4 @@ { disassembly = opcode; } - - const std::string& - HsailGPUStaticInst::disassemble() - { - if (disassembly.empty()) { - generateDisassembly(); - assert(!disassembly.empty()); - } - - return disassembly; - } } // namespace HsailISA diff --git a/src/gpu-compute/gpu_static_inst.hh b/src/gpu-compute/gpu_static_inst.hh --- a/src/gpu-compute/gpu_static_inst.hh +++ b/src/gpu-compute/gpu_static_inst.hh @@ -72,7 +72,7 @@ virtual void execute(GPUDynInstPtr gpuDynInst) = 0; virtual void generateDisassembly() = 0; - virtual const std::string &disassemble() = 0; + const std::string& disassemble(); virtual int getNumOperands() = 0; virtual bool isCondRegister(int operandIndex) = 0; virtual bool isScalarRegister(int operandIndex) = 0; diff --git a/src/gpu-compute/gpu_static_inst.cc b/src/gpu-compute/gpu_static_inst.cc --- a/src/gpu-compute/gpu_static_inst.cc +++ b/src/gpu-compute/gpu_static_inst.cc @@ -40,3 +40,13 @@ _instNum(0), _scalarOp(false) { } +const std::string& +GPUStaticInst::disassemble() +{ + if (disassembly.empty()) { + generateDisassembly(); + assert(!disassembly.empty()); + } + + return disassembly; +}