<div class="gmail_quote">On Thu, Sep 29, 2011 at 7:52 AM, Justin Holewinski <span dir="ltr"><<a href="mailto:justin.holewinski@gmail.com">justin.holewinski@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
<div class="im"><p><br>
On Sep 29, 2011 3:22 AM, "Eric Christopher" <<a href="mailto:echristo@apple.com" target="_blank">echristo@apple.com</a>> wrote:<br>
><br>
> Hi Justin,<br>
><br>
> We've had a number of complaints that this broke --enable-shared building, if you could please fix this we'd appreciate it so I don't have to roll back all of the commits to ptx from today.</p>
</div><p>Interesting, ill look into it immediately.</p></blockquote><div><br></div><div>Besides Heikki's report, what are the reported errors? I just tried a shared build with:</div><div><br></div><div>../configure --enable-optimized --enable-assertions --enable-targets=host,ptx --enable-shared</div>
<div><br></div><div>and everything seems to build fine.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;"><div><div></div><div class="h5">
<p>><br>
> Thanks!<br>
><br>
> -eric<br>
><br>
><br>
> On Sep 28, 2011, at 7:32 AM, Justin Holewinski wrote:<br>
><br>
> > Author: jholewinski<br>
> > Date: Wed Sep 28 09:32:04 2011<br>
> > New Revision: 140697<br>
> ><br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project?rev=140697&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=140697&view=rev</a><br>
> > Log:<br>
> > PTX: MC-ize the PTX back-end (patch 1 of N)<br>
> ><br>
> > Lay some groundwork for converting to MC-based asm printer. This is the first<br>
> > of probably many patches to bring the back-end back up-to-date with all of the<br>
> > recent MC changes.<br>
> ><br>
> > Added:<br>
> > llvm/trunk/lib/Target/PTX/InstPrinter/<br>
> > llvm/trunk/lib/Target/PTX/InstPrinter/CMakeLists.txt<br>
> > llvm/trunk/lib/Target/PTX/InstPrinter/Makefile<br>
> > llvm/trunk/lib/Target/PTX/InstPrinter/PTXInstPrinter.cpp<br>
> > llvm/trunk/lib/Target/PTX/InstPrinter/PTXInstPrinter.h<br>
> > llvm/trunk/lib/Target/PTX/PTXAsmPrinter.h<br>
> > llvm/trunk/lib/Target/PTX/PTXMCInstLower.cpp<br>
> > Modified:<br>
> > llvm/trunk/lib/Target/PTX/CMakeLists.txt<br>
> > llvm/trunk/lib/Target/PTX/MCTargetDesc/CMakeLists.txt<br>
> > llvm/trunk/lib/Target/PTX/MCTargetDesc/PTXMCTargetDesc.cpp<br>
> > llvm/trunk/lib/Target/PTX/Makefile<br>
> > llvm/trunk/lib/Target/PTX/PTX.h<br>
> > llvm/trunk/lib/Target/PTX/PTX.td<br>
> > llvm/trunk/lib/Target/PTX/PTXAsmPrinter.cpp<br>
> > llvm/trunk/lib/Target/PTX/PTXISelDAGToDAG.cpp<br>
> > llvm/trunk/lib/Target/PTX/PTXISelLowering.cpp<br>
> > llvm/trunk/lib/Target/PTX/PTXInstrFormats.td<br>
> > llvm/trunk/lib/Target/PTX/PTXInstrInfo.cpp<br>
> > llvm/trunk/lib/Target/PTX/PTXMCAsmStreamer.cpp<br>
> > llvm/trunk/lib/Target/PTX/PTXMachineFunctionInfo.h<br>
> > llvm/trunk/test/CodeGen/PTX/add.ll<br>
> > llvm/trunk/test/CodeGen/PTX/mov.ll<br>
> > llvm/trunk/test/CodeGen/PTX/mul.ll<br>
> > llvm/trunk/test/CodeGen/PTX/sub.ll<br>
> ><br>
> > Modified: llvm/trunk/lib/Target/PTX/CMakeLists.txt<br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/CMakeLists.txt?rev=140697&r1=140696&r2=140697&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/CMakeLists.txt?rev=140697&r1=140696&r2=140697&view=diff</a><br>
> > ==============================================================================<br>
> > --- llvm/trunk/lib/Target/PTX/CMakeLists.txt (original)<br>
> > +++ llvm/trunk/lib/Target/PTX/CMakeLists.txt Wed Sep 28 09:32:04 2011<br>
> > @@ -14,6 +14,7 @@<br>
> > PTXInstrInfo.cpp<br>
> > PTXFrameLowering.cpp<br>
> > PTXMCAsmStreamer.cpp<br>
> > + PTXMCInstLower.cpp<br>
> > PTXMFInfoExtract.cpp<br>
> > PTXParamManager.cpp<br>
> > PTXRegAlloc.cpp<br>
> > @@ -37,4 +38,6 @@<br>
> > )<br>
> ><br>
> > add_subdirectory(TargetInfo)<br>
> > +add_subdirectory(InstPrinter)<br>
> > add_subdirectory(MCTargetDesc)<br>
> > +<br>
> ><br>
> > Added: llvm/trunk/lib/Target/PTX/InstPrinter/CMakeLists.txt<br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/InstPrinter/CMakeLists.txt?rev=140697&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/InstPrinter/CMakeLists.txt?rev=140697&view=auto</a><br>
> > ==============================================================================<br>
> > --- llvm/trunk/lib/Target/PTX/InstPrinter/CMakeLists.txt (added)<br>
> > +++ llvm/trunk/lib/Target/PTX/InstPrinter/CMakeLists.txt Wed Sep 28 09:32:04 2011<br>
> > @@ -0,0 +1,13 @@<br>
> > +include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )<br>
> > +<br>
> > +add_llvm_library(LLVMPTXAsmPrinter<br>
> > + PTXInstPrinter.cpp<br>
> > + )<br>
> > +<br>
> > +add_dependencies(LLVMPTXAsmPrinter PTXCommonTableGen)<br>
> > +<br>
> > +add_llvm_library_dependencies(LLVMPTXAsmPrinter<br>
> > + LLVMMC<br>
> > + LLVMSupport<br>
> > + )<br>
> > +<br>
> ><br>
> > Added: llvm/trunk/lib/Target/PTX/InstPrinter/Makefile<br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/InstPrinter/Makefile?rev=140697&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/InstPrinter/Makefile?rev=140697&view=auto</a><br>
> > ==============================================================================<br>
> > --- llvm/trunk/lib/Target/PTX/InstPrinter/Makefile (added)<br>
> > +++ llvm/trunk/lib/Target/PTX/InstPrinter/Makefile Wed Sep 28 09:32:04 2011<br>
> > @@ -0,0 +1,16 @@<br>
> > +##===- lib/Target/PTX/AsmPrinter/Makefile ------------------*- Makefile -*-===##<br>
> > +#<br>
> > +# The LLVM Compiler Infrastructure<br>
> > +#<br>
> > +# This file is distributed under the University of Illinois Open Source<br>
> > +# License. See LICENSE.TXT for details.<br>
> > +#<br>
> > +##===----------------------------------------------------------------------===##<br>
> > +LEVEL = ../../../..<br>
> > +LIBRARYNAME = LLVMPTXAsmPrinter<br>
> > +<br>
> > +# Hack: we need to include 'main' ptx target directory to grab private headers<br>
> > +CPP.Flags += -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/..<br>
> > +<br>
> > +include $(LEVEL)/Makefile.common<br>
> > +<br>
> ><br>
> > Added: llvm/trunk/lib/Target/PTX/InstPrinter/PTXInstPrinter.cpp<br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/InstPrinter/PTXInstPrinter.cpp?rev=140697&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/InstPrinter/PTXInstPrinter.cpp?rev=140697&view=auto</a><br>
> > ==============================================================================<br>
> > --- llvm/trunk/lib/Target/PTX/InstPrinter/PTXInstPrinter.cpp (added)<br>
> > +++ llvm/trunk/lib/Target/PTX/InstPrinter/PTXInstPrinter.cpp Wed Sep 28 09:32:04 2011<br>
> > @@ -0,0 +1,149 @@<br>
> > +//===-- PTXInstPrinter.cpp - Convert PTX MCInst to assembly syntax --------===//<br>
> > +//<br>
> > +// The LLVM Compiler Infrastructure<br>
> > +//<br>
> > +// This file is distributed under the University of Illinois Open Source<br>
> > +// License. See LICENSE.TXT for details.<br>
> > +//<br>
> > +//===----------------------------------------------------------------------===//<br>
> > +//<br>
> > +// This class prints a PTX MCInst to a .ptx file.<br>
> > +//<br>
> > +//===----------------------------------------------------------------------===//<br>
> > +<br>
> > +#define DEBUG_TYPE "asm-printer"<br>
> > +#include "PTXInstPrinter.h"<br>
> > +#include "PTXMachineFunctionInfo.h"<br>
> > +#include "llvm/MC/MCAsmInfo.h"<br>
> > +#include "llvm/MC/MCExpr.h"<br>
> > +#include "llvm/MC/MCInst.h"<br>
> > +#include "llvm/MC/MCSymbol.h"<br>
> > +#include "llvm/ADT/StringExtras.h"<br>
> > +#include "llvm/Support/raw_ostream.h"<br>
> > +using namespace llvm;<br>
> > +<br>
> > +#define GET_INSTRUCTION_NAME<br>
> > +#include "PTXGenAsmWriter.inc"<br>
> > +<br>
> > +PTXInstPrinter::PTXInstPrinter(const MCAsmInfo &MAI,<br>
> > + const MCSubtargetInfo &STI) :<br>
> > + MCInstPrinter(MAI) {<br>
> > + // Initialize the set of available features.<br>
> > + setAvailableFeatures(STI.getFeatureBits());<br>
> > +}<br>
> > +<br>
> > +StringRef PTXInstPrinter::getOpcodeName(unsigned Opcode) const {<br>
> > + return getInstructionName(Opcode);<br>
> > +}<br>
> > +<br>
> > +void PTXInstPrinter::printRegName(raw_ostream &OS, unsigned RegNo) const {<br>
> > + OS << getRegisterName(RegNo);<br>
> > +}<br>
> > +<br>
> > +void PTXInstPrinter::printInst(const MCInst *MI, raw_ostream &O,<br>
> > + StringRef Annot) {<br>
> > + printPredicate(MI, O);<br>
> > + switch (MI->getOpcode()) {<br>
> > + default:<br>
> > + printInstruction(MI, O);<br>
> > + break;<br>
> > + case PTX::CALL:<br>
> > + printCall(MI, O);<br>
> > + }<br>
> > + O << ";";<br>
> > + printAnnotation(O, Annot);<br>
> > +}<br>
> > +<br>
> > +void PTXInstPrinter::printPredicate(const MCInst *MI, raw_ostream &O) {<br>
> > + // The last two operands are the predicate operands<br>
> > + int RegIndex;<br>
> > + int OpIndex;<br>
> > +<br>
> > + if (MI->getOpcode() == PTX::CALL) {<br>
> > + RegIndex = 0;<br>
> > + OpIndex = 1;<br>
> > + } else {<br>
> > + RegIndex = MI->getNumOperands()-2;<br>
> > + OpIndex = MI->getNumOperands()-1;<br>
> > + }<br>
> > +<br>
> > + int PredOp = MI->getOperand(OpIndex).getImm();<br>
> > + if (PredOp != PTX::PRED_NONE) {<br>
> > + if (PredOp == PTX::PRED_NEGATE) {<br>
> > + O << '!';<br>
> > + } else {<br>
> > + O << '@';<br>
> > + }<br>
> > + printOperand(MI, RegIndex, O);<br>
> > + }<br>
> > +}<br>
> > +<br>
> > +void PTXInstPrinter::printCall(const MCInst *MI, raw_ostream &O) {<br>
> > + O << "\tcall.uni\t";<br>
> > + // The first two operands are the predicate slot<br>
> > + unsigned Index = 2;<br>
> > + unsigned NumRets = MI->getOperand(Index++).getImm();<br>
> > + for (unsigned i = 0; i < NumRets; ++i) {<br>
> > + if (i == 0) {<br>
> > + O << "(";<br>
> > + } else {<br>
> > + O << ", ";<br>
> > + }<br>
> > + printOperand(MI, Index++, O);<br>
> > + }<br>
> > +<br>
> > + if (NumRets > 0) {<br>
> > + O << "), ";<br>
> > + }<br>
> > +<br>
> > + O << *(MI->getOperand(Index++).getExpr()) << ", (";<br>
> > +<br>
> > + unsigned NumArgs = MI->getOperand(Index++).getImm();<br>
> > + for (unsigned i = 0; i < NumArgs; ++i) {<br>
> > + printOperand(MI, Index++, O);<br>
> > + if (i < NumArgs-1) {<br>
> > + O << ", ";<br>
> > + }<br>
> > + }<br>
> > +<br>
> > + O << ")";<br>
> > +}<br>
> > +<br>
> > +void PTXInstPrinter::printOperand(const MCInst *MI, unsigned OpNo,<br>
> > + raw_ostream &O) {<br>
> > + const MCOperand &Op = MI->getOperand(OpNo);<br>
> > + if (Op.isImm()) {<br>
> > + O << Op.getImm();<br>
> > + } else if (Op.isFPImm()) {<br>
> > + double Imm = Op.getFPImm();<br>
> > + APFloat FPImm(Imm);<br>
> > + APInt FPIntImm = FPImm.bitcastToAPInt();<br>
> > + O << "0D";<br>
> > + // PTX requires us to output the full 64 bits, even if the number is zero<br>
> > + if (FPIntImm.getZExtValue() > 0) {<br>
> > + O << FPIntImm.toString(16, false);<br>
> > + } else {<br>
> > + O << "0000000000000000";<br>
> > + }<br>
> > + } else {<br>
> > + assert(Op.isExpr() && "unknown operand kind in printOperand");<br>
> > + const MCExpr *Expr = Op.getExpr();<br>
> > + if (const MCSymbolRefExpr *SymRefExpr = dyn_cast<MCSymbolRefExpr>(Expr)) {<br>
> > + const MCSymbol &Sym = SymRefExpr->getSymbol();<br>
> > + O << Sym.getName();<br>
> > + } else {<br>
> > + O << *Op.getExpr();<br>
> > + }<br>
> > + }<br>
> > +}<br>
> > +<br>
> > +void PTXInstPrinter::printMemOperand(const MCInst *MI, unsigned OpNo,<br>
> > + raw_ostream &O) {<br>
> > + printOperand(MI, OpNo, O);<br>
> > + if (MI->getOperand(OpNo+1).isImm() && MI->getOperand(OpNo+1).getImm() == 0)<br>
> > + return; // don't print "+0"<br>
> > + O << "+";<br>
> > + printOperand(MI, OpNo+1, O);<br>
> > +}<br>
> > +<br>
> > +<br>
> ><br>
> > Added: llvm/trunk/lib/Target/PTX/InstPrinter/PTXInstPrinter.h<br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/InstPrinter/PTXInstPrinter.h?rev=140697&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/InstPrinter/PTXInstPrinter.h?rev=140697&view=auto</a><br>
> > ==============================================================================<br>
> > --- llvm/trunk/lib/Target/PTX/InstPrinter/PTXInstPrinter.h (added)<br>
> > +++ llvm/trunk/lib/Target/PTX/InstPrinter/PTXInstPrinter.h Wed Sep 28 09:32:04 2011<br>
> > @@ -0,0 +1,46 @@<br>
> > +//===-- PTXInstPrinter.h - Convert PTX MCInst to assembly syntax ----------===//<br>
> > +//<br>
> > +// The LLVM Compiler Infrastructure<br>
> > +//<br>
> > +// This file is distributed under the University of Illinois Open Source<br>
> > +// License. See LICENSE.TXT for details.<br>
> > +//<br>
> > +//===----------------------------------------------------------------------===//<br>
> > +//<br>
> > +// This class prints n PTX MCInst to a .ptx file.<br>
> > +//<br>
> > +//===----------------------------------------------------------------------===//<br>
> > +<br>
> > +#ifndef PTXINSTPRINTER_H<br>
> > +#define PTXINSTPRINTER_H<br>
> > +<br>
> > +#include "llvm/MC/MCInstPrinter.h"<br>
> > +#include "llvm/MC/MCSubtargetInfo.h"<br>
> > +<br>
> > +namespace llvm {<br>
> > +<br>
> > +class MCOperand;<br>
> > +<br>
> > +class PTXInstPrinter : public MCInstPrinter {<br>
> > +public:<br>
> > + PTXInstPrinter(const MCAsmInfo &MAI, const MCSubtargetInfo &STI);<br>
> > +<br>
> > + virtual void printInst(const MCInst *MI, raw_ostream &O, StringRef Annot);<br>
> > + virtual StringRef getOpcodeName(unsigned Opcode) const;<br>
> > + virtual void printRegName(raw_ostream &OS, unsigned RegNo) const;<br>
> > +<br>
> > + static const char *getInstructionName(unsigned Opcode);<br>
> > +<br>
> > + // Autogenerated by tblgen.<br>
> > + void printInstruction(const MCInst *MI, raw_ostream &O);<br>
> > + static const char *getRegisterName(unsigned RegNo);<br>
> > +<br>
> > + void printPredicate(const MCInst *MI, raw_ostream &O);<br>
> > + void printCall(const MCInst *MI, raw_ostream &O);<br>
> > + void printOperand(const MCInst *MI, unsigned OpNo, raw_ostream &O);<br>
> > + void printMemOperand(const MCInst *MI, unsigned OpNo, raw_ostream &O);<br>
> > +};<br>
> > +}<br>
> > +<br>
> > +#endif<br>
> > +<br>
> ><br>
> > Modified: llvm/trunk/lib/Target/PTX/MCTargetDesc/CMakeLists.txt<br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/MCTargetDesc/CMakeLists.txt?rev=140697&r1=140696&r2=140697&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/MCTargetDesc/CMakeLists.txt?rev=140697&r1=140696&r2=140697&view=diff</a><br>
> > ==============================================================================<br>
> > --- llvm/trunk/lib/Target/PTX/MCTargetDesc/CMakeLists.txt (original)<br>
> > +++ llvm/trunk/lib/Target/PTX/MCTargetDesc/CMakeLists.txt Wed Sep 28 09:32:04 2011<br>
> > @@ -6,6 +6,7 @@<br>
> > add_llvm_library_dependencies(LLVMPTXDesc<br>
> > LLVMMC<br>
> > LLVMPTXInfo<br>
> > + LLVMPTXAsmPrinter<br>
> > LLVMSupport<br>
> > )<br>
> ><br>
> ><br>
> > Modified: llvm/trunk/lib/Target/PTX/MCTargetDesc/PTXMCTargetDesc.cpp<br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/MCTargetDesc/PTXMCTargetDesc.cpp?rev=140697&r1=140696&r2=140697&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/MCTargetDesc/PTXMCTargetDesc.cpp?rev=140697&r1=140696&r2=140697&view=diff</a><br>
> > ==============================================================================<br>
> > --- llvm/trunk/lib/Target/PTX/MCTargetDesc/PTXMCTargetDesc.cpp (original)<br>
> > +++ llvm/trunk/lib/Target/PTX/MCTargetDesc/PTXMCTargetDesc.cpp Wed Sep 28 09:32:04 2011<br>
> > @@ -13,6 +13,7 @@<br>
> ><br>
> > #include "PTXMCTargetDesc.h"<br>
> > #include "PTXMCAsmInfo.h"<br>
> > +#include "InstPrinter/PTXInstPrinter.h"<br>
> > #include "llvm/MC/MCCodeGenInfo.h"<br>
> > #include "llvm/MC/MCInstrInfo.h"<br>
> > #include "llvm/MC/MCRegisterInfo.h"<br>
> > @@ -57,6 +58,15 @@<br>
> > return X;<br>
> > }<br>
> ><br>
> > +static MCInstPrinter *createPTXMCInstPrinter(const Target &T,<br>
> > + unsigned SyntaxVariant,<br>
> > + const MCAsmInfo &MAI,<br>
> > + const MCSubtargetInfo &STI) {<br>
> > + if (SyntaxVariant == 0)<br>
> > + return new PTXInstPrinter(MAI, STI);<br>
> > + return 0;<br>
> > +}<br>
> > +<br>
> > extern "C" void LLVMInitializePTXTargetMC() {<br>
> > // Register the MC asm info.<br>
> > RegisterMCAsmInfo<PTXMCAsmInfo> X(ThePTX32Target);<br>
> > @@ -79,4 +89,8 @@<br>
> > createPTXMCSubtargetInfo);<br>
> > TargetRegistry::RegisterMCSubtargetInfo(ThePTX64Target,<br>
> > createPTXMCSubtargetInfo);<br>
> > +<br>
> > + // Register the MCInstPrinter.<br>
> > + TargetRegistry::RegisterMCInstPrinter(ThePTX32Target, createPTXMCInstPrinter);<br>
> > + TargetRegistry::RegisterMCInstPrinter(ThePTX64Target, createPTXMCInstPrinter);<br>
> > }<br>
> ><br>
> > Modified: llvm/trunk/lib/Target/PTX/Makefile<br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/Makefile?rev=140697&r1=140696&r2=140697&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/Makefile?rev=140697&r1=140696&r2=140697&view=diff</a><br>
> > ==============================================================================<br>
> > --- llvm/trunk/lib/Target/PTX/Makefile (original)<br>
> > +++ llvm/trunk/lib/Target/PTX/Makefile Wed Sep 28 09:32:04 2011<br>
> > @@ -18,6 +18,6 @@<br>
> > PTXGenRegisterInfo.inc \<br>
> > PTXGenSubtargetInfo.inc<br>
> ><br>
> > -DIRS = TargetInfo MCTargetDesc<br>
> > +DIRS = InstPrinter TargetInfo MCTargetDesc<br>
> ><br>
> > include $(LEVEL)/Makefile.common<br>
> ><br>
> > Modified: llvm/trunk/lib/Target/PTX/PTX.h<br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/PTX.h?rev=140697&r1=140696&r2=140697&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/PTX.h?rev=140697&r1=140696&r2=140697&view=diff</a><br>
> > ==============================================================================<br>
> > --- llvm/trunk/lib/Target/PTX/PTX.h (original)<br>
> > +++ llvm/trunk/lib/Target/PTX/PTX.h Wed Sep 28 09:32:04 2011<br>
> > @@ -19,6 +19,9 @@<br>
> > #include "llvm/Target/TargetMachine.h"<br>
> ><br>
> > namespace llvm {<br>
> > + class MachineInstr;<br>
> > + class MCInst;<br>
> > + class PTXAsmPrinter;<br>
> > class PTXTargetMachine;<br>
> > class FunctionPass;<br>
> ><br>
> > @@ -33,7 +36,8 @@<br>
> ><br>
> > enum Predicate {<br>
> > PRED_NORMAL = 0,<br>
> > - PRED_NEGATE = 1<br>
> > + PRED_NEGATE = 1,<br>
> > + PRED_NONE = 2<br>
> > };<br>
> > } // namespace PTX<br>
> ><br>
> > @@ -45,6 +49,9 @@<br>
> ><br>
> > FunctionPass *createPTXRegisterAllocator();<br>
> ><br>
> > + void LowerPTXMachineInstrToMCInst(const MachineInstr *MI, MCInst &OutMI,<br>
> > + PTXAsmPrinter &AP);<br>
> > +<br>
> > } // namespace llvm;<br>
> ><br>
> > #endif // PTX_H<br>
> ><br>
> > Modified: llvm/trunk/lib/Target/PTX/PTX.td<br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/PTX.td?rev=140697&r1=140696&r2=140697&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/PTX.td?rev=140697&r1=140696&r2=140697&view=diff</a><br>
> > ==============================================================================<br>
> > --- llvm/trunk/lib/Target/PTX/PTX.td (original)<br>
> > +++ llvm/trunk/lib/Target/PTX/PTX.td Wed Sep 28 09:32:04 2011<br>
> > @@ -122,9 +122,20 @@<br>
> > def PTXInstrInfo : InstrInfo;<br>
> ><br>
> > //===----------------------------------------------------------------------===//<br>
> > +// Assembly printer<br>
> > +//===----------------------------------------------------------------------===//<br>
> > +// PTX uses the MC printer for asm output, so make sure the TableGen<br>
> > +// AsmWriter bits get associated with the correct class.<br>
> > +def PTXAsmWriter : AsmWriter {<br>
> > + string AsmWriterClassName = "InstPrinter";<br>
> > + bit isMCAsmWriter = 1;<br>
> > +}<br>
> > +<br>
> > +//===----------------------------------------------------------------------===//<br>
> > // Target Declaration<br>
> > //===----------------------------------------------------------------------===//<br>
> ><br>
> > def PTX : Target {<br>
> > let InstructionSet = PTXInstrInfo;<br>
> > + let AssemblyWriters = [PTXAsmWriter];<br>
> > }<br>
> ><br>
> > Modified: llvm/trunk/lib/Target/PTX/PTXAsmPrinter.cpp<br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/PTXAsmPrinter.cpp?rev=140697&r1=140696&r2=140697&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/PTXAsmPrinter.cpp?rev=140697&r1=140696&r2=140697&view=diff</a><br>
> > ==============================================================================<br>
> > --- llvm/trunk/lib/Target/PTX/PTXAsmPrinter.cpp (original)<br>
> > +++ llvm/trunk/lib/Target/PTX/PTXAsmPrinter.cpp Wed Sep 28 09:32:04 2011<br>
> > @@ -15,6 +15,7 @@<br>
> > #define DEBUG_TYPE "ptx-asm-printer"<br>
> ><br>
> > #include "PTX.h"<br>
> > +#include "PTXAsmPrinter.h"<br>
> > #include "PTXMachineFunctionInfo.h"<br>
> > #include "PTXParamManager.h"<br>
> > #include "PTXRegisterInfo.h"<br>
> > @@ -30,6 +31,8 @@<br>
> > #include "llvm/CodeGen/MachineInstr.h"<br>
> > #include "llvm/CodeGen/MachineRegisterInfo.h"<br>
> > #include "llvm/MC/MCContext.h"<br>
> > +#include "llvm/MC/MCExpr.h"<br>
> > +#include "llvm/MC/MCInst.h"<br>
> > #include "llvm/MC/MCStreamer.h"<br>
> > #include "llvm/MC/MCSymbol.h"<br>
> > #include "llvm/Target/Mangler.h"<br>
> > @@ -44,49 +47,6 @@<br>
> ><br>
> > using namespace llvm;<br>
> ><br>
> > -namespace {<br>
> > -class PTXAsmPrinter : public AsmPrinter {<br>
> > -public:<br>
> > - explicit PTXAsmPrinter(TargetMachine &TM, MCStreamer &Streamer)<br>
> > - : AsmPrinter(TM, Streamer) {}<br>
> > -<br>
> > - const char *getPassName() const { return "PTX Assembly Printer"; }<br>
> > -<br>
> > - bool doFinalization(Module &M);<br>
> > -<br>
> > - virtual void EmitStartOfAsmFile(Module &M);<br>
> > -<br>
> > - virtual bool runOnMachineFunction(MachineFunction &MF);<br>
> > -<br>
> > - virtual void EmitFunctionBodyStart();<br>
> > - virtual void EmitFunctionBodyEnd() { OutStreamer.EmitRawText(Twine("}")); }<br>
> > -<br>
> > - virtual void EmitInstruction(const MachineInstr *MI);<br>
> > -<br>
> > - void printOperand(const MachineInstr *MI, int opNum, raw_ostream &OS);<br>
> > - void printMemOperand(const MachineInstr *MI, int opNum, raw_ostream &OS,<br>
> > - const char *Modifier = 0);<br>
> > - void printReturnOperand(const MachineInstr *MI, int opNum, raw_ostream &OS,<br>
> > - const char *Modifier = 0);<br>
> > - void printPredicateOperand(const MachineInstr *MI, raw_ostream &O);<br>
> > -<br>
> > - void printCall(const MachineInstr *MI, raw_ostream &O);<br>
> > -<br>
> > - unsigned GetOrCreateSourceID(StringRef FileName,<br>
> > - StringRef DirName);<br>
> > -<br>
> > - // autogen'd.<br>
> > - void printInstruction(const MachineInstr *MI, raw_ostream &OS);<br>
> > - static const char *getRegisterName(unsigned RegNo);<br>
> > -<br>
> > -private:<br>
> > - void EmitVariableDeclaration(const GlobalVariable *gv);<br>
> > - void EmitFunctionDeclaration();<br>
> > -<br>
> > - StringMap<unsigned> SourceIdMap;<br>
> > -}; // class PTXAsmPrinter<br>
> > -} // namespace<br>
> > -<br>
> > static const char PARAM_PREFIX[] = "__param_";<br>
> > static const char RETURN_PREFIX[] = "__ret_";<br>
> ><br>
> > @@ -320,7 +280,12 @@<br>
> > //}<br>
> > }<br>
> ><br>
> > +void PTXAsmPrinter::EmitFunctionBodyEnd() {<br>
> > + OutStreamer.EmitRawText(Twine("}"));<br>
> > +}<br>
> > +<br>
> > void PTXAsmPrinter::EmitInstruction(const MachineInstr *MI) {<br>
> > +#if 0<br>
> > std::string str;<br>
> > str.reserve(64);<br>
> ><br>
> > @@ -388,6 +353,11 @@<br>
> ><br>
> > StringRef strref = StringRef(str);<br>
> > OutStreamer.EmitRawText(strref);<br>
> > +#endif<br>
> > +<br>
> > + MCInst TmpInst;<br>
> > + LowerPTXMachineInstrToMCInst(MI, TmpInst, *this);<br>
> > + OutStreamer.EmitInstruction(TmpInst);<br>
> > }<br>
> ><br>
> > void PTXAsmPrinter::printOperand(const MachineInstr *MI, int opNum,<br>
> > @@ -737,10 +707,57 @@<br>
> > return SrcId;<br>
> > }<br>
> ><br>
> > -#include "PTXGenAsmWriter.inc"<br>
> > +MCOperand PTXAsmPrinter::GetSymbolRef(const MachineOperand &MO,<br>
> > + const MCSymbol *Symbol) {<br>
> > + const MCExpr *Expr;<br>
> > + Expr = MCSymbolRefExpr::Create(Symbol, MCSymbolRefExpr::VK_None, OutContext);<br>
> > + return MCOperand::CreateExpr(Expr);<br>
> > +}<br>
> > +<br>
> > +bool PTXAsmPrinter::lowerOperand(const MachineOperand &MO, MCOperand &MCOp) {<br>
> > + const PTXMachineFunctionInfo *MFI = MF->getInfo<PTXMachineFunctionInfo>();<br>
> > + const MCExpr *Expr;<br>
> > + const char *RegSymbolName;<br>
> > + switch (MO.getType()) {<br>
> > + default:<br>
> > + llvm_unreachable("Unknown operand type");<br>
> > + case MachineOperand::MO_Register:<br>
> > + // We create register operands as symbols, since the PTXInstPrinter class<br>
> > + // has no way to map virtual registers back to a name without some ugly<br>
> > + // hacks.<br>
> > + // FIXME: Figure out a better way to handle virtual register naming.<br>
> > + RegSymbolName = MFI->getRegisterName(MO.getReg());<br>
> > + Expr = MCSymbolRefExpr::Create(RegSymbolName, MCSymbolRefExpr::VK_None,<br>
> > + OutContext);<br>
> > + MCOp = MCOperand::CreateExpr(Expr);<br>
> > + break;<br>
> > + case MachineOperand::MO_Immediate:<br>
> > + MCOp = MCOperand::CreateImm(MO.getImm());<br>
> > + break;<br>
> > + case MachineOperand::MO_MachineBasicBlock:<br>
> > + MCOp = MCOperand::CreateExpr(MCSymbolRefExpr::Create(<br>
> > + MO.getMBB()->getSymbol(), OutContext));<br>
> > + break;<br>
> > + case MachineOperand::MO_GlobalAddress:<br>
> > + MCOp = GetSymbolRef(MO, Mang->getSymbol(MO.getGlobal()));<br>
> > + break;<br>
> > + case MachineOperand::MO_ExternalSymbol:<br>
> > + MCOp = GetSymbolRef(MO, GetExternalSymbolSymbol(MO.getSymbolName()));<br>
> > + break;<br>
> > + case MachineOperand::MO_FPImmediate:<br>
> > + APFloat Val = MO.getFPImm()->getValueAPF();<br>
> > + bool ignored;<br>
> > + Val.convert(APFloat::IEEEdouble, APFloat::rmTowardZero, &ignored);<br>
> > + MCOp = MCOperand::CreateFPImm(Val.convertToDouble());<br>
> > + break;<br>
> > + }<br>
> > +<br>
> > + return true;<br>
> > +}<br>
> ><br>
> > // Force static initialization.<br>
> > extern "C" void LLVMInitializePTXAsmPrinter() {<br>
> > RegisterAsmPrinter<PTXAsmPrinter> X(ThePTX32Target);<br>
> > RegisterAsmPrinter<PTXAsmPrinter> Y(ThePTX64Target);<br>
> > }<br>
> > +<br>
> ><br>
> > Added: llvm/trunk/lib/Target/PTX/PTXAsmPrinter.h<br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/PTXAsmPrinter.h?rev=140697&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/PTXAsmPrinter.h?rev=140697&view=auto</a><br>
> > ==============================================================================<br>
> > --- llvm/trunk/lib/Target/PTX/PTXAsmPrinter.h (added)<br>
> > +++ llvm/trunk/lib/Target/PTX/PTXAsmPrinter.h Wed Sep 28 09:32:04 2011<br>
> > @@ -0,0 +1,73 @@<br>
> > +//===-- PTXAsmPrinter.h - Print machine code to a PTX file ----------------===//<br>
> > +//<br>
> > +// The LLVM Compiler Infrastructure<br>
> > +//<br>
> > +// This file is distributed under the University of Illinois Open Source<br>
> > +// License. See LICENSE.TXT for details.<br>
> > +//<br>
> > +//===----------------------------------------------------------------------===//<br>
> > +//<br>
> > +// PTX Assembly printer class.<br>
> > +//<br>
> > +//===----------------------------------------------------------------------===//<br>
> > +<br>
> > +#ifndef PTXASMPRINTER_H<br>
> > +#define PTXASMPRINTER_H<br>
> > +<br>
> > +#include "PTX.h"<br>
> > +#include "PTXTargetMachine.h"<br>
> > +#include "llvm/ADT/StringMap.h"<br>
> > +#include "llvm/CodeGen/AsmPrinter.h"<br>
> > +#include "llvm/Support/Compiler.h"<br>
> > +<br>
> > +namespace llvm {<br>
> > +<br>
> > +class MCOperand;<br>
> > +<br>
> > +class LLVM_LIBRARY_VISIBILITY PTXAsmPrinter : public AsmPrinter {<br>
> > +public:<br>
> > + explicit PTXAsmPrinter(TargetMachine &TM, MCStreamer &Streamer)<br>
> > + : AsmPrinter(TM, Streamer) {}<br>
> > +<br>
> > + const char *getPassName() const { return "PTX Assembly Printer"; }<br>
> > +<br>
> > + bool doFinalization(Module &M);<br>
> > +<br>
> > + virtual void EmitStartOfAsmFile(Module &M);<br>
> > +<br>
> > + virtual bool runOnMachineFunction(MachineFunction &MF);<br>
> > +<br>
> > + virtual void EmitFunctionBodyStart();<br>
> > + virtual void EmitFunctionBodyEnd();<br>
> > +<br>
> > + virtual void EmitInstruction(const MachineInstr *MI);<br>
> > +<br>
> > + void printOperand(const MachineInstr *MI, int opNum, raw_ostream &OS);<br>
> > + void printMemOperand(const MachineInstr *MI, int opNum, raw_ostream &OS,<br>
> > + const char *Modifier = 0);<br>
> > + void printReturnOperand(const MachineInstr *MI, int opNum, raw_ostream &OS,<br>
> > + const char *Modifier = 0);<br>
> > + void printPredicateOperand(const MachineInstr *MI, raw_ostream &O);<br>
> > +<br>
> > + void printCall(const MachineInstr *MI, raw_ostream &O);<br>
> > +<br>
> > + unsigned GetOrCreateSourceID(StringRef FileName,<br>
> > + StringRef DirName);<br>
> > +<br>
> > + MCOperand GetSymbolRef(const MachineOperand &MO, const MCSymbol *Symbol);<br>
> > + bool lowerOperand(const MachineOperand &MO, MCOperand &MCOp);<br>
> > +<br>
> > + // autogen'd.<br>
> > + void printInstruction(const MachineInstr *MI, raw_ostream &OS);<br>
> > + static const char *getRegisterName(unsigned RegNo);<br>
> > +<br>
> > +private:<br>
> > + void EmitVariableDeclaration(const GlobalVariable *gv);<br>
> > + void EmitFunctionDeclaration();<br>
> > +<br>
> > + StringMap<unsigned> SourceIdMap;<br>
> > +}; // class PTXAsmPrinter<br>
> > +} // namespace llvm<br>
> > +<br>
> > +#endif<br>
> > +<br>
> ><br>
> > Modified: llvm/trunk/lib/Target/PTX/PTXISelDAGToDAG.cpp<br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/PTXISelDAGToDAG.cpp?rev=140697&r1=140696&r2=140697&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/PTXISelDAGToDAG.cpp?rev=140697&r1=140696&r2=140697&view=diff</a><br>
> > ==============================================================================<br>
> > --- llvm/trunk/lib/Target/PTX/PTXISelDAGToDAG.cpp (original)<br>
> > +++ llvm/trunk/lib/Target/PTX/PTXISelDAGToDAG.cpp Wed Sep 28 09:32:04 2011<br>
> > @@ -129,7 +129,7 @@<br>
> > OpCode = PTX::READPARAMF64;<br>
> ><br>
> > SDValue Pred = CurDAG->getRegister(PTX::NoRegister, MVT::i1);<br>
> > - SDValue PredOp = CurDAG->getTargetConstant(PTX::PRED_NORMAL, MVT::i32);<br>
> > + SDValue PredOp = CurDAG->getTargetConstant(PTX::PRED_NONE, MVT::i32);<br>
> > DebugLoc dl = Node->getDebugLoc();<br>
> ><br>
> > SDValue Ops[] = { Index, Pred, PredOp, Chain };<br>
> > @@ -167,7 +167,7 @@<br>
> > llvm_unreachable("Invalid type in SelectWRITEPARAM");<br>
> ><br>
> > SDValue Pred = CurDAG->getRegister(PTX::NoRegister, MVT::i1);<br>
> > - SDValue PredOp = CurDAG->getTargetConstant(PTX::PRED_NORMAL, MVT::i32);<br>
> > + SDValue PredOp = CurDAG->getTargetConstant(PTX::PRED_NONE, MVT::i32);<br>
> > DebugLoc dl = Node->getDebugLoc();<br>
> ><br>
> > SDValue Ops[] = { Value, Pred, PredOp, Chain };<br>
> ><br>
> > Modified: llvm/trunk/lib/Target/PTX/PTXISelLowering.cpp<br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/PTXISelLowering.cpp?rev=140697&r1=140696&r2=140697&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/PTXISelLowering.cpp?rev=140697&r1=140696&r2=140697&view=diff</a><br>
> > ==============================================================================<br>
> > --- llvm/trunk/lib/Target/PTX/PTXISelLowering.cpp (original)<br>
> > +++ llvm/trunk/lib/Target/PTX/PTXISelLowering.cpp Wed Sep 28 09:32:04 2011<br>
> > @@ -393,8 +393,8 @@<br>
> > "Calls are not handled for the target device");<br>
> ><br>
> > std::vector<SDValue> Ops;<br>
> > - // The layout of the ops will be [Chain, Ins, Callee, Outs]<br>
> > - Ops.resize(Outs.size() + Ins.size() + 2);<br>
> > + // The layout of the ops will be [Chain, #Ins, Ins, Callee, #Outs, Outs]<br>
> > + Ops.resize(Outs.size() + Ins.size() + 4);<br>
> ><br>
> > Ops[0] = Chain;<br>
> ><br>
> > @@ -403,11 +403,12 @@<br>
> > assert(cast<Function>(GV)->getCallingConv() == CallingConv::PTX_Device &&<br>
> > "PTX function calls must be to PTX device functions");<br>
> > Callee = DAG.getTargetGlobalAddress(GV, dl, getPointerTy());<br>
> > - Ops[Ins.size()+1] = Callee;<br>
> > + Ops[Ins.size()+2] = Callee;<br>
> ><br>
> > // Generate STORE_PARAM nodes for each function argument. In PTX, function<br>
> > // arguments are explicitly stored into .param variables and passed as<br>
> > // arguments. There is no register/stack-based calling convention in PTX.<br>
> > + Ops[Ins.size()+3] = DAG.getTargetConstant(OutVals.size(), MVT::i32);<br>
> > for (unsigned i = 0; i != OutVals.size(); ++i) {<br>
> > unsigned Size = OutVals[i].getValueType().getSizeInBits();<br>
> > unsigned Param = PM.addLocalParam(Size);<br>
> > @@ -416,19 +417,20 @@<br>
> > MVT::Other);<br>
> > Chain = DAG.getNode(PTXISD::STORE_PARAM, dl, MVT::Other, Chain,<br>
> > ParamValue, OutVals[i]);<br>
> > - Ops[i+Ins.size()+2] = ParamValue;<br>
> > + Ops[i+Ins.size()+4] = ParamValue;<br>
> > }<br>
> ><br>
> > std::vector<SDValue> InParams;<br>
> ><br>
> > // Generate list of .param variables to hold the return value(s).<br>
> > + Ops[1] = DAG.getTargetConstant(Ins.size(), MVT::i32);<br>
> > for (unsigned i = 0; i < Ins.size(); ++i) {<br>
> > unsigned Size = Ins[i].VT.getStoreSizeInBits();<br>
> > unsigned Param = PM.addLocalParam(Size);<br>
> > const std::string &ParamName = PM.getParamName(Param);<br>
> > SDValue ParamValue = DAG.getTargetExternalSymbol(ParamName.c_str(),<br>
> > MVT::Other);<br>
> > - Ops[i+1] = ParamValue;<br>
> > + Ops[i+2] = ParamValue;<br>
> > InParams.push_back(ParamValue);<br>
> > }<br>
> ><br>
> ><br>
> > Modified: llvm/trunk/lib/Target/PTX/PTXInstrFormats.td<br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/PTXInstrFormats.td?rev=140697&r1=140696&r2=140697&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/PTXInstrFormats.td?rev=140697&r1=140696&r2=140697&view=diff</a><br>
> > ==============================================================================<br>
> > --- llvm/trunk/lib/Target/PTX/PTXInstrFormats.td (original)<br>
> > +++ llvm/trunk/lib/Target/PTX/PTXInstrFormats.td Wed Sep 28 09:32:04 2011<br>
> > @@ -7,10 +7,10 @@<br>
> > //<br>
> > //===----------------------------------------------------------------------===//<br>
> ><br>
> > -// PTX Predicate operand, default to (0, 0) = (zero-reg, always).<br>
> > +// PTX Predicate operand, default to (0, 0) = (zero-reg, none).<br>
> > // Leave PrintMethod empty; predicate printing is defined elsewhere.<br>
> > def pred : PredicateOperand<OtherVT, (ops RegPred, i32imm),<br>
> > - (ops (i1 zero_reg), (i32 0))>;<br>
> > + (ops (i1 zero_reg), (i32 2))>;<br>
> ><br>
> > let Namespace = "PTX" in {<br>
> > class InstPTX<dag oops, dag iops, string asmstr, list<dag> pattern><br>
> ><br>
> > Modified: llvm/trunk/lib/Target/PTX/PTXInstrInfo.cpp<br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/PTXInstrInfo.cpp?rev=140697&r1=140696&r2=140697&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/PTXInstrInfo.cpp?rev=140697&r1=140696&r2=140697&view=diff</a><br>
> > ==============================================================================<br>
> > --- llvm/trunk/lib/Target/PTX/PTXInstrInfo.cpp (original)<br>
> > +++ llvm/trunk/lib/Target/PTX/PTXInstrInfo.cpp Wed Sep 28 09:32:04 2011<br>
> > @@ -167,7 +167,7 @@<br>
> > return false;<br>
> ><br>
> > Pred.push_back(MO);<br>
> > - Pred.push_back(MachineOperand::CreateImm(PTX::PRED_NORMAL));<br>
> > + Pred.push_back(MachineOperand::CreateImm(PTX::PRED_NONE));<br>
> > return true;<br>
> > }<br>
> ><br>
> > @@ -283,7 +283,7 @@<br>
> > BuildMI(&MBB, DL, get(PTX::BRAdp))<br>
> > .addMBB(TBB).addReg(Cond[0].getReg()).addImm(Cond[1].getImm());<br>
> > BuildMI(&MBB, DL, get(PTX::BRAd))<br>
> > - .addMBB(FBB).addReg(PTX::NoRegister).addImm(PTX::PRED_NORMAL);<br>
> > + .addMBB(FBB).addReg(PTX::NoRegister).addImm(PTX::PRED_NONE);<br>
> > return 2;<br>
> > } else if (Cond.size()) {<br>
> > BuildMI(&MBB, DL, get(PTX::BRAdp))<br>
> > @@ -291,7 +291,7 @@<br>
> > return 1;<br>
> > } else {<br>
> > BuildMI(&MBB, DL, get(PTX::BRAd))<br>
> > - .addMBB(TBB).addReg(PTX::NoRegister).addImm(PTX::PRED_NORMAL);<br>
> > + .addMBB(TBB).addReg(PTX::NoRegister).addImm(PTX::PRED_NONE);<br>
> > return 1;<br>
> > }<br>
> > }<br>
> > @@ -319,7 +319,7 @@<br>
> > GetPTXMachineNode(SelectionDAG *DAG, unsigned Opcode,<br>
> > DebugLoc dl, EVT VT, SDValue Op1) {<br>
> > SDValue predReg = DAG->getRegister(PTX::NoRegister, MVT::i1);<br>
> > - SDValue predOp = DAG->getTargetConstant(PTX::PRED_NORMAL, MVT::i32);<br>
> > + SDValue predOp = DAG->getTargetConstant(PTX::PRED_NONE, MVT::i32);<br>
> > SDValue ops[] = { Op1, predReg, predOp };<br>
> > return DAG->getMachineNode(Opcode, dl, VT, ops, array_lengthof(ops));<br>
> > }<br>
> > @@ -328,7 +328,7 @@<br>
> > GetPTXMachineNode(SelectionDAG *DAG, unsigned Opcode,<br>
> > DebugLoc dl, EVT VT, SDValue Op1, SDValue Op2) {<br>
> > SDValue predReg = DAG->getRegister(PTX::NoRegister, MVT::i1);<br>
> > - SDValue predOp = DAG->getTargetConstant(PTX::PRED_NORMAL, MVT::i32);<br>
> > + SDValue predOp = DAG->getTargetConstant(PTX::PRED_NONE, MVT::i32);<br>
> > SDValue ops[] = { Op1, Op2, predReg, predOp };<br>
> > return DAG->getMachineNode(Opcode, dl, VT, ops, array_lengthof(ops));<br>
> > }<br>
> > @@ -336,7 +336,7 @@<br>
> > void PTXInstrInfo::AddDefaultPredicate(MachineInstr *MI) {<br>
> > if (MI->findFirstPredOperandIdx() == -1) {<br>
> > MI->addOperand(MachineOperand::CreateReg(PTX::NoRegister, /*IsDef=*/false));<br>
> > - MI->addOperand(MachineOperand::CreateImm(PTX::PRED_NORMAL));<br>
> > + MI->addOperand(MachineOperand::CreateImm(PTX::PRED_NONE));<br>
> > }<br>
> > }<br>
> ><br>
> ><br>
> > Modified: llvm/trunk/lib/Target/PTX/PTXMCAsmStreamer.cpp<br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/PTXMCAsmStreamer.cpp?rev=140697&r1=140696&r2=140697&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/PTXMCAsmStreamer.cpp?rev=140697&r1=140696&r2=140697&view=diff</a><br>
> > ==============================================================================<br>
> > --- llvm/trunk/lib/Target/PTX/PTXMCAsmStreamer.cpp (original)<br>
> > +++ llvm/trunk/lib/Target/PTX/PTXMCAsmStreamer.cpp Wed Sep 28 09:32:04 2011<br>
> > @@ -499,7 +499,7 @@<br>
> > void PTXMCAsmStreamer::AddEncodingComment(const MCInst &Inst) {}<br>
> ><br>
> > void PTXMCAsmStreamer::EmitInstruction(const MCInst &Inst) {<br>
> > - assert(getCurrentSection() && "Cannot emit contents before setting section!");<br>
> > +//assert(getCurrentSection() && "Cannot emit contents before setting section!");<br>
> ><br>
> > // Show the encoding in a comment if we have a code emitter.<br>
> > if (Emitter)<br>
> ><br>
> > Added: llvm/trunk/lib/Target/PTX/PTXMCInstLower.cpp<br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/PTXMCInstLower.cpp?rev=140697&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/PTXMCInstLower.cpp?rev=140697&view=auto</a><br>
> > ==============================================================================<br>
> > --- llvm/trunk/lib/Target/PTX/PTXMCInstLower.cpp (added)<br>
> > +++ llvm/trunk/lib/Target/PTX/PTXMCInstLower.cpp Wed Sep 28 09:32:04 2011<br>
> > @@ -0,0 +1,33 @@<br>
> > +//===-- PTXMCInstLower.cpp - Convert PTX MachineInstr to an MCInst --------===//<br>
> > +//<br>
> > +// The LLVM Compiler Infrastructure<br>
> > +//<br>
> > +// This file is distributed under the University of Illinois Open Source<br>
> > +// License. See LICENSE.TXT for details.<br>
> > +//<br>
> > +//===----------------------------------------------------------------------===//<br>
> > +//<br>
> > +// This file contains code to lower PTX MachineInstrs to their corresponding<br>
> > +// MCInst records.<br>
> > +//<br>
> > +//===----------------------------------------------------------------------===//<br>
> > +<br>
> > +#include "PTX.h"<br>
> > +#include "PTXAsmPrinter.h"<br>
> > +#include "llvm/Constants.h"<br>
> > +#include "llvm/CodeGen/MachineBasicBlock.h"<br>
> > +#include "llvm/MC/MCExpr.h"<br>
> > +#include "llvm/MC/MCInst.h"<br>
> > +#include "llvm/Target/Mangler.h"<br>
> > +<br>
> > +void llvm::LowerPTXMachineInstrToMCInst(const MachineInstr *MI, MCInst &OutMI,<br>
> > + PTXAsmPrinter &AP) {<br>
> > + OutMI.setOpcode(MI->getOpcode());<br>
> > + for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) {<br>
> > + const MachineOperand &MO = MI->getOperand(i);<br>
> > + MCOperand MCOp;<br>
> > + if (AP.lowerOperand(MO, MCOp))<br>
> > + OutMI.addOperand(MCOp);<br>
> > + }<br>
> > +}<br>
> > +<br>
> ><br>
> > Modified: llvm/trunk/lib/Target/PTX/PTXMachineFunctionInfo.h<br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/PTXMachineFunctionInfo.h?rev=140697&r1=140696&r2=140697&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/PTXMachineFunctionInfo.h?rev=140697&r1=140696&r2=140697&view=diff</a><br>
> > ==============================================================================<br>
> > --- llvm/trunk/lib/Target/PTX/PTXMachineFunctionInfo.h (original)<br>
> > +++ llvm/trunk/lib/Target/PTX/PTXMachineFunctionInfo.h Wed Sep 28 09:32:04 2011<br>
> > @@ -128,9 +128,9 @@<br>
> ><br>
> > /// getRegisterName - Returns the name of the specified virtual register. This<br>
> > /// name is used during PTX emission.<br>
> > - std::string getRegisterName(unsigned Reg) const {<br>
> > + const char *getRegisterName(unsigned Reg) const {<br>
> > if (RegNames.count(Reg))<br>
> > - return RegNames.lookup(Reg);<br>
> > + return RegNames.find(Reg)->second.c_str();<br>
> > else if (Reg == PTX::NoRegister)<br>
> > return "%noreg";<br>
> > else<br>
> ><br>
> > Modified: llvm/trunk/test/CodeGen/PTX/add.ll<br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PTX/add.ll?rev=140697&r1=140696&r2=140697&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PTX/add.ll?rev=140697&r1=140696&r2=140697&view=diff</a><br>
> > ==============================================================================<br>
> > --- llvm/trunk/test/CodeGen/PTX/add.ll (original)<br>
> > +++ llvm/trunk/test/CodeGen/PTX/add.ll Wed Sep 28 09:32:04 2011<br>
> > @@ -57,7 +57,7 @@<br>
> > }<br>
> ><br>
> > define ptx_device float @t2_f32(float %x) {<br>
> > -; CHECK: add.rn.f32 %ret{{[0-9]+}}, %f{{[0-9]+}}, 0F3F800000;<br>
> > +; CHECK: add.rn.f32 %ret{{[0-9]+}}, %f{{[0-9]+}}, 0D3FF0000000000000;<br>
> > ; CHECK: ret;<br>
> > %z = fadd float %x, 1.0<br>
> > ret float %z<br>
> ><br>
> > Modified: llvm/trunk/test/CodeGen/PTX/mov.ll<br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PTX/mov.ll?rev=140697&r1=140696&r2=140697&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PTX/mov.ll?rev=140697&r1=140696&r2=140697&view=diff</a><br>
> > ==============================================================================<br>
> > --- llvm/trunk/test/CodeGen/PTX/mov.ll (original)<br>
> > +++ llvm/trunk/test/CodeGen/PTX/mov.ll Wed Sep 28 09:32:04 2011<br>
> > @@ -19,7 +19,7 @@<br>
> > }<br>
> ><br>
> > define ptx_device float @t1_f32() {<br>
> > -; CHECK: mov.f32 %ret{{[0-9]+}}, 0F00000000;<br>
> > +; CHECK: mov.f32 %ret{{[0-9]+}}, 0D0000000000000000;<br>
> > ; CHECK: ret;<br>
> > ret float 0.0<br>
> > }<br>
> ><br>
> > Modified: llvm/trunk/test/CodeGen/PTX/mul.ll<br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PTX/mul.ll?rev=140697&r1=140696&r2=140697&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PTX/mul.ll?rev=140697&r1=140696&r2=140697&view=diff</a><br>
> > ==============================================================================<br>
> > --- llvm/trunk/test/CodeGen/PTX/mul.ll (original)<br>
> > +++ llvm/trunk/test/CodeGen/PTX/mul.ll Wed Sep 28 09:32:04 2011<br>
> > @@ -25,7 +25,7 @@<br>
> > }<br>
> ><br>
> > define ptx_device float @t2_f32(float %x) {<br>
> > -; CHECK: mul.rn.f32 %ret{{[0-9]+}}, %f{{[0-9]+}}, 0F40A00000;<br>
> > +; CHECK: mul.rn.f32 %ret{{[0-9]+}}, %f{{[0-9]+}}, 0D4014000000000000;<br>
> > ; CHECK: ret;<br>
> > %z = fmul float %x, 5.0<br>
> > ret float %z<br>
> ><br>
> > Modified: llvm/trunk/test/CodeGen/PTX/sub.ll<br>
> > URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PTX/sub.ll?rev=140697&r1=140696&r2=140697&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PTX/sub.ll?rev=140697&r1=140696&r2=140697&view=diff</a><br>
> > ==============================================================================<br>
> > --- llvm/trunk/test/CodeGen/PTX/sub.ll (original)<br>
> > +++ llvm/trunk/test/CodeGen/PTX/sub.ll Wed Sep 28 09:32:04 2011<br>
> > @@ -57,7 +57,7 @@<br>
> > }<br>
> ><br>
> > define ptx_device float @t2_f32(float %x) {<br>
> > -; CHECK: add.rn.f32 %ret{{[0-9]+}}, %f{{[0-9]+}}, 0FBF800000;<br>
> > +; CHECK: add.rn.f32 %ret{{[0-9]+}}, %f{{[0-9]+}}, 0DBFF0000000000000;<br>
> > ; CHECK: ret;<br>
> > %z = fsub float %x, 1.0<br>
> > ret float %z<br>
> ><br>
> ><br>
> > _______________________________________________<br>
> > llvm-commits mailing list<br>
> > <a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.edu</a><br>
> > <a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
><br>
</p>
</div></div></blockquote></div><br><br clear="all"><div><br></div>-- <br><br><div>Thanks,</div><div><br></div><div>Justin Holewinski</div><br>