From: Tom Stellard <thomas.stellard@amd.com>
Date: Thu, 6 Sep 2012 19:56:02 +0000 (-0400)
Subject: radeon/llvm: Coding style fixes
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0410e9e8c7d3d91b62d970ca2a3f6ae400272c5f;p=mesa.git

radeon/llvm: Coding style fixes

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
---

diff --git a/src/gallium/drivers/radeon/AMDGPUAsmPrinter.cpp b/src/gallium/drivers/radeon/AMDGPUAsmPrinter.cpp
index 2d6c86d9d20..07f443d9c2f 100644
--- a/src/gallium/drivers/radeon/AMDGPUAsmPrinter.cpp
+++ b/src/gallium/drivers/radeon/AMDGPUAsmPrinter.cpp
@@ -128,5 +128,5 @@ void AMDGPUAsmPrinter::EmitProgramInfo(MachineFunction &MF) {
   SIMachineFunctionInfo * MFI = MF.getInfo<SIMachineFunctionInfo>();
   OutStreamer.EmitIntValue(MaxSGPR + 1, 4);
   OutStreamer.EmitIntValue(MaxVGPR + 1, 4);
-  OutStreamer.EmitIntValue(MFI->spi_ps_input_addr, 4);
+  OutStreamer.EmitIntValue(MFI->SPIPSInputAddr, 4);
 }
diff --git a/src/gallium/drivers/radeon/SIAssignInterpRegs.cpp b/src/gallium/drivers/radeon/SIAssignInterpRegs.cpp
index 0e36e6b8b78..1fc0a873eb6 100644
--- a/src/gallium/drivers/radeon/SIAssignInterpRegs.cpp
+++ b/src/gallium/drivers/radeon/SIAssignInterpRegs.cpp
@@ -35,7 +35,7 @@ private:
   static char ID;
   TargetMachine &TM;
 
-  void AddLiveIn(MachineFunction * MF,  MachineRegisterInfo & MRI,
+  void addLiveIn(MachineFunction * MF,  MachineRegisterInfo & MRI,
                  unsigned physReg, unsigned virtReg);
 
 public:
@@ -54,10 +54,10 @@ char SIAssignInterpRegsPass::ID = 0;
 #define INTERP_VALUES 16
 #define REQUIRED_VALUE_MAX_INDEX 7
 
-struct interp_info {
-  bool enabled;
-  unsigned regs[3];
-  unsigned reg_count;
+struct InterpInfo {
+  bool Enabled;
+  unsigned Regs[3];
+  unsigned RegCount;
 };
 
 
@@ -68,7 +68,7 @@ FunctionPass *llvm::createSIAssignInterpRegsPass(TargetMachine &tm) {
 bool SIAssignInterpRegsPass::runOnMachineFunction(MachineFunction &MF)
 {
 
-  struct interp_info InterpUse[INTERP_VALUES] = {
+  struct InterpInfo InterpUse[INTERP_VALUES] = {
     {false, {AMDGPU::PERSP_SAMPLE_I, AMDGPU::PERSP_SAMPLE_J}, 2},
     {false, {AMDGPU::PERSP_CENTER_I, AMDGPU::PERSP_CENTER_J}, 2},
     {false, {AMDGPU::PERSP_CENTROID_I, AMDGPU::PERSP_CENTROID_J}, 2},
@@ -95,14 +95,14 @@ bool SIAssignInterpRegsPass::runOnMachineFunction(MachineFunction &MF)
   MachineRegisterInfo &MRI = MF.getRegInfo();
   bool ForceEnable = true;
 
-  /* First pass, mark the interpolation values that are used. */
-  for (unsigned interp_idx = 0; interp_idx < INTERP_VALUES; interp_idx++) {
-    for (unsigned reg_idx = 0; reg_idx < InterpUse[interp_idx].reg_count;
-                                                               reg_idx++) {
-      InterpUse[interp_idx].enabled = InterpUse[interp_idx].enabled ||
-                            !MRI.use_empty(InterpUse[interp_idx].regs[reg_idx]);
-      if (InterpUse[interp_idx].enabled &&
-          interp_idx <= REQUIRED_VALUE_MAX_INDEX) {
+  // First pass, mark the interpolation values that are used.
+  for (unsigned InterpIdx = 0; InterpIdx < INTERP_VALUES; InterpIdx++) {
+    for (unsigned RegIdx = 0; RegIdx < InterpUse[InterpIdx].RegCount;
+                                                               RegIdx++) {
+      InterpUse[InterpIdx].Enabled = InterpUse[InterpIdx].Enabled ||
+                            !MRI.use_empty(InterpUse[InterpIdx].Regs[RegIdx]);
+      if (InterpUse[InterpIdx].Enabled &&
+          InterpIdx <= REQUIRED_VALUE_MAX_INDEX) {
         ForceEnable = false;
       }
     }
@@ -110,31 +110,31 @@ bool SIAssignInterpRegsPass::runOnMachineFunction(MachineFunction &MF)
 
   // At least one interpolation mode must be enabled or else the GPU will hang.
   if (ForceEnable) {
-    InterpUse[0].enabled = true;
+    InterpUse[0].Enabled = true;
   }
 
-  unsigned used_vgprs = 0;
+  unsigned UsedVgprs = 0;
 
-  /* Second pass, replace with VGPRs. */
-  for (unsigned interp_idx = 0; interp_idx < INTERP_VALUES; interp_idx++) {
-    if (!InterpUse[interp_idx].enabled) {
+  // Second pass, replace with VGPRs.
+  for (unsigned InterpIdx = 0; InterpIdx < INTERP_VALUES; InterpIdx++) {
+    if (!InterpUse[InterpIdx].Enabled) {
       continue;
     }
-    MFI->spi_ps_input_addr |= (1 << interp_idx);
-
-    for (unsigned reg_idx = 0; reg_idx < InterpUse[interp_idx].reg_count;
-                                                  reg_idx++, used_vgprs++) {
-      unsigned new_reg = AMDGPU::VReg_32RegClass.getRegister(used_vgprs);
-      unsigned virt_reg = MRI.createVirtualRegister(&AMDGPU::VReg_32RegClass);
-      MRI.replaceRegWith(InterpUse[interp_idx].regs[reg_idx], virt_reg);
-      AddLiveIn(&MF, MRI, new_reg, virt_reg);
+    MFI->SPIPSInputAddr |= (1 << InterpIdx);
+
+    for (unsigned RegIdx = 0; RegIdx < InterpUse[InterpIdx].RegCount;
+                                                  RegIdx++, UsedVgprs++) {
+      unsigned NewReg = AMDGPU::VReg_32RegClass.getRegister(UsedVgprs);
+      unsigned VirtReg = MRI.createVirtualRegister(&AMDGPU::VReg_32RegClass);
+      MRI.replaceRegWith(InterpUse[InterpIdx].Regs[RegIdx], VirtReg);
+      addLiveIn(&MF, MRI, NewReg, VirtReg);
     }
   }
 
   return false;
 }
 
-void SIAssignInterpRegsPass::AddLiveIn(MachineFunction * MF,
+void SIAssignInterpRegsPass::addLiveIn(MachineFunction * MF,
                            MachineRegisterInfo & MRI,
                            unsigned physReg, unsigned virtReg)
 {
diff --git a/src/gallium/drivers/radeon/SIMachineFunctionInfo.cpp b/src/gallium/drivers/radeon/SIMachineFunctionInfo.cpp
index f1a8c1f6e1b..3cc1cd67c47 100644
--- a/src/gallium/drivers/radeon/SIMachineFunctionInfo.cpp
+++ b/src/gallium/drivers/radeon/SIMachineFunctionInfo.cpp
@@ -14,6 +14,6 @@ using namespace llvm;
 
 SIMachineFunctionInfo::SIMachineFunctionInfo(const MachineFunction &MF)
   : MachineFunctionInfo(),
-    spi_ps_input_addr(0),
+    SPIPSInputAddr(0),
     ShaderType(0)
   { }
diff --git a/src/gallium/drivers/radeon/SIMachineFunctionInfo.h b/src/gallium/drivers/radeon/SIMachineFunctionInfo.h
index b60822e2e7a..68097b44c52 100644
--- a/src/gallium/drivers/radeon/SIMachineFunctionInfo.h
+++ b/src/gallium/drivers/radeon/SIMachineFunctionInfo.h
@@ -27,7 +27,7 @@ class SIMachineFunctionInfo : public MachineFunctionInfo {
 
   public:
     SIMachineFunctionInfo(const MachineFunction &MF);
-    unsigned spi_ps_input_addr;
+    unsigned SPIPSInputAddr;
     unsigned ShaderType;
 
 };