Re: [Mesa-dev] [PATCH 1/3] R600: Emit used GPRs count

2013-04-11 Thread Tom Stellard 
On Wed, Apr 10, 2013 at 11:04:20PM +0200, Vincent Lejeune wrote:
 ---

Reviewed-by: Tom Stellard thomas.stell...@amd.com

  lib/Target/R600/AMDGPUAsmPrinter.cpp | 35 +--
  lib/Target/R600/AMDGPUAsmPrinter.h   |  3 ++-
  2 files changed, 35 insertions(+), 3 deletions(-)
 
 diff --git a/lib/Target/R600/AMDGPUAsmPrinter.cpp 
 b/lib/Target/R600/AMDGPUAsmPrinter.cpp
 index dacb033..580cfb4 100644
 --- a/lib/Target/R600/AMDGPUAsmPrinter.cpp
 +++ b/lib/Target/R600/AMDGPUAsmPrinter.cpp
 @@ -21,6 +21,7 @@
  #include AMDGPU.h
  #include SIMachineFunctionInfo.h
  #include SIRegisterInfo.h
 +#include R600RegisterInfo.h
  #include llvm/MC/MCStreamer.h
  #include llvm/Support/TargetRegistry.h
  #include llvm/Target/TargetLoweringObjectFile.h
 @@ -52,13 +53,43 @@ bool 
 AMDGPUAsmPrinter::runOnMachineFunction(MachineFunction MF) {
}
OutStreamer.SwitchSection(getObjFileLowering().getTextSection());
if (STM.device()-getGeneration()  AMDGPUDeviceInfo::HD6XXX) {
 -EmitProgramInfo(MF);
 +EmitProgramInfoSI(MF);
 +  } else {
 +EmitProgramInfoR600(MF);
}
EmitFunctionBody();
return false;
  }
  
 -void AMDGPUAsmPrinter::EmitProgramInfo(MachineFunction MF) {
 +void AMDGPUAsmPrinter::EmitProgramInfoR600(MachineFunction MF) {
 +  unsigned MaxGPR = 0;
 +  const R600RegisterInfo * RI =
 +static_castconst R600RegisterInfo*(TM.getRegisterInfo());
 +
 +  for (MachineFunction::iterator BB = MF.begin(), BB_E = MF.end();
 +  BB != BB_E; ++BB) {
 +MachineBasicBlock MBB = *BB;
 +for (MachineBasicBlock::iterator I = MBB.begin(), E = MBB.end();
 +I != E; ++I) {
 +  MachineInstr MI = *I;
 +  unsigned numOperands = MI.getNumOperands();
 +  for (unsigned op_idx = 0; op_idx  numOperands; op_idx++) {
 +MachineOperand  MO = MI.getOperand(op_idx);
 +if (!MO.isReg())
 +  continue;
 +unsigned HWReg = RI-getEncodingValue(MO.getReg())  0xff;
 +
 +// Register with value  127 aren't GPR
 +if (HWReg  127)
 +  continue;
 +MaxGPR = std::max(MaxGPR, HWReg);
 +  }
 +}
 +  }
 +  OutStreamer.EmitIntValue(MaxGPR + 1, 4);
 +}
 +
 +void AMDGPUAsmPrinter::EmitProgramInfoSI(MachineFunction MF) {
unsigned MaxSGPR = 0;
unsigned MaxVGPR = 0;
bool VCCUsed = false;
 diff --git a/lib/Target/R600/AMDGPUAsmPrinter.h 
 b/lib/Target/R600/AMDGPUAsmPrinter.h
 index 3812282..f425ef4 100644
 --- a/lib/Target/R600/AMDGPUAsmPrinter.h
 +++ b/lib/Target/R600/AMDGPUAsmPrinter.h
 @@ -33,7 +33,8 @@ public:
  
/// \brief Emit register usage information so that the GPU driver
/// can correctly setup the GPU state.
 -  void EmitProgramInfo(MachineFunction MF);
 +  void EmitProgramInfoR600(MachineFunction MF);
 +  void EmitProgramInfoSI(MachineFunction MF);
  
/// Implemented in AMDGPUMCInstLower.cpp
virtual void EmitInstruction(const MachineInstr *MI);
 -- 
 1.8.1.4
 
 ___
 mesa-dev mailing list
 mesa-dev@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 1/3] R600: Emit used GPRs count

2013-04-10 Thread Vincent Lejeune 
---
 lib/Target/R600/AMDGPUAsmPrinter.cpp | 35 +--
 lib/Target/R600/AMDGPUAsmPrinter.h   |  3 ++-
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/lib/Target/R600/AMDGPUAsmPrinter.cpp 
b/lib/Target/R600/AMDGPUAsmPrinter.cpp
index dacb033..580cfb4 100644
--- a/lib/Target/R600/AMDGPUAsmPrinter.cpp
+++ b/lib/Target/R600/AMDGPUAsmPrinter.cpp
@@ -21,6 +21,7 @@
 #include AMDGPU.h
 #include SIMachineFunctionInfo.h
 #include SIRegisterInfo.h
+#include R600RegisterInfo.h
 #include llvm/MC/MCStreamer.h
 #include llvm/Support/TargetRegistry.h
 #include llvm/Target/TargetLoweringObjectFile.h
@@ -52,13 +53,43 @@ bool AMDGPUAsmPrinter::runOnMachineFunction(MachineFunction 
MF) {
   }
   OutStreamer.SwitchSection(getObjFileLowering().getTextSection());
   if (STM.device()-getGeneration()  AMDGPUDeviceInfo::HD6XXX) {
-EmitProgramInfo(MF);
+EmitProgramInfoSI(MF);
+  } else {
+EmitProgramInfoR600(MF);
   }
   EmitFunctionBody();
   return false;
 }
 
-void AMDGPUAsmPrinter::EmitProgramInfo(MachineFunction MF) {
+void AMDGPUAsmPrinter::EmitProgramInfoR600(MachineFunction MF) {
+  unsigned MaxGPR = 0;
+  const R600RegisterInfo * RI =
+static_castconst R600RegisterInfo*(TM.getRegisterInfo());
+
+  for (MachineFunction::iterator BB = MF.begin(), BB_E = MF.end();
+  BB != BB_E; ++BB) {
+MachineBasicBlock MBB = *BB;
+for (MachineBasicBlock::iterator I = MBB.begin(), E = MBB.end();
+I != E; ++I) {
+  MachineInstr MI = *I;
+  unsigned numOperands = MI.getNumOperands();
+  for (unsigned op_idx = 0; op_idx  numOperands; op_idx++) {
+MachineOperand  MO = MI.getOperand(op_idx);
+if (!MO.isReg())
+  continue;
+unsigned HWReg = RI-getEncodingValue(MO.getReg())  0xff;
+
+// Register with value  127 aren't GPR
+if (HWReg  127)
+  continue;
+MaxGPR = std::max(MaxGPR, HWReg);
+  }
+}
+  }
+  OutStreamer.EmitIntValue(MaxGPR + 1, 4);
+}
+
+void AMDGPUAsmPrinter::EmitProgramInfoSI(MachineFunction MF) {
   unsigned MaxSGPR = 0;
   unsigned MaxVGPR = 0;
   bool VCCUsed = false;
diff --git a/lib/Target/R600/AMDGPUAsmPrinter.h 
b/lib/Target/R600/AMDGPUAsmPrinter.h
index 3812282..f425ef4 100644
--- a/lib/Target/R600/AMDGPUAsmPrinter.h
+++ b/lib/Target/R600/AMDGPUAsmPrinter.h
@@ -33,7 +33,8 @@ public:
 
   /// \brief Emit register usage information so that the GPU driver
   /// can correctly setup the GPU state.
-  void EmitProgramInfo(MachineFunction MF);
+  void EmitProgramInfoR600(MachineFunction MF);
+  void EmitProgramInfoSI(MachineFunction MF);
 
   /// Implemented in AMDGPUMCInstLower.cpp
   virtual void EmitInstruction(const MachineInstr *MI);
-- 
1.8.1.4

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev