<div dir="ltr"><div>Done. Thanks!</div><div><br></div>On Tue, May 21, 2013 at 7:24 AM, Tom Stellard <span dir="ltr"><<a href="mailto:tom@stellard.net" target="_blank">tom@stellard.net</a>></span> wrote:<br><div class="gmail_extra">
<div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Bill,<br>
<br>
I'm sorry I missed this email, but when I asked for r182113 to be<br>
cherry-picked to the 3.3 branch, I was assuming this commit would not be included in </blockquote><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">the 3.3 branch. As a result r182113 has broken the 3.3 build for R600.<br>
<br></blockquote><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Please also cherry-pick r182112 to the 3.3 branch, this will fix the build.<br>
<br>
Thanks,<br>
Tom<br>
<div class="HOEnZb"><div class="h5"><br>
On Fri, May 17, 2013 at 11:50:32AM -0700, Bill Wendling wrote:<br>
> Okay. Done.<br>
><br>
> -bw<br>
><br>
><br>
><br>
> On Thu, May 16, 2013 at 7:07 PM, NAKAMURA Takumi <<a href="mailto:geek4civic@gmail.com">geek4civic@gmail.com</a>>wrote:<br>
><br>
> > Bill and Tom, I suggest to pull it into release_33 as cleanups.<br>
> ><br>
> ><br>
> > 2013/5/13 Rafael Espindola <<a href="mailto:rafael.espindola@gmail.com">rafael.espindola@gmail.com</a>>:<br>
> > > Author: rafael<br>
> > > Date: Mon May 13 09:34:48 2013<br>
> > > New Revision: 181706<br>
> > ><br>
> > > URL: <a href="http://llvm.org/viewvc/llvm-project?rev=181706&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=181706&view=rev</a><br>
> > > Log:<br>
> > > Remove unused fields and arguments.<br>
> > ><br>
> > > Modified:<br>
> > > llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp<br>
> > > llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h<br>
> > > llvm/trunk/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp<br>
> > ><br>
> > > Modified: llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp<br>
> > > URL:<br>
> > <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp?rev=181706&r1=181705&r2=181706&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp?rev=181706&r1=181705&r2=181706&view=diff</a><br>
> > ><br>
> > ==============================================================================<br>
> > > --- llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp<br>
> > (original)<br>
> > > +++ llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp Mon<br>
> > May 13 09:34:48 2013<br>
> > > @@ -78,7 +78,7 @@ static MCCodeEmitter *createAMDGPUMCCode<br>
> > > if (STI.getFeatureBits() & AMDGPU::Feature64BitPtr) {<br>
> > > return createSIMCCodeEmitter(MCII, MRI, STI, Ctx);<br>
> > > } else {<br>
> > > - return createR600MCCodeEmitter(MCII, MRI, STI, Ctx);<br>
> > > + return createR600MCCodeEmitter(MCII, MRI);<br>
> > > }<br>
> > > }<br>
> > ><br>
> > ><br>
> > > Modified: llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h<br>
> > > URL:<br>
> > <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h?rev=181706&r1=181705&r2=181706&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h?rev=181706&r1=181705&r2=181706&view=diff</a><br>
> > ><br>
> > ==============================================================================<br>
> > > --- llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h<br>
> > (original)<br>
> > > +++ llvm/trunk/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h Mon May<br>
> > 13 09:34:48 2013<br>
> > > @@ -32,9 +32,7 @@ class raw_ostream;<br>
> > > extern Target TheAMDGPUTarget;<br>
> > ><br>
> > > MCCodeEmitter *createR600MCCodeEmitter(const MCInstrInfo &MCII,<br>
> > > - const MCRegisterInfo &MRI,<br>
> > > - const MCSubtargetInfo &STI,<br>
> > > - MCContext &Ctx);<br>
> > > + const MCRegisterInfo &MRI);<br>
> > ><br>
> > > MCCodeEmitter *createSIMCCodeEmitter(const MCInstrInfo &MCII,<br>
> > > const MCRegisterInfo &MRI,<br>
> > ><br>
> > > Modified: llvm/trunk/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp<br>
> > > URL:<br>
> > <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp?rev=181706&r1=181705&r2=181706&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp?rev=181706&r1=181705&r2=181706&view=diff</a><br>
> > ><br>
> > ==============================================================================<br>
> > > --- llvm/trunk/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp<br>
> > (original)<br>
> > > +++ llvm/trunk/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp Mon<br>
> > May 13 09:34:48 2013<br>
> > > @@ -35,14 +35,11 @@ class R600MCCodeEmitter : public AMDGPUM<br>
> > > void operator=(const R600MCCodeEmitter &) LLVM_DELETED_FUNCTION;<br>
> > > const MCInstrInfo &MCII;<br>
> > > const MCRegisterInfo &MRI;<br>
> > > - const MCSubtargetInfo &STI;<br>
> > > - MCContext &Ctx;<br>
> > ><br>
> > > public:<br>
> > ><br>
> > > - R600MCCodeEmitter(const MCInstrInfo &mcii, const MCRegisterInfo &mri,<br>
> > > - const MCSubtargetInfo &sti, MCContext &ctx)<br>
> > > - : MCII(mcii), MRI(mri), STI(sti), Ctx(ctx) { }<br>
> > > + R600MCCodeEmitter(const MCInstrInfo &mcii, const MCRegisterInfo &mri)<br>
> > > + : MCII(mcii), MRI(mri) { }<br>
> > ><br>
> > > /// \brief Encode the instruction and write it to the OS.<br>
> > > virtual void EncodeInstruction(const MCInst &MI, raw_ostream &OS,<br>
> > > @@ -98,10 +95,8 @@ enum TextureTypes {<br>
> > > };<br>
> > ><br>
> > > MCCodeEmitter *llvm::createR600MCCodeEmitter(const MCInstrInfo &MCII,<br>
> > > - const MCRegisterInfo &MRI,<br>
> > > - const MCSubtargetInfo &STI,<br>
> > > - MCContext &Ctx) {<br>
> > > - return new R600MCCodeEmitter(MCII, MRI, STI, Ctx);<br>
> > > + const MCRegisterInfo &MRI) {<br>
> > > + return new R600MCCodeEmitter(MCII, MRI);<br>
> > > }<br>
> > ><br>
> > > void R600MCCodeEmitter::EncodeInstruction(const MCInst &MI, raw_ostream<br>
> > &OS,<br>
> > ><br>
> > ><br>
> > > _______________________________________________<br>
> > > llvm-commits mailing list<br>
> > > <a href="mailto:llvm-commits@cs.uiuc.edu">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>
<br>
> _______________________________________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@cs.uiuc.edu">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>
</div></div></blockquote></div><br></div></div>