Sorry guys, I forgot about that dependency. If its an issue, we can XFAIL that test until r168197 lands in 3.2.<div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Nov 20, 2012 at 12:11 AM, Joe Abbey <span dir="ltr"><<a href="mailto:jabbey@arxan.com" target="_blank">jabbey@arxan.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Sorry Hal,<br>
<br>
I accidentally replied to all.<br>
<span class="HOEnZb"><font color="#888888"><br>
Joe<br>
</font></span><div class="HOEnZb"><div class="h5"><br>
On Nov 19, 2012, at 11:37 PM, Hal Finkel <<a href="mailto:hfinkel@anl.gov">hfinkel@anl.gov</a>> wrote:<br>
<br>
> Joe, Justin,<br>
><br>
> I think something is wrong with this patch. Running make check from the 3.2 release on a PPC64 system now yields only one failure:<br>
> Failing Tests (1):<br>
> LLVM :: CodeGen/NVPTX/global-ordering.ll<br>
><br>
> llc: /release_32/lib/VMCore/Globals.cpp:168: void llvm::GlobalVariable::setInitializer(llvm::Constant*): Assertion `InitVal->getType() == getType()->getElementType() && "Initializer type must match GlobalVariable type"' failed.<br>
> 0 llc 0x0000000010cd86fc<br>
> 1 llc 0x0000000010cd9504<br>
> 2 0x00000fff82480418 __kernel_sigtramp_rt64 + 0<br>
> 3 libc.so.6 0x0000008026676ed8 abort + 18446744073708064136<br>
> 4 libc.so.6 0x000000802666b96c<br>
> 5 libc.so.6 0x000000802666ba84 __assert_fail + 18446744073708021780<br>
> 6 llc 0x0000000010c22fc0 llvm::GlobalVariable::setInitializer(llvm::Constant*) + 18446744073702595016<br>
> 7 llc 0x000000001013fd5c llvm::LLParser::ParseGlobal(std::string const&, llvm::SMLoc, unsigned int, bool, unsigned int) + 18446744073691421044<br>
> 8 llc 0x0000000010140208 llvm::LLParser::ParseNamedGlobal() + 18446744073691422224<br>
> 9 llc 0x0000000010142958 llvm::LLParser::ParseTopLevelEntities() + 18446744073691432176<br>
> 10 llc 0x0000000010142cfc llvm::LLParser::Run() + 18446744073691433092<br>
> 11 llc 0x0000000010124bb0 llvm::ParseAssembly(llvm::MemoryBuffer*, llvm::Module*, llvm::SMDiagnostic&, llvm::LLVMContext&) + 18446744073691313144<br>
> 12 llc 0x000000001011b654 main + 18446744073691275004<br>
> 13 libc.so.6 0x000000802665bcd8<br>
> 14 libc.so.6 0x000000802665bed0 __libc_start_main + 18446744073707958784<br>
> Stack dump:<br>
> 0. Program arguments: /release_32-build/Release+Asserts/bin/llc -march=nvptx -mcpu=sm_20<br>
> FileCheck error: '-' is empty.<br>
> --<br>
><br>
> -Hal<br>
><br>
> ----- Original Message -----<br>
>> From: "Joe Abbey" <<a href="mailto:jabbey@arxan.com">jabbey@arxan.com</a>><br>
>> To: "Justin Holewinski" <<a href="mailto:justin.holewinski@gmail.com">justin.holewinski@gmail.com</a>><br>
>> Cc: "Pawel Wodnicki" <<a href="mailto:pawel@32bitmicro.com">pawel@32bitmicro.com</a>>, "llvm-commits" <<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a>>, "Justin Holewinski"<br>
>> <<a href="mailto:jholewinski@nvidia.com">jholewinski@nvidia.com</a>><br>
>> Sent: Monday, November 19, 2012 4:30:52 PM<br>
>> Subject: Re: [llvm-commits] [llvm] r168198 - in /llvm/trunk: lib/Target/NVPTX/NVPTXAsmPrinter.cpp<br>
>> test/CodeGen/NVPTX/global-ordering.ll<br>
>><br>
>><br>
>><br>
>><br>
>><br>
>><br>
>><br>
>><br>
>><br>
>> I am the code owner for NVPTX and I approve this patch.<br>
>><br>
>><br>
>><br>
>> On Fri, Nov 16, 2012 at 10:27 PM, Pawel Wodnicki <<br>
>> <a href="mailto:pawel@32bitmicro.com">pawel@32bitmicro.com</a> > wrote:<br>
>><br>
>><br>
>> Justin,<br>
>><br>
>><br>
>>> One more for 3.2. :)<br>
>><br>
>> I will queue it up but merging into the 3.2 is for now suspended<br>
>> as per:<br>
>><br>
>> <a href="http://lists.cs.uiuc.edu/pipermail/llvmdev/2012-November/055895.html" target="_blank">http://lists.cs.uiuc.edu/pipermail/llvmdev/2012-November/055895.html</a><br>
>><br>
>> Pawel<br>
>><br>
>><br>
>><br>
>><br>
>>><br>
>>><br>
>>> On Fri, Nov 16, 2012 at 4:03 PM, Justin Holewinski<br>
>>> < <a href="mailto:jholewinski@nvidia.com">jholewinski@nvidia.com</a> >wrote:<br>
>>><br>
>>>> Author: jholewinski<br>
>>>> Date: Fri Nov 16 15:03:51 2012<br>
>>>> New Revision: 168198<br>
>>>><br>
>>>> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=168198&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=168198&view=rev</a><br>
>>>> Log:<br>
>>>> [NVPTX] Order global variables in def-use order before emiting<br>
>>>> them in the<br>
>>>> final assembly<br>
>>>><br>
>>>> Added:<br>
>>>> llvm/trunk/test/CodeGen/NVPTX/global-ordering.ll<br>
>>>> Modified:<br>
>>>> llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.cpp<br>
>>>><br>
>>>> Modified: llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.cpp<br>
>>>> URL:<br>
>>>> <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.cpp?rev=168198&r1=168197&r2=168198&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.cpp?rev=168198&r1=168197&r2=168198&view=diff</a><br>
>>>><br>
>>>> ==============================================================================<br>
>>>> --- llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.cpp (original)<br>
>>>> +++ llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.cpp Fri Nov 16<br>
>>>> 15:03:51<br>
>>>> 2012<br>
>>>> @@ -68,7 +68,54 @@<br>
>>>><br>
>>>> cl::location(llvm::InterleaveSrcInPtx));<br>
>>>><br>
>>>><br>
>>>> +namespace {<br>
>>>> +/// DiscoverDependentGlobals - Return a set of GlobalVariables on<br>
>>>> which<br>
>>>> \p V<br>
>>>> +/// depends.<br>
>>>> +void DiscoverDependentGlobals(Value *V,<br>
>>>> + DenseSet<GlobalVariable*> &Globals) {<br>
>>>> + if (GlobalVariable *GV = dyn_cast<GlobalVariable>(V))<br>
>>>> + Globals.insert(GV);<br>
>>>> + else {<br>
>>>> + if (User *U = dyn_cast<User>(V)) {<br>
>>>> + for (unsigned i = 0, e = U->getNumOperands(); i != e; ++i) {<br>
>>>> + DiscoverDependentGlobals(U->getOperand(i), Globals);<br>
>>>> + }<br>
>>>> + }<br>
>>>> + }<br>
>>>> +}<br>
>>>><br>
>>>> +/// VisitGlobalVariableForEmission - Add \p GV to the list of<br>
>>>> GlobalVariable<br>
>>>> +/// instances to be emitted, but only after any dependents have<br>
>>>> been added<br>
>>>> +/// first.<br>
>>>> +void VisitGlobalVariableForEmission(GlobalVariable *GV,<br>
>>>> + SmallVectorImpl<GlobalVariable*><br>
>>>> &Order,<br>
>>>> + DenseSet<GlobalVariable*> &Visited,<br>
>>>> + DenseSet<GlobalVariable*> &Visiting) {<br>
>>>> + // Have we already visited this one?<br>
>>>> + if (Visited.count(GV)) return;<br>
>>>> +<br>
>>>> + // Do we have a circular dependency?<br>
>>>> + if (Visiting.count(GV))<br>
>>>> + report_fatal_error("Circular dependency found in global variable<br>
>>>> set");<br>
>>>> +<br>
>>>> + // Start visiting this global<br>
>>>> + Visiting.insert(GV);<br>
>>>> +<br>
>>>> + // Make sure we visit all dependents first<br>
>>>> + DenseSet<GlobalVariable*> Others;<br>
>>>> + for (unsigned i = 0, e = GV->getNumOperands(); i != e; ++i)<br>
>>>> + DiscoverDependentGlobals(GV->getOperand(i), Others);<br>
>>>> +<br>
>>>> + for (DenseSet<GlobalVariable*>::iterator I = Others.begin(),<br>
>>>> + E = Others.end(); I != E; ++I)<br>
>>>> + VisitGlobalVariableForEmission(*I, Order, Visited, Visiting);<br>
>>>> +<br>
>>>> + // Now we can visit ourself<br>
>>>> + Order.push_back(GV);<br>
>>>> + Visited.insert(GV);<br>
>>>> + Visiting.erase(GV);<br>
>>>> +}<br>
>>>> +}<br>
>>>><br>
>>>> // @TODO: This is a copy from AsmPrinter.cpp. The function is<br>
>>>> static, so<br>
>>>> we<br>
>>>> // cannot just link to the existing version.<br>
>>>> @@ -893,10 +940,27 @@<br>
>>>><br>
>>>> emitDeclarations(M, OS2);<br>
>>>><br>
>>>> - // Print out module-level global variables here.<br>
>>>> + // As ptxas does not support forward references of globals, we<br>
>>>> need to<br>
>>>> first<br>
>>>> + // sort the list of module-level globals in def-use order. We<br>
>>>> visit each<br>
>>>> + // global variable in order, and ensure that we emit it *after*<br>
>>>> its<br>
>>>> dependent<br>
>>>> + // globals. We use a little extra memory maintaining both a set<br>
>>>> and a<br>
>>>> list to<br>
>>>> + // have fast searches while maintaining a strict ordering.<br>
>>>> + SmallVector<GlobalVariable*,8> Globals;<br>
>>>> + DenseSet<GlobalVariable*> GVVisited;<br>
>>>> + DenseSet<GlobalVariable*> GVVisiting;<br>
>>>> +<br>
>>>> + // Visit each global variable, in order<br>
>>>> for (Module::global_iterator I = M.global_begin(), E =<br>
>>>> M.global_end();<br>
>>>> - I != E; ++I)<br>
>>>> - printModuleLevelGV(I, OS2);<br>
>>>> + I != E; ++I)<br>
>>>> + VisitGlobalVariableForEmission(I, Globals, GVVisited,<br>
>>>> GVVisiting);<br>
>>>> +<br>
>>>> + assert(GVVisited.size() == M.getGlobalList().size() &&<br>
>>>> + "Missed a global variable");<br>
>>>> + assert(GVVisiting.size() == 0 && "Did not fully process a global<br>
>>>> variable");<br>
>>>> +<br>
>>>> + // Print out module-level global variables in proper order<br>
>>>> + for (unsigned i = 0, e = Globals.size(); i != e; ++i)<br>
>>>> + printModuleLevelGV(Globals[i], OS2);<br>
>>>><br>
>>>> OS2 << '\n';<br>
>>>><br>
>>>><br>
>>>> Added: llvm/trunk/test/CodeGen/NVPTX/global-ordering.ll<br>
>>>> URL:<br>
>>>> <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/NVPTX/global-ordering.ll?rev=168198&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/NVPTX/global-ordering.ll?rev=168198&view=auto</a><br>
>>>><br>
>>>> ==============================================================================<br>
>>>> --- llvm/trunk/test/CodeGen/NVPTX/global-ordering.ll (added)<br>
>>>> +++ llvm/trunk/test/CodeGen/NVPTX/global-ordering.ll Fri Nov 16<br>
>>>> 15:03:51<br>
>>>> 2012<br>
>>>> @@ -0,0 +1,20 @@<br>
>>>> +; RUN: llc < %s -march=nvptx -mcpu=sm_20 | FileCheck %s<br>
>>>> --check-prefix=PTX32<br>
>>>> +; RUN: llc < %s -march=nvptx64 -mcpu=sm_20 | FileCheck %s<br>
>>>> --check-prefix=PTX64<br>
>>>> +<br>
>>>> +; Make sure we emit these globals in def-use order<br>
>>>> +<br>
>>>> +<br>
>>>> +; PTX32: .visible .global .align 1 .u8 a = 2;<br>
>>>> +; PTX32-NEXT: .visible .global .align 4 .u32 a2 = a;<br>
>>>> +; PTX64: .visible .global .align 1 .u8 a = 2;<br>
>>>> +; PTX64-NEXT: .visible .global .align 8 .u64 a2 = a;<br>
>>>> +@a2 = addrspace(1) global i8 addrspace(1)* @a<br>
>>>> +@a = addrspace(1) global i8 2<br>
>>>> +<br>
>>>> +<br>
>>>> +; PTX32: .visible .global .align 1 .u8 b = 1;<br>
>>>> +; PTX32-NEXT: .visible .global .align 4 .u32 b2[2] = {b, b};<br>
>>>> +; PTX64: .visible .global .align 1 .u8 b = 1;<br>
>>>> +; PTX64-NEXT: .visible .global .align 8 .u64 b2[2] = {b, b};<br>
>>>> +@b2 = addrspace(1) global [2 x i8 addrspace(1)*] [i8<br>
>>>> addrspace(1)* @b, i8<br>
>>>> addrspace(1)* @b]<br>
>>>> +@b = addrspace(1) global i8 1<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>
>>><br>
>><br>
>><br>
>><br>
>><br>
>><br>
>> --<br>
>><br>
>><br>
>> Thanks,<br>
>><br>
>><br>
>> Justin Holewinski<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>
><br>
> --<br>
> Hal Finkel<br>
> Postdoctoral Appointee<br>
> Leadership Computing Facility<br>
> Argonne National Laboratory<br>
<br>
</div></div></blockquote></div><br><br clear="all"><div><br></div>-- <br><br><div>Thanks,</div><div><br></div><div>Justin Holewinski</div><br>
</div>