Subzero: Cleanup Inst==>Instr.

src/IceInstX86BaseImpl.h

 //===- subzero/src/IceInstX86BaseImpl.h - Generic X86 instructions -*- C++ -*=//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 1016 matching lines @@
   assert(this->getSrcSize() == 3);
   const Operand *Src = this->getSrc(1);
   Type Ty = Src->getType();
   static const GPREmitterOneOp Emitter = {&Assembler::idiv, &Assembler::idiv};
   emitIASOpTyGPR(Func, Ty, Src, Emitter);
 }
 
 // pblendvb and blendvps take xmm0 as a final implicit argument.
 template <typename TraitsType>
 void InstImpl<TraitsType>::emitVariableBlendInst(const char *Opcode,
-                                                 const Inst *Inst,
+                                                 const Inst *Instr,
                                                  const Cfg *Func) {
   if (!BuildDefs::dump())
     return;
   Ostream &Str = Func->getContext()->getStrEmit();
-  assert(Inst->getSrcSize() == 3);
-  assert(llvm::cast<Variable>(Inst->getSrc(2))->getRegNum() ==
+  assert(Instr->getSrcSize() == 3);
+  assert(llvm::cast<Variable>(Instr->getSrc(2))->getRegNum() ==
          RegisterSet::Reg_xmm0);
   Str << "\t" << Opcode << "\t";
-  Inst->getSrc(1)->emit(Func);
+  Instr->getSrc(1)->emit(Func);
   Str << ", ";
-  Inst->getDest()->emit(Func);
+  Instr->getDest()->emit(Func);
 }
 
 template <typename TraitsType>
 void InstImpl<TraitsType>::emitIASVariableBlendInst(
-    const Inst *Inst, const Cfg *Func, const XmmEmitterRegOp &Emitter) {
-  assert(Inst->getSrcSize() == 3);
-  assert(llvm::cast<Variable>(Inst->getSrc(2))->getRegNum() ==
+    const Inst *Instr, const Cfg *Func, const XmmEmitterRegOp &Emitter) {
+  assert(Instr->getSrcSize() == 3);
+  assert(llvm::cast<Variable>(Instr->getSrc(2))->getRegNum() ==
          RegisterSet::Reg_xmm0);
-  const Variable *Dest = Inst->getDest();
-  const Operand *Src = Inst->getSrc(1);
+  const Variable *Dest = Instr->getDest();
+  const Operand *Src = Instr->getSrc(1);
   emitIASRegOpTyXMM(Func, Dest->getType(), Dest, Src, Emitter);
 }
 
 template <typename TraitsType>
 void InstImpl<TraitsType>::InstX86Blendvps::emit(const Cfg *Func) const {
   if (!BuildDefs::dump())
     return;
   emitVariableBlendInst(this->Opcode, this, Func);
 }
 
@@ skipping 1820 matching lines @@
     return;
   Ostream &Str = Func->getContext()->getStrDump();
   Str << "IACA_END";
 }
 
 } // end of namespace X86NAMESPACE
 
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICEINSTX86BASEIMPL_H