From 040c2e04568e2fe9ec07167f5300a3dcdfebb04e Mon Sep 17 00:00:00 2001 From: Apostolos Bartziokas Date: Thu, 26 Jul 2012 15:00:20 -0400 Subject: [PATCH] radeon/llvm: Cleanup AMDGPUUtil.cpp --- src/gallium/drivers/radeon/AMDGPUInstrInfo.h | 5 + src/gallium/drivers/radeon/AMDGPUUtil.cpp | 98 ------------------- src/gallium/drivers/radeon/AMDGPUUtil.h | 14 --- .../drivers/radeon/R600CodeEmitter.cpp | 14 +-- src/gallium/drivers/radeon/R600InstrInfo.cpp | 78 +++++++++++++++ src/gallium/drivers/radeon/R600InstrInfo.h | 5 + 6 files changed, 95 insertions(+), 119 deletions(-) diff --git a/src/gallium/drivers/radeon/AMDGPUInstrInfo.h b/src/gallium/drivers/radeon/AMDGPUInstrInfo.h index 5bf3e454e11..7232c0beeee 100644 --- a/src/gallium/drivers/radeon/AMDGPUInstrInfo.h +++ b/src/gallium/drivers/radeon/AMDGPUInstrInfo.h @@ -25,6 +25,11 @@ #define GET_INSTRINFO_ENUM #include "AMDGPUGenInstrInfo.inc" +#define MO_FLAG_CLAMP (1 << 0) +#define MO_FLAG_NEG (1 << 1) +#define MO_FLAG_ABS (1 << 2) +#define MO_FLAG_MASK (1 << 3) + namespace llvm { class AMDGPUTargetMachine; diff --git a/src/gallium/drivers/radeon/AMDGPUUtil.cpp b/src/gallium/drivers/radeon/AMDGPUUtil.cpp index 8ad4ed51c0a..4bbb5e0ce1b 100644 --- a/src/gallium/drivers/radeon/AMDGPUUtil.cpp +++ b/src/gallium/drivers/radeon/AMDGPUUtil.cpp @@ -24,104 +24,6 @@ using namespace llvm; -// Some instructions act as place holders to emulate operations that the GPU -// hardware does automatically. This function can be used to check if -// an opcode falls into this category. -bool AMDGPU::isPlaceHolderOpcode(unsigned opcode) -{ - switch (opcode) { - default: return false; - case AMDGPU::RETURN: - case AMDGPU::LAST: - case AMDGPU::MASK_WRITE: - case AMDGPU::RESERVE_REG: - return true; - } -} - -bool AMDGPU::isTransOp(unsigned opcode) -{ - switch(opcode) { - default: return false; - - case AMDGPU::COS_r600: - case AMDGPU::COS_eg: - case AMDGPU::MULLIT: - case AMDGPU::MUL_LIT_r600: - case AMDGPU::MUL_LIT_eg: - case AMDGPU::EXP_IEEE_r600: - case AMDGPU::EXP_IEEE_eg: - case AMDGPU::LOG_CLAMPED_r600: - case AMDGPU::LOG_IEEE_r600: - case AMDGPU::LOG_CLAMPED_eg: - case AMDGPU::LOG_IEEE_eg: - return true; - } -} - -bool AMDGPU::isTexOp(unsigned opcode) -{ - switch(opcode) { - default: return false; - case AMDGPU::TEX_LD: - case AMDGPU::TEX_GET_TEXTURE_RESINFO: - case AMDGPU::TEX_SAMPLE: - case AMDGPU::TEX_SAMPLE_C: - case AMDGPU::TEX_SAMPLE_L: - case AMDGPU::TEX_SAMPLE_C_L: - case AMDGPU::TEX_SAMPLE_LB: - case AMDGPU::TEX_SAMPLE_C_LB: - case AMDGPU::TEX_SAMPLE_G: - case AMDGPU::TEX_SAMPLE_C_G: - case AMDGPU::TEX_GET_GRADIENTS_H: - case AMDGPU::TEX_GET_GRADIENTS_V: - case AMDGPU::TEX_SET_GRADIENTS_H: - case AMDGPU::TEX_SET_GRADIENTS_V: - return true; - } -} - -bool AMDGPU::isReductionOp(unsigned opcode) -{ - switch(opcode) { - default: return false; - case AMDGPU::DOT4_r600: - case AMDGPU::DOT4_eg: - return true; - } -} - -bool AMDGPU::isCubeOp(unsigned opcode) -{ - switch(opcode) { - default: return false; - case AMDGPU::CUBE_r600: - case AMDGPU::CUBE_eg: - return true; - } -} - - -bool AMDGPU::isFCOp(unsigned opcode) -{ - switch(opcode) { - default: return false; - case AMDGPU::BREAK_LOGICALZ_f32: - case AMDGPU::BREAK_LOGICALNZ_i32: - case AMDGPU::BREAK_LOGICALZ_i32: - case AMDGPU::BREAK_LOGICALNZ_f32: - case AMDGPU::CONTINUE_LOGICALNZ_f32: - case AMDGPU::IF_LOGICALNZ_i32: - case AMDGPU::IF_LOGICALZ_f32: - case AMDGPU::ELSE: - case AMDGPU::ENDIF: - case AMDGPU::ENDLOOP: - case AMDGPU::IF_LOGICALNZ_f32: - case AMDGPU::WHILELOOP: - return true; - } -} - void AMDGPU::utilAddLiveIn(MachineFunction * MF, MachineRegisterInfo & MRI, const TargetInstrInfo * TII, diff --git a/src/gallium/drivers/radeon/AMDGPUUtil.h b/src/gallium/drivers/radeon/AMDGPUUtil.h index e8b02b1d24b..5ae95e7efce 100644 --- a/src/gallium/drivers/radeon/AMDGPUUtil.h +++ b/src/gallium/drivers/radeon/AMDGPUUtil.h @@ -22,20 +22,6 @@ class TargetInstrInfo; namespace AMDGPU { -bool isPlaceHolderOpcode(unsigned opcode); - -bool isTransOp(unsigned opcode); -bool isTexOp(unsigned opcode); -bool isReductionOp(unsigned opcode); -bool isCubeOp(unsigned opcode); -bool isFCOp(unsigned opcode); - -// XXX: Move these to AMDGPUInstrInfo.h -#define MO_FLAG_CLAMP (1 << 0) -#define MO_FLAG_NEG (1 << 1) -#define MO_FLAG_ABS (1 << 2) -#define MO_FLAG_MASK (1 << 3) - void utilAddLiveIn(MachineFunction * MF, MachineRegisterInfo & MRI, const TargetInstrInfo * TII, unsigned physReg, unsigned virtReg); diff --git a/src/gallium/drivers/radeon/R600CodeEmitter.cpp b/src/gallium/drivers/radeon/R600CodeEmitter.cpp index 06f8caa1df9..870d375b6e7 100644 --- a/src/gallium/drivers/radeon/R600CodeEmitter.cpp +++ b/src/gallium/drivers/radeon/R600CodeEmitter.cpp @@ -18,7 +18,6 @@ #include "AMDGPU.h" #include "AMDGPUCodeEmitter.h" -#include "AMDGPUUtil.h" #include "AMDGPUInstrInfo.h" #include "AMDILUtilityFunctions.h" #include "R600InstrInfo.h" @@ -48,6 +47,7 @@ private: const TargetMachine * TM; const MachineRegisterInfo * MRI; const R600RegisterInfo * TRI; + const R600InstrInfo * TII; bool IsCube; bool IsReduction; @@ -148,7 +148,7 @@ bool R600CodeEmitter::runOnMachineFunction(MachineFunction &MF) { TM = &MF.getTarget(); MRI = &MF.getRegInfo(); TRI = static_cast(TM->getRegisterInfo()); - const R600InstrInfo * TII = static_cast(TM->getInstrInfo()); + TII = static_cast(TM->getInstrInfo()); const AMDGPUSubtarget &STM = TM->getSubtarget(); std::string gpu = STM.getDeviceName(); @@ -162,15 +162,15 @@ bool R600CodeEmitter::runOnMachineFunction(MachineFunction &MF) { for (MachineBasicBlock::iterator I = MBB.begin(), E = MBB.end(); I != E; ++I) { MachineInstr &MI = *I; - IsReduction = AMDGPU::isReductionOp(MI.getOpcode()); + IsReduction = TII->isReductionOp(MI.getOpcode()); IsVector = TII->isVector(MI); - IsCube = AMDGPU::isCubeOp(MI.getOpcode()); + IsCube = TII->isCubeOp(MI.getOpcode()); if (MI.getNumOperands() > 1 && MI.getOperand(0).isReg() && MI.getOperand(0).isDead()) { continue; } - if (AMDGPU::isTexOp(MI.getOpcode())) { + if (TII->isTexOp(MI.getOpcode())) { EmitTexInstr(MI); - } else if (AMDGPU::isFCOp(MI.getOpcode())){ + } else if (TII->isFCOp(MI.getOpcode())){ EmitFCInstr(MI); } else if (IsReduction || IsVector || IsCube) { IsLast = false; @@ -238,7 +238,7 @@ void R600CodeEmitter::EmitALUInstr(MachineInstr &MI) // Some instructions are just place holder instructions that represent // operations that the GPU does automatically. They should be ignored. - if (AMDGPU::isPlaceHolderOpcode(MI.getOpcode())) { + if (TII->isPlaceHolderOpcode(MI.getOpcode())) { return; } diff --git a/src/gallium/drivers/radeon/R600InstrInfo.cpp b/src/gallium/drivers/radeon/R600InstrInfo.cpp index c09e61eb578..3c9e4eb1de6 100644 --- a/src/gallium/drivers/radeon/R600InstrInfo.cpp +++ b/src/gallium/drivers/radeon/R600InstrInfo.cpp @@ -99,6 +99,84 @@ bool R600InstrInfo::isMov(unsigned Opcode) const } } +// Some instructions act as place holders to emulate operations that the GPU +// hardware does automatically. This function can be used to check if +// an opcode falls into this category. +bool R600InstrInfo::isPlaceHolderOpcode(unsigned opcode) const +{ + switch (opcode) { + default: return false; + case AMDGPU::RETURN: + case AMDGPU::LAST: + case AMDGPU::MASK_WRITE: + case AMDGPU::RESERVE_REG: + return true; + } +} + +bool R600InstrInfo::isTexOp(unsigned opcode) const +{ + switch(opcode) { + default: return false; + case AMDGPU::TEX_LD: + case AMDGPU::TEX_GET_TEXTURE_RESINFO: + case AMDGPU::TEX_SAMPLE: + case AMDGPU::TEX_SAMPLE_C: + case AMDGPU::TEX_SAMPLE_L: + case AMDGPU::TEX_SAMPLE_C_L: + case AMDGPU::TEX_SAMPLE_LB: + case AMDGPU::TEX_SAMPLE_C_LB: + case AMDGPU::TEX_SAMPLE_G: + case AMDGPU::TEX_SAMPLE_C_G: + case AMDGPU::TEX_GET_GRADIENTS_H: + case AMDGPU::TEX_GET_GRADIENTS_V: + case AMDGPU::TEX_SET_GRADIENTS_H: + case AMDGPU::TEX_SET_GRADIENTS_V: + return true; + } +} + +bool R600InstrInfo::isReductionOp(unsigned opcode) const +{ + switch(opcode) { + default: return false; + case AMDGPU::DOT4_r600: + case AMDGPU::DOT4_eg: + return true; + } +} + +bool R600InstrInfo::isCubeOp(unsigned opcode) const +{ + switch(opcode) { + default: return false; + case AMDGPU::CUBE_r600: + case AMDGPU::CUBE_eg: + return true; + } +} + + +bool R600InstrInfo::isFCOp(unsigned opcode) const +{ + switch(opcode) { + default: return false; + case AMDGPU::BREAK_LOGICALZ_f32: + case AMDGPU::BREAK_LOGICALNZ_i32: + case AMDGPU::BREAK_LOGICALZ_i32: + case AMDGPU::BREAK_LOGICALNZ_f32: + case AMDGPU::CONTINUE_LOGICALNZ_f32: + case AMDGPU::IF_LOGICALNZ_i32: + case AMDGPU::IF_LOGICALZ_f32: + case AMDGPU::ELSE: + case AMDGPU::ENDIF: + case AMDGPU::ENDLOOP: + case AMDGPU::IF_LOGICALNZ_f32: + case AMDGPU::WHILELOOP: + return true; + } +} + DFAPacketizer *R600InstrInfo::CreateTargetScheduleState(const TargetMachine *TM, const ScheduleDAG *DAG) const { diff --git a/src/gallium/drivers/radeon/R600InstrInfo.h b/src/gallium/drivers/radeon/R600InstrInfo.h index f6afee3a979..72ea1515086 100644 --- a/src/gallium/drivers/radeon/R600InstrInfo.h +++ b/src/gallium/drivers/radeon/R600InstrInfo.h @@ -44,6 +44,11 @@ namespace llvm { bool KillSrc) const; bool isTrig(const MachineInstr &MI) const; + bool isPlaceHolderOpcode(unsigned opcode) const; + bool isTexOp(unsigned opcode) const; + bool isReductionOp(unsigned opcode) const; + bool isCubeOp(unsigned opcode) const; + bool isFCOp(unsigned opcode) const; /// isVector - Vector instructions are instructions that must fill all /// instruction slots within an instruction group. -- 2.30.2