LLVM and Clang: Advancing Compiler Technology

Download Presentation:

FOSDEM 2011

(Op1)->swapOperands(); std::swap(A, B); } - if (A == Op0) // A&(A^B) -> A & ~B + // Notice that the patten (A&(~B)) is actually (A&(-1^B)), so if + // A is originally -1 (or a vector of -1 and undefs), then we enter + // an endless loop. By checking that A is non-constant we ensure that + // we will never get to the loop. + if (A == Op0 && !isa(A)) // A&(A^B) -> A & ~B return BinaryOperator::CreateAnd(A, Builder->CreateNot(B, "tmp")); } Added: llvm/trunk/test/Transforms/InstCombine/2011-02-14-InfLoop.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2011-02-14-InfLoop.ll?rev=125557&view=auto ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/2011-02-14-InfLoop.ll (added) +++ llvm/trunk/test/Transforms/InstCombine/2011-02-14-InfLoop.ll Tue Feb 15 01:13:48 2011 @@ -0,0 +1,19 @@ +; This testcase causes an infinite loop in the instruction combiner, +; because it changes a pattern and the original pattern is almost +; identical to the newly-generated pattern. +; RUN: opt < %s -instcombine -disable-output + +;PR PR9216 + +target triple = "x86_64-unknown-linux-gnu" + +define <4 x float> @m_387(i8* noalias nocapture %A, i8* nocapture %B, <4 x i1> %C) nounwind { +entry: + %movcsext20 = sext <4 x i1> %C to <4 x i32> + %tmp2389 = xor <4 x i32> %movcsext20, + %movcand25 = and <4 x i32> %tmp2389, + %movcor26 = or <4 x i32> %movcand25, zeroinitializer + %L2 = bitcast <4 x i32> %movcor26 to <4 x float> + %L3 = shufflevector <4 x float> zeroinitializer, <4 x float> %L2, <4 x i32> + ret <4 x float> %L3 +} Propchange: llvm/trunk/test/Transforms/InstCombine/2011-02-14-InfLoop.ll ------------------------------------------------------------------------------ svn:eol-style = native From akyrtzi at gmail.com Tue Feb 15 01:42:17 2011 From: akyrtzi at gmail.com (Argyrios Kyrtzidis) Date: Tue, 15 Feb 2011 07:42:17 -0000 Subject: [llvm-commits] [llvm] r125558 - /llvm/trunk/utils/TableGen/ClangSACheckersEmitter.cpp Message-ID: <20110215074217.257EE2A6C12C@llvm.org> Author: akirtzidis Date: Tue Feb 15 01:42:16 2011 New Revision: 125558 URL: http://llvm.org/viewvc/llvm-project?rev=125558&view=rev Log: When tablegen'ing the clang analyzer checkers: -Use the tablegen class name for the checker class name. -Mark checker packages as hidden/not hidden. Modified: llvm/trunk/utils/TableGen/ClangSACheckersEmitter.cpp Modified: llvm/trunk/utils/TableGen/ClangSACheckersEmitter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/ClangSACheckersEmitter.cpp?rev=125558&r1=125557&r2=125558&view=diff ============================================================================== --- llvm/trunk/utils/TableGen/ClangSACheckersEmitter.cpp (original) +++ llvm/trunk/utils/TableGen/ClangSACheckersEmitter.cpp Tue Feb 15 01:42:16 2011 @@ -34,32 +34,49 @@ return false; } -static std::string getPackageFullName(Record *R); +static bool isCheckerNamed(const Record *R) { + return !R->getValueAsString("CheckerName").empty(); +} + +static std::string getPackageFullName(const Record *R); -static std::string getParentPackageFullName(Record *R) { +static std::string getParentPackageFullName(const Record *R) { std::string name; if (DefInit *DI = dynamic_cast(R->getValueInit("ParentPackage"))) name = getPackageFullName(DI->getDef()); return name; } -static std::string getPackageFullName(Record *R) { +static std::string getPackageFullName(const Record *R) { std::string name = getParentPackageFullName(R); if (!name.empty()) name += "."; return name + R->getValueAsString("PackageName"); } -static std::string getCheckerFullName(Record *R) { +static std::string getCheckerFullName(const Record *R) { std::string name = getParentPackageFullName(R); - if (!name.empty()) name += "."; - return name + R->getValueAsString("CheckerName"); + if (isCheckerNamed(R)) { + if (!name.empty()) name += "."; + name += R->getValueAsString("CheckerName"); + } + return name; +} + +static std::string getStringValue(const Record &R, StringRef field) { + if (StringInit * + SI = dynamic_cast(R.getValueInit(field))) + return SI->getValue(); + return std::string(); } namespace { struct GroupInfo { std::vector Checkers; llvm::DenseSet SubGroups; + bool Hidden; unsigned Index; + + GroupInfo() : Hidden(false) { } }; } @@ -72,13 +89,16 @@ OS << "\n#ifdef GET_CHECKERS\n"; for (unsigned i = 0, e = checkers.size(); i != e; ++i) { const Record &R = *checkers[i]; - + OS << "CHECKER(" << "\""; - OS.write_escaped(R.getValueAsString("CheckerName")) << "\", "; - OS << R.getValueAsString("ClassName") << ", "; - OS << R.getValueAsString("DescFile") << ", "; + std::string name; + if (isCheckerNamed(&R)) + name = getCheckerFullName(&R); + OS.write_escaped(name) << "\", "; + OS << R.getName() << ", "; + OS << getStringValue(R, "DescFile") << ", "; OS << "\""; - OS.write_escaped(R.getValueAsString("HelpText")) << "\", "; + OS.write_escaped(getStringValue(R, "HelpText")) << "\", "; // Hidden bit if (isHidden(R)) OS << "true"; @@ -99,6 +119,7 @@ std::string fullName = getPackageFullName(R); if (!fullName.empty()) { GroupInfo &info = groupInfoByName[fullName]; + info.Hidden = isHidden(*R); recordGroupMap[R] = &info; } } @@ -116,24 +137,35 @@ for (unsigned i = 0, e = checkers.size(); i != e; ++i) { Record *R = checkers[i]; - std::string fullName = getCheckerFullName(R); - if (!fullName.empty()) { + Record *package = 0; + if (DefInit * + DI = dynamic_cast(R->getValueInit("ParentPackage"))) + package = DI->getDef(); + if (!isCheckerNamed(R) && !package) + throw "Checker '" + R->getName() + "' is neither named, nor in a package!"; + + if (isCheckerNamed(R)) { + // Create a pseudo-group to hold this checker. + std::string fullName = getCheckerFullName(R); GroupInfo &info = groupInfoByName[fullName]; recordGroupMap[R] = &info; info.Checkers.push_back(R); - Record *currR = R; - // Insert the checker and its parent packages into the set of the - // corresponding parent package. - while (DefInit *DI - = dynamic_cast(currR->getValueInit("ParentPackage"))) { - Record *parentPackage = DI->getDef(); - recordGroupMap[parentPackage]->SubGroups.insert(currR); - currR = parentPackage; - } - // Insert the checker into the set of its group. - if (DefInit *DI = dynamic_cast(R->getValueInit("Group"))) - recordGroupMap[DI->getDef()]->SubGroups.insert(R); + } else { + recordGroupMap[package]->Checkers.push_back(R); + } + + Record *currR = isCheckerNamed(R) ? R : package; + // Insert the checker and its parent packages into the subgroups set of + // the corresponding parent package. + while (DefInit *DI + = dynamic_cast(currR->getValueInit("ParentPackage"))) { + Record *parentPackage = DI->getDef(); + recordGroupMap[parentPackage]->SubGroups.insert(currR); + currR = parentPackage; } + // Insert the checker into the set of its group. + if (DefInit *DI = dynamic_cast(R->getValueInit("Group"))) + recordGroupMap[DI->getDef()]->Checkers.push_back(R); } unsigned index = 0; @@ -185,9 +217,12 @@ // Subgroups. if (I->second.SubGroups.empty()) - OS << 0; + OS << "0, "; else - OS << "SubPackageArray" << I->second.Index; + OS << "SubPackageArray" << I->second.Index << ", "; + + OS << (I->second.Hidden ? "true" : "false"); + OS << " },\n"; } OS << "#endif // GET_CHECKNAME_TABLE\n\n"; From baldrick at free.fr Tue Feb 15 03:23:02 2011 From: baldrick at free.fr (Duncan Sands) Date: Tue, 15 Feb 2011 09:23:02 -0000 Subject: [llvm-commits] [llvm] r125563 - in /llvm/trunk: docs/CommandGuide/FileCheck.pod docs/TestingGuide.html docs/WritingAnLLVMPass.html include/llvm/ADT/SmallPtrSet.h lib/CodeGen/AsmPrinter/AsmPrinter.cpp lib/Target/ARM/ARMConstantIslandPass.cpp lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp lib/Transforms/Scalar/LoopIdiomRecognize.cpp lib/Transforms/Scalar/MemCpyOptimizer.cpp Message-ID: <20110215092302.71F492A6C12D@llvm.org> Author: baldrick Date: Tue Feb 15 03:23:02 2011 New Revision: 125563 URL: http://llvm.org/viewvc/llvm-project?rev=125563&view=rev Log: Spelling fix: consequtive -> consecutive. Modified: llvm/trunk/docs/CommandGuide/FileCheck.pod llvm/trunk/docs/TestingGuide.html llvm/trunk/docs/WritingAnLLVMPass.html llvm/trunk/include/llvm/ADT/SmallPtrSet.h llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp llvm/trunk/lib/Target/ARM/ARMConstantIslandPass.cpp llvm/trunk/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp llvm/trunk/lib/Transforms/Scalar/LoopIdiomRecognize.cpp llvm/trunk/lib/Transforms/Scalar/MemCpyOptimizer.cpp Modified: llvm/trunk/docs/CommandGuide/FileCheck.pod URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CommandGuide/FileCheck.pod?rev=125563&r1=125562&r2=125563&view=diff ============================================================================== --- llvm/trunk/docs/CommandGuide/FileCheck.pod (original) +++ llvm/trunk/docs/CommandGuide/FileCheck.pod Tue Feb 15 03:23:02 2011 @@ -133,7 +133,7 @@ =head2 The "CHECK-NEXT:" directive Sometimes you want to match lines and would like to verify that matches -happen on exactly consequtive lines with no other lines in between them. In +happen on exactly consecutive lines with no other lines in between them. In this case, you can use CHECK: and CHECK-NEXT: directives to specify this. If you specified a custom check prefix, just use "-NEXT:". For example, something like this works as you'd expect: Modified: llvm/trunk/docs/TestingGuide.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/TestingGuide.html?rev=125563&r1=125562&r2=125563&view=diff ============================================================================== --- llvm/trunk/docs/TestingGuide.html (original) +++ llvm/trunk/docs/TestingGuide.html Tue Feb 15 03:23:02 2011 @@ -604,7 +604,7 @@

Sometimes you want to match lines and would like to verify that matches -happen on exactly consequtive lines with no other lines in between them. In +happen on exactly consecutive lines with no other lines in between them. In this case, you can use CHECK: and CHECK-NEXT: directives to specify this. If you specified a custom check prefix, just use "<PREFIX>-NEXT:". For example, something like this works as you'd expect:

Modified: llvm/trunk/docs/WritingAnLLVMPass.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/WritingAnLLVMPass.html?rev=125563&r1=125562&r2=125563&view=diff ============================================================================== --- llvm/trunk/docs/WritingAnLLVMPass.html (original) +++ llvm/trunk/docs/WritingAnLLVMPass.html Tue Feb 15 03:23:02 2011 @@ -1474,7 +1474,7 @@

Pipeline the execution of passes on the program - The PassManager attempts to get better cache and memory usage behavior out of a series of passes by pipelining the passes together. This means that, given -a series of consequtive FunctionPass's, it +a series of consecutive FunctionPass's, it will execute all of the FunctionPass's on the first function, then all of the FunctionPasses on the second function, Modified: llvm/trunk/include/llvm/ADT/SmallPtrSet.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/SmallPtrSet.h?rev=125563&r1=125562&r2=125563&view=diff ============================================================================== --- llvm/trunk/include/llvm/ADT/SmallPtrSet.h (original) +++ llvm/trunk/include/llvm/ADT/SmallPtrSet.h Tue Feb 15 03:23:02 2011 @@ -57,7 +57,7 @@ /// it, so that the end iterator actually points to valid memory. unsigned CurArraySize; - // If small, this is # elts allocated consequtively + // If small, this is # elts allocated consecutively unsigned NumElements; unsigned NumTombstones; Modified: llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp?rev=125563&r1=125562&r2=125563&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp (original) +++ llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp Tue Feb 15 03:23:02 2011 @@ -1012,7 +1012,7 @@ } } - // On some targets (e.g. Darwin) we want to emit two consequtive labels + // On some targets (e.g. Darwin) we want to emit two consecutive labels // before each jump table. The first label is never referenced, but tells // the assembler and linker the extents of the jump table object. The // second label is actually referenced by the code. Modified: llvm/trunk/lib/Target/ARM/ARMConstantIslandPass.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMConstantIslandPass.cpp?rev=125563&r1=125562&r2=125563&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMConstantIslandPass.cpp (original) +++ llvm/trunk/lib/Target/ARM/ARMConstantIslandPass.cpp Tue Feb 15 03:23:02 2011 @@ -699,7 +699,7 @@ /// machine function, it upsets all of the block numbers. Renumber the blocks /// and update the arrays that parallel this numbering. void ARMConstantIslands::UpdateForInsertedWaterBlock(MachineBasicBlock *NewBB) { - // Renumber the MBB's to keep them consequtive. + // Renumber the MBB's to keep them consecutive. NewBB->getParent()->RenumberBlocks(NewBB); // Insert a size into BBSizes to align it properly with the (newly Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp?rev=125563&r1=125562&r2=125563&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp (original) +++ llvm/trunk/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp Tue Feb 15 03:23:02 2011 @@ -165,7 +165,7 @@ if (LI.isVolatile()) return 0; // Do really simple store-to-load forwarding and load CSE, to catch cases - // where there are several consequtive memory accesses to the same location, + // where there are several consecutive memory accesses to the same location, // separated by a few arithmetic operations. BasicBlock::iterator BBI = &LI; if (Value *AvailableVal = FindAvailableLoadedValue(Op, LI.getParent(), BBI,6)) Modified: llvm/trunk/lib/Transforms/Scalar/LoopIdiomRecognize.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopIdiomRecognize.cpp?rev=125563&r1=125562&r2=125563&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/LoopIdiomRecognize.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/LoopIdiomRecognize.cpp Tue Feb 15 03:23:02 2011 @@ -273,7 +273,7 @@ return false; // If the stored value is a byte-wise value (like i32 -1), then it may be - // turned into a memset of i8 -1, assuming that all the consequtive bytes + // turned into a memset of i8 -1, assuming that all the consecutive bytes // are stored. A store of i32 0x01020304 can never be turned into a memset. if (Value *SplatValue = isBytewiseValue(StoredVal)) if (processLoopStoreOfSplatValue(StorePtr, StoreSize, SI->getAlignment(), Modified: llvm/trunk/lib/Transforms/Scalar/MemCpyOptimizer.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/MemCpyOptimizer.cpp?rev=125563&r1=125562&r2=125563&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/MemCpyOptimizer.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/MemCpyOptimizer.cpp Tue Feb 15 03:23:02 2011 @@ -352,7 +352,7 @@ /// tryMergingIntoMemset - When scanning forward over instructions, we look for /// some other patterns to fold away. In particular, this looks for stores to -/// neighboring locations of memory. If it sees enough consequtive ones, it +/// neighboring locations of memory. If it sees enough consecutive ones, it /// attempts to merge them together into a memcpy/memset. Instruction *MemCpyOpt::tryMergingIntoMemset(Instruction *StartInst, Value *StartPtr, Value *ByteVal) { From geek4civic at gmail.com Tue Feb 15 03:31:59 2011 From: geek4civic at gmail.com (NAKAMURA Takumi) Date: Tue, 15 Feb 2011 18:31:59 +0900 Subject: [llvm-commits] [PATCH][llvm][clang] Triple::{MinGW32|MinGW64} => Triple::MinGW Message-ID: Good evening. For "so-called mingw64", a few issues are there. - autoconf does not know "*-mingw64". - The project "Mingw-w64" uses *-w64-mingw32 as triplet. - in llvm and clang, some parts assume Win64 as "Triple::MinGW64". In practice, we don't need to distinguish "MinGW32" and "MinGW64" in llvm. In clang, we should not assume "x86_64-mingw" as *-w64-mingw32. There is also "i686-w64-mingw32", as a variant of mingw32. I propose 4 patches for; - Introduce generic Triple::MinGW. MinGW32 and MinGW64 will be deprecated. - Add paths for (personally) known mingw-w64. Excuse me, I split patches for 4 parts, to be consistent for llvm and clang repository. Checked on x86_64-w64-g++(20101129, 20110207) and stage2-3 x64-clang. Any feedbacks are welcome! Thank you in advance. ...Takumi [llvm] NAKAMURA Takumi (2): Introduce Triple::MinGW. Triple::MinGW32 and Triple::MinGW64 are deprecated and removed. We can use Triple::MinGW. include/llvm/ADT/Triple.h | 3 +-- lib/Support/Triple.cpp | 9 +++------ lib/Target/ARM/ARMAsmBackend.cpp | 2 +- lib/Target/ARM/ARMTargetMachine.cpp | 3 +-- lib/Target/MBlaze/MBlazeAsmBackend.cpp | 2 +- lib/Target/MBlaze/MBlazeTargetMachine.cpp | 3 +-- lib/Target/X86/X86AsmBackend.cpp | 4 ++-- lib/Target/X86/X86Subtarget.h | 4 +--- lib/Target/X86/X86TargetMachine.cpp | 6 ++---- 9 files changed, 13 insertions(+), 23 deletions(-) [clang] NAKAMURA Takumi (2): Introduce Triple::MinGW. MinGW32 and MinGW64 are deprecated. lib/Frontend/InitHeaderSearch.cpp: Add mingw-w64's include paths. lib/Basic/Targets.cpp | 4 ++-- lib/CodeGen/TargetInfo.cpp | 4 ++-- lib/Driver/Driver.cpp | 3 +-- lib/Driver/Tools.cpp | 3 +-- lib/Frontend/InitHeaderSearch.cpp | 21 ++++++++++----------- lib/Sema/TargetAttributesSema.cpp | 3 +-- 6 files changed, 17 insertions(+), 21 deletions(-) From geek4civic at gmail.com Tue Feb 15 03:32:23 2011 From: geek4civic at gmail.com (NAKAMURA Takumi) Date: Tue, 15 Feb 2011 18:32:23 +0900 Subject: [llvm-commits] [PATCH 1/4][llvm] Introduce Triple::MinGW. Message-ID: No one uses *-mingw64. mingw-w64 is represented as {i686|x86_64}-w64-mingw32. In llvm side, i686 and 64 can be treated as similar way. --- include/llvm/ADT/Triple.h | 4 +++- lib/Support/Triple.cpp | 10 ++++------ lib/Target/ARM/ARMAsmBackend.cpp | 2 +- lib/Target/ARM/ARMTargetMachine.cpp | 3 +-- lib/Target/MBlaze/MBlazeAsmBackend.cpp | 2 +- lib/Target/MBlaze/MBlazeTargetMachine.cpp | 3 +-- lib/Target/X86/X86AsmBackend.cpp | 4 ++-- lib/Target/X86/X86Subtarget.h | 4 +--- lib/Target/X86/X86TargetMachine.cpp | 6 ++---- 9 files changed, 16 insertions(+), 22 deletions(-) -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-Introduce-Triple-MinGW.patch Type: text/x-patch Size: 6396 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110215/65bdbba0/attachment.bin From geek4civic at gmail.com Tue Feb 15 03:32:53 2011 From: geek4civic at gmail.com (NAKAMURA Takumi) Date: Tue, 15 Feb 2011 18:32:53 +0900 Subject: [llvm-commits] [PATCH 3/4][llvm] Triple::MinGW32 and Triple::MinGW64 are deprecated and removed. We can use Triple::MinGW. Message-ID: --- include/llvm/ADT/Triple.h | 3 --- lib/Support/Triple.cpp | 1 - 2 files changed, 0 insertions(+), 4 deletions(-) -------------- next part -------------- A non-text attachment was scrubbed... Name: 0002-Triple-MinGW32-and-Triple-MinGW64-are-deprecated-and.patch Type: text/x-patch Size: 844 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110215/2ad5cf1c/attachment.bin From baldrick at free.fr Tue Feb 15 03:36:36 2011 From: baldrick at free.fr (Duncan Sands) Date: Tue, 15 Feb 2011 10:36:36 +0100 Subject: [llvm-commits] [PATCH][llvm][clang] Triple::{MinGW32|MinGW64} => Triple::MinGW In-Reply-To: References: Message-ID: <4D5A4924.6090407@free.fr> Hi, > For "so-called mingw64", a few issues are there. > > - autoconf does not know "*-mingw64". > - The project "Mingw-w64" uses *-w64-mingw32 as triplet. > - in llvm and clang, some parts assume Win64 as "Triple::MinGW64". > > In practice, we don't need to distinguish "MinGW32" and "MinGW64" in llvm. > In clang, we should not assume "x86_64-mingw" as *-w64-mingw32. > There is also "i686-w64-mingw32", as a variant of mingw32. what does gcc do? Ciao, Duncan. From geek4civic at gmail.com Tue Feb 15 03:44:05 2011 From: geek4civic at gmail.com (NAKAMURA Takumi) Date: Tue, 15 Feb 2011 18:44:05 +0900 Subject: [llvm-commits] [PATCH][llvm][clang] Triple::{MinGW32|MinGW64} => Triple::MinGW In-Reply-To: <4D5A4924.6090407@free.fr> References: <4D5A4924.6090407@free.fr> Message-ID: On Tue, Feb 15, 2011 at 6:36 PM, Duncan Sands wrote: >> For "so-called mingw64", a few issues are there. >> >> ? - autoconf does not know "*-mingw64". >> ? - The project "Mingw-w64" uses *-w64-mingw32 as triplet. >> ? - in llvm and clang, some parts assume Win64 as "Triple::MinGW64". >> >> In practice, we don't need to distinguish "MinGW32" and "MinGW64" in llvm. >> In clang, we should not assume "x86_64-mingw" as *-w64-mingw32. >> There is also "i686-w64-mingw32", as a variant of mingw32. > > what does gcc do? Traditional Mingw assumes "i686-pc-mingw32". Mingw-w64 assumes "x86_64-w64-mingw32" and "i686-w64-mingw32". See also; http://sourceforge.net/apps/trac/mingw-w64/wiki/Cross%20Win32%20and%20Win64%20compiler ...Takumi From baldrick at free.fr Tue Feb 15 03:49:08 2011 From: baldrick at free.fr (Duncan Sands) Date: Tue, 15 Feb 2011 10:49:08 +0100 Subject: [llvm-commits] [PATCH][llvm][clang] Triple::{MinGW32|MinGW64} => Triple::MinGW In-Reply-To: References: <4D5A4924.6090407@free.fr> Message-ID: <4D5A4C14.7010603@free.fr> Hi, >>> For "so-called mingw64", a few issues are there. >>> >>> - autoconf does not know "*-mingw64". >>> - The project "Mingw-w64" uses *-w64-mingw32 as triplet. >>> - in llvm and clang, some parts assume Win64 as "Triple::MinGW64". >>> >>> In practice, we don't need to distinguish "MinGW32" and "MinGW64" in llvm. >>> In clang, we should not assume "x86_64-mingw" as *-w64-mingw32. >>> There is also "i686-w64-mingw32", as a variant of mingw32. >> >> what does gcc do? > > Traditional Mingw assumes "i686-pc-mingw32". > Mingw-w64 assumes "x86_64-w64-mingw32" and "i686-w64-mingw32". > > See also; > http://sourceforge.net/apps/trac/mingw-w64/wiki/Cross%20Win32%20and%20Win64%20compiler if I understand right no project understands mingw64 except for LLVM, so you are going to remove mingw64. Also, other projects use "w64" rather than "pc" to say ... well, I'm not sure what this says, but presumably to say whatever mingw64 was trying to say; so you plan to teach LLVM about w64. Is that right? Ciao, Duncan. From baldrick at free.fr Tue Feb 15 04:01:01 2011 From: baldrick at free.fr (Duncan Sands) Date: Tue, 15 Feb 2011 11:01:01 +0100 Subject: [llvm-commits] [PATCH 1/4][llvm] Introduce Triple::MinGW. In-Reply-To: References: Message-ID: <4D5A4EDD.6030307@free.fr> Hi, > @@ -84,8 +84,10 @@ public: > FreeBSD, > Linux, > Lv2, // PS3 > - MinGW32, > + MinGW, // i*86-pc-mingw32, *-w64-mingw32 > +#define MinGW32 MinGW > MinGW64, > + // FIXME: They will be removed soon. why not remove them at once? > @@ -316,10 +316,8 @@ Triple::OSType Triple::ParseOS(StringRef OSName) { > return Linux; > else if (OSName.startswith("lv2")) > return Lv2; > - else if (OSName.startswith("mingw32")) > - return MinGW32; > - else if (OSName.startswith("mingw64")) > - return MinGW64; > + else if (OSName.startswith("mingw")) > + return MinGW; here you will accept mingw, ming32 and mingw64 while gcc only accepts mingw32. I'm not saying that this is wrong, but maybe it is unwise. Ciao, Duncan. From geek4civic at gmail.com Tue Feb 15 04:18:01 2011 From: geek4civic at gmail.com (NAKAMURA Takumi) Date: Tue, 15 Feb 2011 19:18:01 +0900 Subject: [llvm-commits] [PATCH 1/4][llvm] Introduce Triple::MinGW. In-Reply-To: <4D5A4EDD.6030307@free.fr> References: <4D5A4EDD.6030307@free.fr> Message-ID: Duncan, On Tue, Feb 15, 2011 at 7:01 PM, Duncan Sands wrote: >> @@ -84,8 +84,10 @@ public: >> ? ? FreeBSD, >> ? ? Linux, >> ? ? Lv2, ? ? ? ?// PS3 >> - ? ?MinGW32, >> + ? ?MinGW, ? ? ?// i*86-pc-mingw32, *-w64-mingw32 >> +#define MinGW32 MinGW >> ? ? MinGW64, >> + ? ?// FIXME: They will be removed soon. > > why not remove them at once? [3/4] removes them. I think MinGW32 and MinGW64 should be kept here for now. For consistency to clang. I cannot commit to llvm and clang at the same time atomically. :( Please be patient. >> @@ -316,10 +316,8 @@ Triple::OSType Triple::ParseOS(StringRef OSName) { >> ? ? return Linux; >> ? else if (OSName.startswith("lv2")) >> ? ? return Lv2; >> - ?else if (OSName.startswith("mingw32")) >> - ? ?return MinGW32; >> - ?else if (OSName.startswith("mingw64")) >> - ? ?return MinGW64; >> + ?else if (OSName.startswith("mingw")) >> + ? ?return MinGW; > > here you will accept mingw, ming32 and mingw64 while gcc only accepts > mingw32. ?I'm not saying that this is wrong, but maybe it is unwise. I understand. In practice, llvm's config.sub recognizes "mingw32", neither "mingw" nor "mingw64". $ ./config.sub mingw32 (mingw and mingw64 are not recognized) i386-pc-mingw32 I thought it would be better to relax recognizing triplet, though, that makes sense. It would be easier simply to drop "mingw64" and make assume only "mingw32" (Triple::MinGW32), even then my mission would be achieved. Thank you, ...Takumi From baldrick at free.fr Tue Feb 15 04:35:16 2011 From: baldrick at free.fr (Duncan Sands) Date: Tue, 15 Feb 2011 11:35:16 +0100 Subject: [llvm-commits] [PATCH 1/4][llvm] Introduce Triple::MinGW. In-Reply-To: References: <4D5A4EDD.6030307@free.fr> Message-ID: <4D5A56E4.4030800@free.fr> Hi, > On Tue, Feb 15, 2011 at 7:01 PM, Duncan Sands wrote: >>> @@ -84,8 +84,10 @@ public: >>> FreeBSD, >>> Linux, >>> Lv2, // PS3 >>> - MinGW32, >>> + MinGW, // i*86-pc-mingw32, *-w64-mingw32 >>> +#define MinGW32 MinGW >>> MinGW64, >>> + // FIXME: They will be removed soon. >> >> why not remove them at once? > > [3/4] removes them. I think MinGW32 and MinGW64 should be kept here for now. > For consistency to clang. I cannot commit to llvm and clang at the > same time atomically. :( > Please be patient. OK :) >>> @@ -316,10 +316,8 @@ Triple::OSType Triple::ParseOS(StringRef OSName) { >>> return Linux; >>> else if (OSName.startswith("lv2")) >>> return Lv2; >>> - else if (OSName.startswith("mingw32")) >>> - return MinGW32; >>> - else if (OSName.startswith("mingw64")) >>> - return MinGW64; >>> + else if (OSName.startswith("mingw")) >>> + return MinGW; >> >> here you will accept mingw, ming32 and mingw64 while gcc only accepts >> mingw32. I'm not saying that this is wrong, but maybe it is unwise. > > I understand. In practice, llvm's config.sub recognizes "mingw32", > neither "mingw" nor "mingw64". > > $ ./config.sub mingw32 (mingw and mingw64 are not recognized) > i386-pc-mingw32 > > I thought it would be better to relax recognizing triplet, though, > that makes sense. The danger that I see is that because it will accept mingw64, people will think that by passing mingw64 they are telling LLVM something different to mingw32, creating confusion. That said, I think this patch is OK to apply. Ciao, Duncan. From baldrick at free.fr Tue Feb 15 04:36:07 2011 From: baldrick at free.fr (Duncan Sands) Date: Tue, 15 Feb 2011 11:36:07 +0100 Subject: [llvm-commits] [PATCH 3/4][llvm] Triple::MinGW32 and Triple::MinGW64 are deprecated and removed. We can use Triple::MinGW. In-Reply-To: References: Message-ID: <4D5A5717.3000507@free.fr> This patch looks OK to me. Ciao, Duncan. From vanboxem.ruben at gmail.com Tue Feb 15 05:02:06 2011 From: vanboxem.ruben at gmail.com (Ruben Van Boxem) Date: Tue, 15 Feb 2011 12:02:06 +0100 Subject: [llvm-commits] [PATCH 1/4][llvm] Introduce Triple::MinGW. In-Reply-To: <4D5A4EDD.6030307@free.fr> References: <4D5A4EDD.6030307@free.fr> Message-ID: Better would be mingw*, and every toolchain should be classified as mingw32, irrelevant if there's mingw.org or mingw-w64. (the 32 comes from the win32 API). mingw64 does not exist... Op 15 feb. 2011 11:01 schreef "Duncan Sands" het volgende: > Hi, > >> @@ -84,8 +84,10 @@ public: >> FreeBSD, >> Linux, >> Lv2, // PS3 >> - MinGW32, >> + MinGW, // i*86-pc-mingw32, *-w64-mingw32 >> +#define MinGW32 MinGW >> MinGW64, >> + // FIXME: They will be removed soon. > > why not remove them at once? > >> @@ -316,10 +316,8 @@ Triple::OSType Triple::ParseOS(StringRef OSName) { >> return Linux; >> else if (OSName.startswith("lv2")) >> return Lv2; >> - else if (OSName.startswith("mingw32")) >> - return MinGW32; >> - else if (OSName.startswith("mingw64")) >> - return MinGW64; >> + else if (OSName.startswith("mingw")) >> + return MinGW; > > here you will accept mingw, ming32 and mingw64 while gcc only accepts > mingw32. I'm not saying that this is wrong, but maybe it is unwise. > > Ciao, Duncan. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110215/042189ab/attachment.html From dpatel at apple.com Tue Feb 15 11:24:56 2011 From: dpatel at apple.com (Devang Patel) Date: Tue, 15 Feb 2011 17:24:56 -0000 Subject: [llvm-commits] [llvm] r125567 - in /llvm/trunk/lib/Analysis: DbgInfoPrinter.cpp DebugInfo.cpp Message-ID: <20110215172456.C6DF62A6C12D@llvm.org> Author: dpatel Date: Tue Feb 15 11:24:56 2011 New Revision: 125567 URL: http://llvm.org/viewvc/llvm-project?rev=125567&view=rev Log: Print function info. Patch by Minjang Kim. Modified: llvm/trunk/lib/Analysis/DbgInfoPrinter.cpp llvm/trunk/lib/Analysis/DebugInfo.cpp Modified: llvm/trunk/lib/Analysis/DbgInfoPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/DbgInfoPrinter.cpp?rev=125567&r1=125566&r2=125567&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/DbgInfoPrinter.cpp (original) +++ llvm/trunk/lib/Analysis/DbgInfoPrinter.cpp Tue Feb 15 11:24:56 2011 @@ -66,8 +66,12 @@ Out << "; "; WriteAsOperand(Out, V, false, 0); - Out << " is variable " << DisplayName - << " of type " << Type << " declared at "; + if (isa(V)) + Out << " is function " << DisplayName + << " of type " << Type << " declared at "; + else + Out << " is variable " << DisplayName + << " of type " << Type << " declared at "; if (PrintDirectory) Out << Directory << "/"; Modified: llvm/trunk/lib/Analysis/DebugInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/DebugInfo.cpp?rev=125567&r1=125566&r2=125567&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/DebugInfo.cpp (original) +++ llvm/trunk/lib/Analysis/DebugInfo.cpp Tue Feb 15 11:24:56 2011 @@ -1592,6 +1592,23 @@ return 0; } +/// Find the debug info descriptor corresponding to this function. +static Value *findDbgSubprogramDeclare(Function *V) { + const Module *M = V->getParent(); + NamedMDNode *NMD = M->getNamedMetadata("llvm.dbg.sp"); + if (!NMD) + return 0; + + for (unsigned i = 0, e = NMD->getNumOperands(); i != e; ++i) { + DIDescriptor DIG(cast(NMD->getOperand(i))); + if (!DIG.isSubprogram()) + continue; + if (DISubprogram(DIG).getFunction() == V) + return DIG; + } + return 0; +} + /// Finds the llvm.dbg.declare intrinsic corresponding to this value if any. /// It looks through pointer casts too. static const DbgDeclareInst *findDbgDeclare(const Value *V) { @@ -1633,6 +1650,17 @@ LineNo = Var.getLineNumber(); Unit = Var.getCompileUnit(); TypeD = Var.getType(); + } else if (Function *F = dyn_cast(const_cast(V))){ + Value *DIF = findDbgSubprogramDeclare(F); + if (!DIF) return false; + DISubprogram Var(cast(DIF)); + + StringRef D = Var.getDisplayName(); + if (!D.empty()) + DisplayName = D; + LineNo = Var.getLineNumber(); + Unit = Var.getCompileUnit(); + TypeD = Var.getType(); } else { const DbgDeclareInst *DDI = findDbgDeclare(V); if (!DDI) return false; From dpatel at apple.com Tue Feb 15 11:36:11 2011 From: dpatel at apple.com (Devang Patel) Date: Tue, 15 Feb 2011 17:36:11 -0000 Subject: [llvm-commits] [llvm] r125571 - in /llvm/trunk: include/llvm/Analysis/DebugInfo.h lib/Analysis/DbgInfoPrinter.cpp lib/Analysis/DebugInfo.cpp Message-ID: <20110215173611.3E44F2A6C12D@llvm.org> Author: dpatel Date: Tue Feb 15 11:36:11 2011 New Revision: 125571 URL: http://llvm.org/viewvc/llvm-project?rev=125571&view=rev Log: Move DbgInfoPrinter specific utlities inside DbgInfoPrinter.cpp Modified: llvm/trunk/include/llvm/Analysis/DebugInfo.h llvm/trunk/lib/Analysis/DbgInfoPrinter.cpp llvm/trunk/lib/Analysis/DebugInfo.cpp Modified: llvm/trunk/include/llvm/Analysis/DebugInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/DebugInfo.h?rev=125571&r1=125570&r2=125571&view=diff ============================================================================== --- llvm/trunk/include/llvm/Analysis/DebugInfo.h (original) +++ llvm/trunk/include/llvm/Analysis/DebugInfo.h Tue Feb 15 11:36:11 2011 @@ -868,10 +868,6 @@ Constant *GetTagConstant(unsigned TAG); }; - bool getLocationInfo(const Value *V, std::string &DisplayName, - std::string &Type, unsigned &LineNo, std::string &File, - std::string &Dir); - /// getDISubprogram - Find subprogram that is enclosing this scope. DISubprogram getDISubprogram(const MDNode *Scope); Modified: llvm/trunk/lib/Analysis/DbgInfoPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/DbgInfoPrinter.cpp?rev=125571&r1=125570&r2=125571&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/DbgInfoPrinter.cpp (original) +++ llvm/trunk/lib/Analysis/DbgInfoPrinter.cpp Tue Feb 15 11:36:11 2011 @@ -20,6 +20,7 @@ #include "llvm/Function.h" #include "llvm/IntrinsicInst.h" #include "llvm/Metadata.h" +#include "llvm/Module.h" #include "llvm/Assembly/Writer.h" #include "llvm/Analysis/DebugInfo.h" #include "llvm/Analysis/Passes.h" @@ -57,6 +58,117 @@ FunctionPass *llvm::createDbgInfoPrinterPass() { return new PrintDbgInfo(); } +/// Find the debug info descriptor corresponding to this global variable. +static Value *findDbgGlobalDeclare(GlobalVariable *V) { + const Module *M = V->getParent(); + NamedMDNode *NMD = M->getNamedMetadata("llvm.dbg.gv"); + if (!NMD) + return 0; + + for (unsigned i = 0, e = NMD->getNumOperands(); i != e; ++i) { + DIDescriptor DIG(cast(NMD->getOperand(i))); + if (!DIG.isGlobalVariable()) + continue; + if (DIGlobalVariable(DIG).getGlobal() == V) + return DIG; + } + return 0; +} + +/// Find the debug info descriptor corresponding to this function. +static Value *findDbgSubprogramDeclare(Function *V) { + const Module *M = V->getParent(); + NamedMDNode *NMD = M->getNamedMetadata("llvm.dbg.sp"); + if (!NMD) + return 0; + + for (unsigned i = 0, e = NMD->getNumOperands(); i != e; ++i) { + DIDescriptor DIG(cast(NMD->getOperand(i))); + if (!DIG.isSubprogram()) + continue; + if (DISubprogram(DIG).getFunction() == V) + return DIG; + } + return 0; +} + +/// Finds the llvm.dbg.declare intrinsic corresponding to this value if any. +/// It looks through pointer casts too. +static const DbgDeclareInst *findDbgDeclare(const Value *V) { + V = V->stripPointerCasts(); + + if (!isa(V) && !isa(V)) + return 0; + + const Function *F = NULL; + if (const Instruction *I = dyn_cast(V)) + F = I->getParent()->getParent(); + else if (const Argument *A = dyn_cast(V)) + F = A->getParent(); + + for (Function::const_iterator FI = F->begin(), FE = F->end(); FI != FE; ++FI) + for (BasicBlock::const_iterator BI = (*FI).begin(), BE = (*FI).end(); + BI != BE; ++BI) + if (const DbgDeclareInst *DDI = dyn_cast(BI)) + if (DDI->getAddress() == V) + return DDI; + + return 0; +} + +static bool getLocationInfo(const Value *V, std::string &DisplayName, + std::string &Type, unsigned &LineNo, + std::string &File, std::string &Dir) { + DICompileUnit Unit; + DIType TypeD; + + if (GlobalVariable *GV = dyn_cast(const_cast(V))) { + Value *DIGV = findDbgGlobalDeclare(GV); + if (!DIGV) return false; + DIGlobalVariable Var(cast(DIGV)); + + StringRef D = Var.getDisplayName(); + if (!D.empty()) + DisplayName = D; + LineNo = Var.getLineNumber(); + Unit = Var.getCompileUnit(); + TypeD = Var.getType(); + } else if (Function *F = dyn_cast(const_cast(V))){ + Value *DIF = findDbgSubprogramDeclare(F); + if (!DIF) return false; + DISubprogram Var(cast(DIF)); + + StringRef D = Var.getDisplayName(); + if (!D.empty()) + DisplayName = D; + LineNo = Var.getLineNumber(); + Unit = Var.getCompileUnit(); + TypeD = Var.getType(); + } else { + const DbgDeclareInst *DDI = findDbgDeclare(V); + if (!DDI) return false; + DIVariable Var(cast(DDI->getVariable())); + + StringRef D = Var.getName(); + if (!D.empty()) + DisplayName = D; + LineNo = Var.getLineNumber(); + Unit = Var.getCompileUnit(); + TypeD = Var.getType(); + } + + StringRef T = TypeD.getName(); + if (!T.empty()) + Type = T; + StringRef F = Unit.getFilename(); + if (!F.empty()) + File = F; + StringRef D = Unit.getDirectory(); + if (!D.empty()) + Dir = D; + return true; +} + void PrintDbgInfo::printVariableDeclaration(const Value *V) { std::string DisplayName, File, Directory, Type; unsigned LineNo; Modified: llvm/trunk/lib/Analysis/DebugInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/DebugInfo.cpp?rev=125571&r1=125570&r2=125571&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/DebugInfo.cpp (original) +++ llvm/trunk/lib/Analysis/DebugInfo.cpp Tue Feb 15 11:36:11 2011 @@ -1575,117 +1575,6 @@ return true; } -/// Find the debug info descriptor corresponding to this global variable. -static Value *findDbgGlobalDeclare(GlobalVariable *V) { - const Module *M = V->getParent(); - NamedMDNode *NMD = M->getNamedMetadata("llvm.dbg.gv"); - if (!NMD) - return 0; - - for (unsigned i = 0, e = NMD->getNumOperands(); i != e; ++i) { - DIDescriptor DIG(cast(NMD->getOperand(i))); - if (!DIG.isGlobalVariable()) - continue; - if (DIGlobalVariable(DIG).getGlobal() == V) - return DIG; - } - return 0; -} - -/// Find the debug info descriptor corresponding to this function. -static Value *findDbgSubprogramDeclare(Function *V) { - const Module *M = V->getParent(); - NamedMDNode *NMD = M->getNamedMetadata("llvm.dbg.sp"); - if (!NMD) - return 0; - - for (unsigned i = 0, e = NMD->getNumOperands(); i != e; ++i) { - DIDescriptor DIG(cast(NMD->getOperand(i))); - if (!DIG.isSubprogram()) - continue; - if (DISubprogram(DIG).getFunction() == V) - return DIG; - } - return 0; -} - -/// Finds the llvm.dbg.declare intrinsic corresponding to this value if any. -/// It looks through pointer casts too. -static const DbgDeclareInst *findDbgDeclare(const Value *V) { - V = V->stripPointerCasts(); - - if (!isa(V) && !isa(V)) - return 0; - - const Function *F = NULL; - if (const Instruction *I = dyn_cast(V)) - F = I->getParent()->getParent(); - else if (const Argument *A = dyn_cast(V)) - F = A->getParent(); - - for (Function::const_iterator FI = F->begin(), FE = F->end(); FI != FE; ++FI) - for (BasicBlock::const_iterator BI = (*FI).begin(), BE = (*FI).end(); - BI != BE; ++BI) - if (const DbgDeclareInst *DDI = dyn_cast(BI)) - if (DDI->getAddress() == V) - return DDI; - - return 0; -} - -bool llvm::getLocationInfo(const Value *V, std::string &DisplayName, - std::string &Type, unsigned &LineNo, - std::string &File, std::string &Dir) { - DICompileUnit Unit; - DIType TypeD; - - if (GlobalVariable *GV = dyn_cast(const_cast(V))) { - Value *DIGV = findDbgGlobalDeclare(GV); - if (!DIGV) return false; - DIGlobalVariable Var(cast(DIGV)); - - StringRef D = Var.getDisplayName(); - if (!D.empty()) - DisplayName = D; - LineNo = Var.getLineNumber(); - Unit = Var.getCompileUnit(); - TypeD = Var.getType(); - } else if (Function *F = dyn_cast(const_cast(V))){ - Value *DIF = findDbgSubprogramDeclare(F); - if (!DIF) return false; - DISubprogram Var(cast(DIF)); - - StringRef D = Var.getDisplayName(); - if (!D.empty()) - DisplayName = D; - LineNo = Var.getLineNumber(); - Unit = Var.getCompileUnit(); - TypeD = Var.getType(); - } else { - const DbgDeclareInst *DDI = findDbgDeclare(V); - if (!DDI) return false; - DIVariable Var(cast(DDI->getVariable())); - - StringRef D = Var.getName(); - if (!D.empty()) - DisplayName = D; - LineNo = Var.getLineNumber(); - Unit = Var.getCompileUnit(); - TypeD = Var.getType(); - } - - StringRef T = TypeD.getName(); - if (!T.empty()) - Type = T; - StringRef F = Unit.getFilename(); - if (!F.empty()) - File = F; - StringRef D = Unit.getDirectory(); - if (!D.empty()) - Dir = D; - return true; -} - /// getDISubprogram - Find subprogram that is enclosing this scope. DISubprogram llvm::getDISubprogram(const MDNode *Scope) { DIDescriptor D(Scope); From daniel at zuster.org Tue Feb 15 11:36:57 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Tue, 15 Feb 2011 17:36:57 -0000 Subject: [llvm-commits] [zorg] r125572 - /zorg/trunk/lnt/docs/_templates/indexsidebar.html Message-ID: <20110215173657.CFC8B2A6C12D@llvm.org> Author: ddunbar Date: Tue Feb 15 11:36:57 2011 New Revision: 125572 URL: http://llvm.org/viewvc/llvm-project?rev=125572&view=rev Log: lnt/docs: Drop download link for now, it isn't autobuilt. Modified: zorg/trunk/lnt/docs/_templates/indexsidebar.html Modified: zorg/trunk/lnt/docs/_templates/indexsidebar.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/docs/_templates/indexsidebar.html?rev=125572&r1=125571&r2=125572&view=diff ============================================================================== --- zorg/trunk/lnt/docs/_templates/indexsidebar.html (original) +++ zorg/trunk/lnt/docs/_templates/indexsidebar.html Tue Feb 15 11:36:57 2011 @@ -1,9 +1,3 @@ -

Download

- Current version: {{ version }}.

Install

Current release:
From akyrtzi at gmail.com Tue Feb 15 11:51:19 2011 From: akyrtzi at gmail.com (Argyrios Kyrtzidis) Date: Tue, 15 Feb 2011 17:51:19 -0000 Subject: [llvm-commits] [llvm] r125574 - /llvm/trunk/lib/Support/PathV2.cpp Message-ID: <20110215175119.C28CB2A6C12C@llvm.org> Author: akirtzidis Date: Tue Feb 15 11:51:19 2011 New Revision: 125574 URL: http://llvm.org/viewvc/llvm-project?rev=125574&view=rev Log: Implement a function from PathV2 whose definition is missing. Modified: llvm/trunk/lib/Support/PathV2.cpp Modified: llvm/trunk/lib/Support/PathV2.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/PathV2.cpp?rev=125574&r1=125573&r2=125574&view=diff ============================================================================== --- llvm/trunk/lib/Support/PathV2.cpp (original) +++ llvm/trunk/lib/Support/PathV2.cpp Tue Feb 15 11:51:19 2011 @@ -391,6 +391,12 @@ } } +void append(SmallVectorImpl
&path, + const_iterator begin, const_iterator end) { + for (; begin != end; ++begin) + path::append(path, *begin); +} + const StringRef parent_path(StringRef path) { size_t end_pos = parent_path_end(path); if (end_pos == StringRef::npos) From viridia at gmail.com Tue Feb 15 11:55:22 2011 From: viridia at gmail.com (Talin) Date: Tue, 15 Feb 2011 09:55:22 -0800 Subject: [llvm-commits] PATCH: Additional convenience methods for ConstantStruct, ConstantArray, and ConstantVector. In-Reply-To:
References:
Message-ID:
ping? On Thu, Feb 10, 2011 at 1:40 PM, Talin wrote: > This patch adds a new "get" method to ConstantStruct, ConstantArray and > ConstantVector. The new method accepts a pair of RandomAccessIterators, > similar to other LLVM method signatures. This allows constants to be build > using a small vector or other sequential container type more easily. > > In addition, I've also added an END_WITH_NULL variant for > ConstantStruct::get(). I only added it to ConstantStruct because I figured > that it would be an uncommon use case for arrays and vectors, whereas the > creation of small constant structs of predetermined length is fairly common. > > -- > -- Talin > -- -- Talin -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110215/b341f350/attachment.html From dpatel at apple.com Tue Feb 15 11:56:09 2011 From: dpatel at apple.com (Devang Patel) Date: Tue, 15 Feb 2011 17:56:09 -0000 Subject: [llvm-commits] [llvm] r125577 - in /llvm/trunk: lib/CodeGen/AsmPrinter/DwarfDebug.cpp test/CodeGen/X86/dbg-value-range.ll Message-ID: <20110215175609.866232A6C12C@llvm.org> Author: dpatel Date: Tue Feb 15 11:56:09 2011 New Revision: 125577 URL: http://llvm.org/viewvc/llvm-project?rev=125577&view=rev Log: Ignore DBG_VALUE machine instructions while constructing instruction ranges based on location info. Machine instruction range consisting of only DBG_VALUE MIs only contributes consecutive labels in assembly output, which is harmless, and empty scope entry in DebugInfo, which confuses debugger tools. Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp llvm/trunk/test/CodeGen/X86/dbg-value-range.ll Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=125577&r1=125576&r2=125577&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original) +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Tue Feb 15 11:56:09 2011 @@ -2708,6 +2708,10 @@ continue; } + // Ignore DBG_VALUE. It does not contribute any instruction in output. + if (MInsn->isDebugValue()) + continue; + if (RangeBeginMI) { // If we have alread seen a beginning of a instruction range and // current instruction scope does not match scope of first instruction Modified: llvm/trunk/test/CodeGen/X86/dbg-value-range.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/dbg-value-range.ll?rev=125577&r1=125576&r2=125577&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/dbg-value-range.ll (original) +++ llvm/trunk/test/CodeGen/X86/dbg-value-range.ll Tue Feb 15 11:56:09 2011 @@ -44,12 +44,12 @@ ; check that variable bar:b value range is appropriately trucated in debug info. Here Ltmp5 is end of ; location range. -;CHECK:Ltmp7 +;CHECK:Ltmp6 ;CHECK-NEXT: DEBUG_VALUE: bar:b <- undef ;CHECK:Ldebug_loc0: ;CHECK-NEXT: .quad Ltmp -;CHECK-NEXT: .quad Ltmp7 +;CHECK-NEXT: .quad Ltmp6 ;CHECK-NEXT: .short 1 ;CHECK-NEXT: .byte 85 ;CHECK-NEXT: .quad 0 From daniel at zuster.org Tue Feb 15 13:17:25 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Tue, 15 Feb 2011 19:17:25 -0000 Subject: [llvm-commits] [test-suite] r125586 - /test-suite/trunk/tools/fpcmp.c Message-ID: <20110215191726.091F92A6C12C@llvm.org> Author: ddunbar Date: Tue Feb 15 13:17:25 2011 New Revision: 125586 URL: http://llvm.org/viewvc/llvm-project?rev=125586&view=rev Log: test-suite/fpcmp: Finish turning FileUtilities.cpp into a C program. Modified: test-suite/trunk/tools/fpcmp.c Modified: test-suite/trunk/tools/fpcmp.c URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/tools/fpcmp.c?rev=125586&r1=125585&r2=125586&view=diff ============================================================================== --- test-suite/trunk/tools/fpcmp.c (original) +++ test-suite/trunk/tools/fpcmp.c Tue Feb 15 13:17:25 2011 @@ -7,10 +7,159 @@ |* *| \*===----------------------------------------------------------------------===*/ +/* Note that this file is essentially a bastardized C version of + * FileUtilities.cpp from LLVM. */ + +#include +#include #include #include #include +const char *g_program; + +/* *** */ + +typedef int bool; +#define true ((bool) 1) +#define false ((bool) 0) + +static bool isSignedChar(char C) { + return (C == '+' || C == '-'); +} + +static bool isExponentChar(char C) { + switch (C) { + case 'D': // Strange exponential notation. + case 'd': // Strange exponential notation. + case 'e': + case 'E': return true; + default: return false; + } +} + +static bool isNumberChar(char C) { + switch (C) { + case '0': case '1': case '2': case '3': case '4': + case '5': case '6': case '7': case '8': case '9': + case '.': return true; + default: return isSignedChar(C) || isExponentChar(C); + } +} + +static const char *BackupNumber(const char *Pos, const char *FirstChar) { + // If we didn't stop in the middle of a number, don't backup. + if (!isNumberChar(*Pos)) return Pos; + + // Otherwise, return to the start of the number. + bool HasPeriod = false; + while (Pos > FirstChar && isNumberChar(Pos[-1])) { + // Backup over at most one period. + if (Pos[-1] == '.') { + if (HasPeriod) + break; + HasPeriod = true; + } + + --Pos; + if (Pos > FirstChar && isSignedChar(Pos[0]) && !isExponentChar(Pos[-1])) + break; + } + return Pos; +} + +/// EndOfNumber - Return the first character that is not part of the specified +/// number. This assumes that the buffer is null terminated, so it won't fall +/// off the end. +static const char *EndOfNumber(const char *Pos) { + while (isNumberChar(*Pos)) + ++Pos; + return Pos; +} + +/// CompareNumbers - compare two numbers, returning true if they are different. +static bool CompareNumbers(const char **F1PP, const char **F2PP, + const char *F1End, const char *F2End, + double AbsTolerance, double RelTolerance) { + const char *F1P = *F1PP; + const char *F2P = *F2PP; + const char *F1NumEnd, *F2NumEnd; + double V1 = 0.0, V2 = 0.0; + + // If one of the positions is at a space and the other isn't, chomp up 'til + // the end of the space. + while (isspace(*F1P) && F1P != F1End) + ++F1P; + while (isspace(*F2P) && F2P != F2End) + ++F2P; + + // If we stop on numbers, compare their difference. + if (!isNumberChar(*F1P) || !isNumberChar(*F2P)) { + // The diff failed. + F1NumEnd = F1P; + F2NumEnd = F2P; + } else { + // Note that some ugliness is built into this to permit support for numbers + // that use "D" or "d" as their exponential marker, e.g. "1.234D45". This + // occurs in 200.sixtrack in spec2k. + V1 = strtod(F1P, (char**)(&F1NumEnd)); + V2 = strtod(F2P, (char**)(&F2NumEnd)); + + if (*F1NumEnd == 'D' || *F1NumEnd == 'd') { + // Copy string into tmp buffer to replace the 'D' with an 'e'. + char StrTmp[200]; + memcpy(StrTmp, F1P, EndOfNumber(F1NumEnd)+1 - F1P); + // Strange exponential notation! + StrTmp[(unsigned)(F1NumEnd-F1P)] = 'e'; + + V1 = strtod(&StrTmp[0], (char**)(&F1NumEnd)); + F1NumEnd = F1P + (F1NumEnd-&StrTmp[0]); + } + + if (*F2NumEnd == 'D' || *F2NumEnd == 'd') { + // Copy string into tmp buffer to replace the 'D' with an 'e'. + char StrTmp[200]; + memcpy(StrTmp, F2P, EndOfNumber(F2NumEnd)+1 - F2P); + // Strange exponential notation! + StrTmp[(unsigned)(F2NumEnd-F2P)] = 'e'; + + V2 = strtod(&StrTmp[0], (char**)(&F2NumEnd)); + F2NumEnd = F2P + (F2NumEnd-&StrTmp[0]); + } + } + + if (F1NumEnd == F1P || F2NumEnd == F2P) { + fprintf(stderr, ("%s: FP Comparison failed, not a numeric difference " + "between '%c' and '%c'\n"), g_program, F1P[0], F2P[0]); + return true; + } + + // Check to see if these are inside the absolute tolerance + if (AbsTolerance < fabs(V1-V2)) { + // Nope, check the relative tolerance... + double Diff; + if (V2) + Diff = fabs(V1/V2 - 1.0); + else if (V1) + Diff = fabs(V2/V1 - 1.0); + else + Diff = 0; // Both zero. + if (Diff > RelTolerance) { + fprintf(stderr, ("%s: Compared: %e and %e\n" + "abs. diff = %e rel.diff = %e\n" + "Out of tolerance: rel/abs: %e/%e\n"), + g_program, V1, V2, fabs(V1-V2), Diff, RelTolerance, AbsTolerance); + return true; + } + } + + // Otherwise, advance our read pointers to the end of the numbers. + *F1PP = F1NumEnd; *F2PP = F2NumEnd; + return false; +} + +/* *** */ + char *load_file(const char *path, long *size_out) { FILE *fp; long size; @@ -19,18 +168,18 @@ /* Open the file... */ fp = fopen(path, "rb"); if (!fp) { - fprintf(stderr, "error: unable to open '%s'\n", path); + fprintf(stderr, "%s: error: unable to open '%s'\n", g_program, path); exit(2); } /* Determine the file size. */ if (fseek(fp, 0, SEEK_END) == -1) { - fprintf(stderr, "error: unable to seek '%s'\n", path); + fprintf(stderr, "%s: error: unable to seek '%s'\n", g_program, path); exit(2); } size = ftell(fp); if (fseek(fp, 0, SEEK_SET) == -1) { - fprintf(stderr, "error: unable to seek '%s'\n", path); + fprintf(stderr, "%s: error: unable to seek '%s'\n", g_program, path); exit(2); } @@ -41,15 +190,18 @@ } /* Allocate a buffer for the data. */ - data = malloc(size); + data = malloc(size + 1); if (!data) { - fprintf(stderr, "error: unable to allocate buffer for '%s'\n", path); + fprintf(stderr, "%s: error: unable to allocate buffer for '%s'\n", + g_program, path); exit(2); } /* Read in the file contents. */ + data[size] = 0; if (fread(data, size, 1, fp) != 1) { - fprintf(stderr, "error: unable to read data for '%s'\n", path); + fprintf(stderr, "%s: error: unable to read data for '%s'\n", + g_program, path); exit(2); } @@ -63,27 +215,79 @@ double absolute_tolerance, double relative_tolerance) { /* First, load the file buffers completely into memory. */ - long size_a, size_b; - char *data_a = load_file(path_a, &size_a); - char *data_b = load_file(path_b, &size_b); + long A_size, B_size; + char *data_a = load_file(path_a, &A_size); + char *data_b = load_file(path_b, &B_size); /* Fast path equivalent buffers. */ - if (size_a == size_b && memcmp(data_a, data_b, size_a) == 0) + if (A_size == B_size && memcmp(data_a, data_b, A_size) == 0) return 0; /* Otherwise, if our tolerances are 0 then we are done. */ - if (relative_tolerance == 0.0 && absolute_tolerance == 0.0) + if (relative_tolerance == 0.0 && absolute_tolerance == 0.0) { + fprintf(stderr, "%s: files differ without tolerance allowance\n", + g_program); return 1; + } + + /* *** */ + + // Okay, now that we opened the files, scan them for the first difference. + const char *File1Start = data_a; + const char *File2Start = data_b; + const char *File1End = data_a + A_size; + const char *File2End = data_b + B_size; + const char *F1P = File1Start; + const char *F2P = File2Start; + + while (1) { + // Scan for the end of file or next difference. + while (F1P < File1End && F2P < File2End && *F1P == *F2P) + ++F1P, ++F2P; + + if (F1P >= File1End || F2P >= File2End) break; + + // Okay, we must have found a difference. Backup to the start of the + // current number each stream is at so that we can compare from the + // beginning. + F1P = BackupNumber(F1P, File1Start); + F2P = BackupNumber(F2P, File2Start); + + // Now that we are at the start of the numbers, compare them, exiting if + // they don't match. + if (CompareNumbers(&F1P, &F2P, File1End, File2End, + absolute_tolerance, relative_tolerance)) + return 1; + } + + // Okay, we reached the end of file. If both files are at the end, we + // succeeded. + bool F1AtEnd = F1P >= File1End; + bool F2AtEnd = F2P >= File2End; + if (!F1AtEnd || !F2AtEnd) { + // Else, we might have run off the end due to a number: backup and retry. + if (F1AtEnd && isNumberChar(F1P[-1])) --F1P; + if (F2AtEnd && isNumberChar(F2P[-1])) --F2P; + F1P = BackupNumber(F1P, File1Start); + F2P = BackupNumber(F2P, File2Start); + + // Now that we are at the start of the numbers, compare them, exiting if + // they don't match. + if (CompareNumbers(&F1P, &F2P, File1End, File2End, + absolute_tolerance, relative_tolerance)) + return 1; + + // If we found the end, we succeeded. + if (F1P < File1End || F2P < File2End) + return 1; + } - /* FIXME: Implement support for relative tolerances. */ - fprintf(stderr, "FIXME: this version of fcmp doesn't " - "support relative tolerances yet.\n"); - return 2; + return 0; } -void usage(const char *program) { +void usage() { fprintf(stderr, "usage: %s [-a VALUE] [-r VALUE] \n\n", - program); + g_program); fprintf(stderr, "Compare two files using absolute and relative tolerances\n"); fprintf(stderr, "when comparing differences between two character\n"); fprintf(stderr, "which could be real numbers\n"); @@ -95,6 +299,7 @@ double absolute_tolerance = 0.0; int i; + g_program = argv[0]; for (i = 1; i != argc; ++i) { const char *arg = argv[i]; if (arg[0] != '-') @@ -102,7 +307,7 @@ if (strlen(arg) != 2) { fprintf(stderr, "error: invalid argument '%s'\n\n", arg); - usage(argv[0]); + usage(); } switch (arg[1]) { @@ -110,14 +315,14 @@ case 'r': if (i + 1 == argc) { fprintf(stderr, "error: missing argument to '%s'\n\n", arg); - usage(argv[0]); + usage(); } else { char *endp = 0; double value = strtod(argv[++i], &endp); if (endp == 0 || *endp != '\0') { fprintf(stderr, "error: invalid argument to '%s': '%s'\n\n", arg, argv[i]); - usage(argv[0]); + usage(); } if (arg[1] == 'a') absolute_tolerance = value; @@ -128,13 +333,13 @@ default: fprintf(stderr, "error: invalid argument '%s'\n\n", arg); - usage(argv[0]); + usage(); } } if (i + 2 != argc) { fprintf(stderr, "error: invalid number of arguments\n\n"); - usage(argv[0]); + usage(); } return diff_files_with_tolerance(argv[i], argv[i + 1], From stoklund at 2pi.dk Tue Feb 15 13:51:58 2011 From: stoklund at 2pi.dk (Jakob Stoklund Olesen) Date: Tue, 15 Feb 2011 19:51:58 -0000 Subject: [llvm-commits] [llvm] r125591 - /llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp Message-ID: <20110215195158.8ED2C2A6C12C@llvm.org> Author: stoklund Date: Tue Feb 15 13:51:58 2011 New Revision: 125591 URL: http://llvm.org/viewvc/llvm-project?rev=125591&view=rev Log: Teach ARMLoadStoreOptimizer to remove kill flags from merged instructions as well. This is necessary to avoid a crash in certain tangled situations where a kill flag is first correctly moved to a merged instruction, and then needs to be moved again: STR %R0, a... STR %R0, b... First becomes: STR %R0, b... STM a, %R0, ... and then: STM a, %R0, ... STM b, %R0, ... We can now remove the kill flag from the merged STM when needed. 8960050. Modified: llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp Modified: llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp?rev=125591&r1=125590&r2=125591&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp (original) +++ llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp Tue Feb 15 13:51:58 2011 @@ -379,22 +379,14 @@ // First calculate which of the registers should be killed by the merged // instruction. const unsigned insertPos = memOps[insertAfter].Position; - - SmallSet UnavailRegs; SmallSet KilledRegs; DenseMap Killer; - for (unsigned i = 0; i < memOpsBegin; ++i) { - if (memOps[i].Position < insertPos && memOps[i].isKill) { - unsigned Reg = memOps[i].Reg; - if (memOps[i].Merged) - UnavailRegs.insert(Reg); - else { - KilledRegs.insert(Reg); - Killer[Reg] = i; - } + for (unsigned i = 0, e = memOps.size(); i != e; ++i) { + if (i == memOpsBegin) { + i = memOpsEnd; + if (i == e) + break; } - } - for (unsigned i = memOpsEnd, e = memOps.size(); i != e; ++i) { if (memOps[i].Position < insertPos && memOps[i].isKill) { unsigned Reg = memOps[i].Reg; KilledRegs.insert(Reg); @@ -405,12 +397,7 @@ SmallVector, 8> Regs; for (unsigned i = memOpsBegin; i < memOpsEnd; ++i) { unsigned Reg = memOps[i].Reg; - if (UnavailRegs.count(Reg)) - // Register is killed before and it's not easy / possible to update the - // kill marker on already merged instructions. Abort. - return; - - // If we are inserting the merged operation after an unmerged operation that + // If we are inserting the merged operation after an operation that // uses the same register, make sure to transfer any kill flag. bool isKill = memOps[i].isKill || KilledRegs.count(Reg); Regs.push_back(std::make_pair(Reg, isKill)); @@ -426,17 +413,24 @@ // Merge succeeded, update records. Merges.push_back(prior(Loc)); for (unsigned i = memOpsBegin; i < memOpsEnd; ++i) { - // Remove kill flags from any unmerged memops that come before insertPos. + // Remove kill flags from any memops that come before insertPos. if (Regs[i-memOpsBegin].second) { unsigned Reg = Regs[i-memOpsBegin].first; if (KilledRegs.count(Reg)) { unsigned j = Killer[Reg]; - memOps[j].MBBI->getOperand(0).setIsKill(false); + int Idx = memOps[j].MBBI->findRegisterUseOperandIdx(Reg, true); + assert(Idx >= 0 && "Cannot find killing operand"); + memOps[j].MBBI->getOperand(Idx).setIsKill(false); memOps[j].isKill = false; } + memOps[i].isKill = true; } MBB.erase(memOps[i].MBBI); + // Update this memop to refer to the merged instruction. + // We may need to move kill flags again. memOps[i].Merged = true; + memOps[i].MBBI = Merges.back(); + memOps[i].Position = insertPos; } } From rdivacky at freebsd.org Tue Feb 15 14:43:39 2011 From: rdivacky at freebsd.org (Roman Divacky) Date: Tue, 15 Feb 2011 20:43:39 -0000 Subject: [llvm-commits] [llvm] r125595 - in /llvm/trunk: lib/MC/MCParser/AsmParser.cpp test/MC/AsmParser/exprs.s test/MC/AsmParser/paren.s Message-ID: <20110215204339.453842A6C12C@llvm.org> Author: rdivacky Date: Tue Feb 15 14:43:39 2011 New Revision: 125595 URL: http://llvm.org/viewvc/llvm-project?rev=125595&view=rev Log: Add support for parsing [expr]. This is submitted by Joerg Sonnenberger and fixes his PR8685. Added: llvm/trunk/test/MC/AsmParser/paren.s Modified: llvm/trunk/lib/MC/MCParser/AsmParser.cpp llvm/trunk/test/MC/AsmParser/exprs.s Modified: llvm/trunk/lib/MC/MCParser/AsmParser.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCParser/AsmParser.cpp?rev=125595&r1=125594&r2=125595&view=diff ============================================================================== --- llvm/trunk/lib/MC/MCParser/AsmParser.cpp (original) +++ llvm/trunk/lib/MC/MCParser/AsmParser.cpp Tue Feb 15 14:43:39 2011 @@ -173,6 +173,7 @@ bool ParsePrimaryExpr(const MCExpr *&Res, SMLoc &EndLoc); bool ParseBinOpRHS(unsigned Precedence, const MCExpr *&Res, SMLoc &EndLoc); bool ParseParenExpr(const MCExpr *&Res, SMLoc &EndLoc); + bool ParseBracketExpr(const MCExpr *&Res, SMLoc &EndLoc); /// ParseIdentifier - Parse an identifier or string (as a quoted identifier) /// and set \arg Res to the identifier contents. @@ -492,6 +493,20 @@ return false; } +/// ParseBracketExpr - Parse a bracket expression and return it. +/// NOTE: This assumes the leading '[' has already been consumed. +/// +/// bracketexpr ::= expr] +/// +bool AsmParser::ParseBracketExpr(const MCExpr *&Res, SMLoc &EndLoc) { + if (ParseExpression(Res)) return true; + if (Lexer.isNot(AsmToken::RBrac)) + return TokError("expected ']' in brackets expression"); + EndLoc = Lexer.getLoc(); + Lex(); + return false; +} + /// ParsePrimaryExpr - Parse a primary expression and return it. /// primaryexpr ::= (parenexpr /// primaryexpr ::= symbol @@ -587,6 +602,9 @@ case AsmToken::LParen: Lex(); // Eat the '('. return ParseParenExpr(Res, EndLoc); + case AsmToken::LBrac: + Lex(); // Eat the '['. + return ParseBracketExpr(Res, EndLoc); case AsmToken::Minus: Lex(); // Eat the operator. if (ParsePrimaryExpr(Res, EndLoc)) Modified: llvm/trunk/test/MC/AsmParser/exprs.s URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AsmParser/exprs.s?rev=125595&r1=125594&r2=125595&view=diff ============================================================================== --- llvm/trunk/test/MC/AsmParser/exprs.s (original) +++ llvm/trunk/test/MC/AsmParser/exprs.s Tue Feb 15 14:43:39 2011 @@ -35,6 +35,8 @@ check_expr 1 << 1, 2 check_expr 2 >> 1, 1 check_expr (~0 >> 1), -1 + check_expr [~0 >> 1], -1 + check_expr 4 * [4 + (3 + [2 * 2] + 1)], 48 check_expr 3 - 2, 1 check_expr 1 ^ 3, 2 check_expr 1 && 2, 1 Added: llvm/trunk/test/MC/AsmParser/paren.s URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AsmParser/paren.s?rev=125595&view=auto ============================================================================== --- llvm/trunk/test/MC/AsmParser/paren.s (added) +++ llvm/trunk/test/MC/AsmParser/paren.s Tue Feb 15 14:43:39 2011 @@ -0,0 +1,8 @@ +// RUN: not llvm-mc -triple i386-unknown-unknown %s 2> %t1 > %t2 +// RUN: FileCheck < %t1 %s + +// CHECK: error: expected ']' in brackets expression +.size x, [.-x) + +// CHECK: error: expected ')' in parentheses expression +.size y, (.-y] From joerg at britannica.bec.de Tue Feb 15 16:16:22 2011 From: joerg at britannica.bec.de (Joerg Sonnenberger) Date: Tue, 15 Feb 2011 23:16:22 +0100 Subject: [llvm-commits] [PATCH] [MC] .pushsection / .popsection support In-Reply-To: <20110209202852.GA10573@britannica.bec.de> References: <20110209202852.GA10573@britannica.bec.de> Message-ID: <20110215221622.GA12602@britannica.bec.de> Hi all, attached is a revised patch: - CurSection / PrevSection are private to MCStreamer. They are updated by PopSection and SwitchSection. Code that tried to access CurSection directly now uses the normal getCurrentSection() accessor function. - CurSectionStack / PrevSectionStack are maintained by PushSection and PopSection. Renamed to fit the existing scheme. - SwitchSection has been split into the maintainance part of CurSection / PrevSection and the target specific behavior when the effective section changes. - The LoggingStreamer doesn't see the individual SwitchSection calls nor does it see PushSection / PopSection. I don't believe the diagnostics justifies making SwitchSection, PushSection and PopSection virtual. For consideration: - Move the "Cannot emit before setting section" assertion into getCurSection(). Assumption here is that InitSections is supposed to provide a default value and nothing should call getCurSection() that early. The assembler printer should only print the default section, if there is some actual content (left as separate issue). - Removing CurSection / PrevSection adds a lot of complications for no gain. There is no constructor of MCStreamer to set up the initial element, so all functions would have to deal with the section stack being empty. Push would would have to insert an element just after the top, etc., so it doesn't even simplify anything. Joerg -------------- next part -------------- A non-text attachment was scrubbed... Name: pushpop.diff Type: text/x-diff Size: 21106 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110215/d5e4c2e8/attachment.bin From nicholas at mxc.ca Tue Feb 15 17:13:23 2011 From: nicholas at mxc.ca (Nick Lewycky) Date: Tue, 15 Feb 2011 23:13:23 -0000 Subject: [llvm-commits] [llvm] r125613 - in /llvm/trunk: include/llvm/Support/PatternMatch.h test/Transforms/InstCombine/vector-casts.ll Message-ID: <20110215231323.8A1A12A6C12C@llvm.org> Author: nicholas Date: Tue Feb 15 17:13:23 2011 New Revision: 125613 URL: http://llvm.org/viewvc/llvm-project?rev=125613&view=rev Log: Teach PatternMatch that splat vectors could be floating point as well as integer. Fixes PR9228! Modified: llvm/trunk/include/llvm/Support/PatternMatch.h llvm/trunk/test/Transforms/InstCombine/vector-casts.ll Modified: llvm/trunk/include/llvm/Support/PatternMatch.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/PatternMatch.h?rev=125613&r1=125612&r2=125613&view=diff ============================================================================== --- llvm/trunk/include/llvm/Support/PatternMatch.h (original) +++ llvm/trunk/include/llvm/Support/PatternMatch.h Tue Feb 15 17:13:23 2011 @@ -81,7 +81,8 @@ return true; } if (ConstantVector *CV = dyn_cast(V)) - if (ConstantInt *CI = cast_or_null(CV->getSplatValue())) { + if (ConstantInt *CI = + dyn_cast_or_null(CV->getSplatValue())) { Res = &CI->getValue(); return true; } @@ -126,7 +127,7 @@ if (const ConstantInt *CI = dyn_cast(V)) return this->isValue(CI->getValue()); if (const ConstantVector *CV = dyn_cast(V)) - if (ConstantInt *CI = cast_or_null(CV->getSplatValue())) + if (ConstantInt *CI = dyn_cast_or_null(CV->getSplatValue())) return this->isValue(CI->getValue()); return false; } @@ -146,7 +147,7 @@ return true; } if (const ConstantVector *CV = dyn_cast(V)) - if (ConstantInt *CI = cast_or_null(CV->getSplatValue())) + if (ConstantInt *CI = dyn_cast_or_null(CV->getSplatValue())) if (this->isValue(CI->getValue())) { Res = &CI->getValue(); return true; Modified: llvm/trunk/test/Transforms/InstCombine/vector-casts.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/vector-casts.ll?rev=125613&r1=125612&r2=125613&view=diff ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/vector-casts.ll (original) +++ llvm/trunk/test/Transforms/InstCombine/vector-casts.ll Tue Feb 15 17:13:23 2011 @@ -121,3 +121,31 @@ %b = sitofp <2 x i64> %a to <2 x double> ret <2 x double> %b } + +; PR9228 +; This was a crasher, so no CHECK statements. +define <4 x float> @f(i32 %a) nounwind alwaysinline { +; CHECK: @f +entry: + %dim = insertelement <4 x i32> undef, i32 %a, i32 0 + %dim30 = insertelement <4 x i32> %dim, i32 %a, i32 1 + %dim31 = insertelement <4 x i32> %dim30, i32 %a, i32 2 + %dim32 = insertelement <4 x i32> %dim31, i32 %a, i32 3 + + %offset_ptr = getelementptr <4 x float>* null, i32 1 + %offset_int = ptrtoint <4 x float>* %offset_ptr to i64 + %sizeof32 = trunc i64 %offset_int to i32 + + %smearinsert33 = insertelement <4 x i32> undef, i32 %sizeof32, i32 0 + %smearinsert34 = insertelement <4 x i32> %smearinsert33, i32 %sizeof32, i32 1 + %smearinsert35 = insertelement <4 x i32> %smearinsert34, i32 %sizeof32, i32 2 + %smearinsert36 = insertelement <4 x i32> %smearinsert35, i32 %sizeof32, i32 3 + + %delta_scale = mul <4 x i32> %dim32, %smearinsert36 + %offset_delta = add <4 x i32> zeroinitializer, %delta_scale + + %offset_varying_delta = add <4 x i32> %offset_delta, undef + + ret <4 x float> undef +} + From joerg at britannica.bec.de Tue Feb 15 18:21:39 2011 From: joerg at britannica.bec.de (Joerg Sonnenberger) Date: Wed, 16 Feb 2011 01:21:39 +0100 Subject: [llvm-commits] [PATCH] [MC] .pushsection / .popsection support In-Reply-To: <20110215221622.GA12602@britannica.bec.de> References: <20110209202852.GA10573@britannica.bec.de> <20110215221622.GA12602@britannica.bec.de> Message-ID: <20110216002139.GA23009@britannica.bec.de> On Tue, Feb 15, 2011 at 11:16:22PM +0100, Joerg Sonnenberger wrote: > - Removing CurSection / PrevSection adds a lot of complications for no > gain. There is no constructor of MCStreamer to set up the initial > element, so all functions would have to deal with the section stack > being empty. Push would would have to insert an element just after the > top, etc., so it doesn't even simplify anything. Scratch the part about the constructor. Attached is the alternative version removing CurSection / PrevSection. I still believe this is less clean than the other patch, but be my guest for either patch. Joerg -------------- next part -------------- A non-text attachment was scrubbed... Name: pushpop2.diff Type: text/x-diff Size: 22074 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110216/edc68046/attachment.bin From evan.cheng at apple.com Tue Feb 15 18:35:02 2011 From: evan.cheng at apple.com (Evan Cheng) Date: Wed, 16 Feb 2011 00:35:02 -0000 Subject: [llvm-commits] [llvm] r125624 - in /llvm/trunk/lib/Target/ARM: ARMInstrFormats.td ARMInstrVFP.td Message-ID: <20110216003503.09FF42A6C12C@llvm.org> Author: evancheng Date: Tue Feb 15 18:35:02 2011 New Revision: 125624 URL: http://llvm.org/viewvc/llvm-project?rev=125624&view=rev Log: Some single precision VFP instructions may be executed on NEON pipeline, but not double precision ones. Modified: llvm/trunk/lib/Target/ARM/ARMInstrFormats.td llvm/trunk/lib/Target/ARM/ARMInstrVFP.td Modified: llvm/trunk/lib/Target/ARM/ARMInstrFormats.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMInstrFormats.td?rev=125624&r1=125623&r2=125624&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMInstrFormats.td (original) +++ llvm/trunk/lib/Target/ARM/ARMInstrFormats.td Tue Feb 15 18:35:02 2011 @@ -1200,7 +1200,7 @@ let Inst{11-9} = 0b101; let Inst{8} = 1; // Double precision - // 64-bit loads & stores operate on both NEON and VFP pipelines. + // Loads & stores operate on both NEON and VFP pipelines. let D = VFPNeonDomain; } @@ -1225,6 +1225,9 @@ let Inst{21-20} = opcod2; let Inst{11-9} = 0b101; let Inst{8} = 0; // Single precision + + // Loads & stores operate on both NEON and VFP pipelines. + let D = VFPNeonDomain; } // VFP Load / store multiple pseudo instructions. @@ -1257,9 +1260,6 @@ let Inst{27-25} = 0b110; let Inst{11-9} = 0b101; let Inst{8} = 1; // Double precision - - // 64-bit loads & stores operate on both NEON and VFP pipelines. - let D = VFPNeonDomain; } class AXSI4; + [(set SPR:$Sd, (load addrmode5:$addr))]> { + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; +} } // End of 'let canFoldAsLoad = 1, isReMaterializable = 1 in' @@ -68,7 +72,11 @@ def VSTRS : ASI5<0b1101, 0b00, (outs), (ins SPR:$Sd, addrmode5:$addr), IIC_fpStore32, "vstr", ".32\t$Sd, $addr", - [(store SPR:$Sd, addrmode5:$addr)]>; + [(store SPR:$Sd, addrmode5:$addr)]> { + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; +} //===----------------------------------------------------------------------===// // Load / store multiple Instructions. @@ -118,6 +126,10 @@ let Inst{24-23} = 0b01; // Increment After let Inst{21} = 0; // No writeback let Inst{20} = L_bit; + + // Some single precision VFP instructions may be executed on both NEON and + // VFP pipelines. + let D = VFPNeonDomain; } def SIA_UPD : AXSI4<(outs GPR:$wb), (ins GPR:$Rn, pred:$p, spr_reglist:$regs, variable_ops), @@ -126,6 +138,10 @@ let Inst{24-23} = 0b01; // Increment After let Inst{21} = 1; // Writeback let Inst{20} = L_bit; + + // Some single precision VFP instructions may be executed on both NEON and + // VFP pipelines. + let D = VFPNeonDomain; } def SDB : AXSI4<(outs), (ins GPR:$Rn, pred:$p, spr_reglist:$regs, variable_ops), @@ -134,6 +150,10 @@ let Inst{24-23} = 0b10; // Decrement Before let Inst{21} = 0; // No writeback let Inst{20} = L_bit; + + // Some single precision VFP instructions may be executed on both NEON and + // VFP pipelines. + let D = VFPNeonDomain; } def SDB_UPD : AXSI4<(outs GPR:$wb), (ins GPR:$Rn, pred:$p, spr_reglist:$regs, variable_ops), @@ -142,6 +162,10 @@ let Inst{24-23} = 0b10; // Decrement Before let Inst{21} = 1; // Writeback let Inst{20} = L_bit; + + // Some single precision VFP instructions may be executed on both NEON and + // VFP pipelines. + let D = VFPNeonDomain; } } @@ -172,7 +196,11 @@ def VADDS : ASbIn<0b11100, 0b11, 0, 0, (outs SPR:$Sd), (ins SPR:$Sn, SPR:$Sm), IIC_fpALU32, "vadd", ".f32\t$Sd, $Sn, $Sm", - [(set SPR:$Sd, (fadd SPR:$Sn, SPR:$Sm))]>; + [(set SPR:$Sd, (fadd SPR:$Sn, SPR:$Sm))]> { + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; +} def VSUBD : ADbI<0b11100, 0b11, 1, 0, (outs DPR:$Dd), (ins DPR:$Dn, DPR:$Dm), @@ -182,7 +210,11 @@ def VSUBS : ASbIn<0b11100, 0b11, 1, 0, (outs SPR:$Sd), (ins SPR:$Sn, SPR:$Sm), IIC_fpALU32, "vsub", ".f32\t$Sd, $Sn, $Sm", - [(set SPR:$Sd, (fsub SPR:$Sn, SPR:$Sm))]>; + [(set SPR:$Sd, (fsub SPR:$Sn, SPR:$Sm))]> { + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; +} def VDIVD : ADbI<0b11101, 0b00, 0, 0, (outs DPR:$Dd), (ins DPR:$Dn, DPR:$Dm), @@ -202,7 +234,11 @@ def VMULS : ASbIn<0b11100, 0b10, 0, 0, (outs SPR:$Sd), (ins SPR:$Sn, SPR:$Sm), IIC_fpMUL32, "vmul", ".f32\t$Sd, $Sn, $Sm", - [(set SPR:$Sd, (fmul SPR:$Sn, SPR:$Sm))]>; + [(set SPR:$Sd, (fmul SPR:$Sn, SPR:$Sm))]> { + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; +} def VNMULD : ADbI<0b11100, 0b10, 1, 0, (outs DPR:$Dd), (ins DPR:$Dn, DPR:$Dm), @@ -212,7 +248,11 @@ def VNMULS : ASbI<0b11100, 0b10, 1, 0, (outs SPR:$Sd), (ins SPR:$Sn, SPR:$Sm), IIC_fpMUL32, "vnmul", ".f32\t$Sd, $Sn, $Sm", - [(set SPR:$Sd, (fneg (fmul SPR:$Sn, SPR:$Sm)))]>; + [(set SPR:$Sd, (fneg (fmul SPR:$Sn, SPR:$Sm)))]> { + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; +} // Match reassociated forms only if not sign dependent rounding. def : Pat<(fmul (fneg DPR:$a), (f64 DPR:$b)), @@ -230,7 +270,11 @@ def VCMPES : ASuI<0b11101, 0b11, 0b0100, 0b11, 0, (outs), (ins SPR:$Sd, SPR:$Sm), IIC_fpCMP32, "vcmpe", ".f32\t$Sd, $Sm", - [(arm_cmpfp SPR:$Sd, SPR:$Sm)]>; + [(arm_cmpfp SPR:$Sd, SPR:$Sm)]> { + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; +} // FIXME: Verify encoding after integrated assembler is working. def VCMPD : ADuI<0b11101, 0b11, 0b0100, 0b01, 0, @@ -241,8 +285,12 @@ def VCMPS : ASuI<0b11101, 0b11, 0b0100, 0b01, 0, (outs), (ins SPR:$Sd, SPR:$Sm), IIC_fpCMP32, "vcmp", ".f32\t$Sd, $Sm", - [/* For disassembly only; pattern left blank */]>; + [/* For disassembly only; pattern left blank */]> { + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; } +} // Defs = [FPSCR] //===----------------------------------------------------------------------===// // FP Unary Operations. @@ -256,7 +304,11 @@ def VABSS : ASuIn<0b11101, 0b11, 0b0000, 0b11, 0, (outs SPR:$Sd), (ins SPR:$Sm), IIC_fpUNA32, "vabs", ".f32\t$Sd, $Sm", - [(set SPR:$Sd, (fabs SPR:$Sm))]>; + [(set SPR:$Sd, (fabs SPR:$Sm))]> { + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; +} let Defs = [FPSCR] in { def VCMPEZD : ADuI<0b11101, 0b11, 0b0101, 0b11, 0, @@ -273,6 +325,10 @@ [(arm_cmpfp0 SPR:$Sd)]> { let Inst{3-0} = 0b0000; let Inst{5} = 0; + + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; } // FIXME: Verify encoding after integrated assembler is working. @@ -290,8 +346,12 @@ [/* For disassembly only; pattern left blank */]> { let Inst{3-0} = 0b0000; let Inst{5} = 0; + + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; } -} +} // Defs = [FPSCR] def VCVTDS : ASuI<0b11101, 0b11, 0b0111, 0b11, 0, (outs DPR:$Dd), (ins SPR:$Sm), @@ -362,7 +422,11 @@ def VNEGS : ASuIn<0b11101, 0b11, 0b0001, 0b01, 0, (outs SPR:$Sd), (ins SPR:$Sm), IIC_fpUNA32, "vneg", ".f32\t$Sd, $Sm", - [(set SPR:$Sd, (fneg SPR:$Sm))]>; + [(set SPR:$Sd, (fneg SPR:$Sm))]> { + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; +} def VSQRTD : ADuI<0b11101, 0b11, 0b0001, 0b11, 0, (outs DPR:$Dd), (ins DPR:$Dm), @@ -533,6 +597,10 @@ IIC_fpCVTIS, "vcvt", ".f32.s32\t$Sd, $Sm", [(set SPR:$Sd, (arm_sitof SPR:$Sm))]> { let Inst{7} = 1; // s32 + + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; } def VUITOD : AVConv1IDs_Encode<0b11101, 0b11, 0b1000, 0b1011, @@ -547,6 +615,10 @@ IIC_fpCVTIS, "vcvt", ".f32.u32\t$Sd, $Sm", [(set SPR:$Sd, (arm_uitof SPR:$Sm))]> { let Inst{7} = 0; // u32 + + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; } // FP -> Int: @@ -598,6 +670,10 @@ IIC_fpCVTSI, "vcvt", ".s32.f32\t$Sd, $Sm", [(set SPR:$Sd, (arm_ftosi SPR:$Sm))]> { let Inst{7} = 1; // Z bit + + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; } def VTOUIZD : AVConv1IsD_Encode<0b11101, 0b11, 0b1100, 0b1011, @@ -612,6 +688,10 @@ IIC_fpCVTSI, "vcvt", ".u32.f32\t$Sd, $Sm", [(set SPR:$Sd, (arm_ftoui SPR:$Sm))]> { let Inst{7} = 1; // Z bit + + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; } // And the Z bit '0' variants, i.e. use the rounding mode specified by FPSCR. @@ -662,22 +742,38 @@ def VTOSHS : AVConv1XI<0b11101, 0b11, 0b1110, 0b1010, 0, (outs SPR:$dst), (ins SPR:$a, i32imm:$fbits), IIC_fpCVTSI, "vcvt", ".s16.f32\t$dst, $a, $fbits", - [/* For disassembly only; pattern left blank */]>; + [/* For disassembly only; pattern left blank */]> { + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; +} def VTOUHS : AVConv1XI<0b11101, 0b11, 0b1111, 0b1010, 0, (outs SPR:$dst), (ins SPR:$a, i32imm:$fbits), IIC_fpCVTSI, "vcvt", ".u16.f32\t$dst, $a, $fbits", - [/* For disassembly only; pattern left blank */]>; + [/* For disassembly only; pattern left blank */]> { + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; +} def VTOSLS : AVConv1XI<0b11101, 0b11, 0b1110, 0b1010, 1, (outs SPR:$dst), (ins SPR:$a, i32imm:$fbits), IIC_fpCVTSI, "vcvt", ".s32.f32\t$dst, $a, $fbits", - [/* For disassembly only; pattern left blank */]>; + [/* For disassembly only; pattern left blank */]> { + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; +} def VTOULS : AVConv1XI<0b11101, 0b11, 0b1111, 0b1010, 1, (outs SPR:$dst), (ins SPR:$a, i32imm:$fbits), IIC_fpCVTSI, "vcvt", ".u32.f32\t$dst, $a, $fbits", - [/* For disassembly only; pattern left blank */]>; + [/* For disassembly only; pattern left blank */]> { + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; +} def VTOSHD : AVConv1XI<0b11101, 0b11, 0b1110, 0b1011, 0, (outs DPR:$dst), (ins DPR:$a, i32imm:$fbits), @@ -704,22 +800,38 @@ def VSHTOS : AVConv1XI<0b11101, 0b11, 0b1010, 0b1010, 0, (outs SPR:$dst), (ins SPR:$a, i32imm:$fbits), IIC_fpCVTIS, "vcvt", ".f32.s16\t$dst, $a, $fbits", - [/* For disassembly only; pattern left blank */]>; + [/* For disassembly only; pattern left blank */]> { + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; +} def VUHTOS : AVConv1XI<0b11101, 0b11, 0b1011, 0b1010, 0, (outs SPR:$dst), (ins SPR:$a, i32imm:$fbits), IIC_fpCVTIS, "vcvt", ".f32.u16\t$dst, $a, $fbits", - [/* For disassembly only; pattern left blank */]>; + [/* For disassembly only; pattern left blank */]> { + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; +} def VSLTOS : AVConv1XI<0b11101, 0b11, 0b1010, 0b1010, 1, (outs SPR:$dst), (ins SPR:$a, i32imm:$fbits), IIC_fpCVTIS, "vcvt", ".f32.s32\t$dst, $a, $fbits", - [/* For disassembly only; pattern left blank */]>; + [/* For disassembly only; pattern left blank */]> { + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; +} def VULTOS : AVConv1XI<0b11101, 0b11, 0b1011, 0b1010, 1, (outs SPR:$dst), (ins SPR:$a, i32imm:$fbits), IIC_fpCVTIS, "vcvt", ".f32.u32\t$dst, $a, $fbits", - [/* For disassembly only; pattern left blank */]>; + [/* For disassembly only; pattern left blank */]> { + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; +} def VSHTOD : AVConv1XI<0b11101, 0b11, 0b1010, 0b1011, 0, (outs DPR:$dst), (ins DPR:$a, i32imm:$fbits), @@ -761,7 +873,11 @@ [(set SPR:$Sd, (fadd_mlx (fmul_su SPR:$Sn, SPR:$Sm), SPR:$Sdin))]>, RegConstraint<"$Sdin = $Sd">, - Requires<[HasVFP2,DontUseNEONForFP,UseFPVMLx]>; + Requires<[HasVFP2,DontUseNEONForFP,UseFPVMLx]> { + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; +} def : Pat<(fadd_mlx DPR:$dstin, (fmul_su DPR:$a, (f64 DPR:$b))), (VMLAD DPR:$dstin, DPR:$a, DPR:$b)>, @@ -784,7 +900,11 @@ [(set SPR:$Sd, (fadd_mlx (fneg (fmul_su SPR:$Sn, SPR:$Sm)), SPR:$Sdin))]>, RegConstraint<"$Sdin = $Sd">, - Requires<[HasVFP2,DontUseNEONForFP,UseFPVMLx]>; + Requires<[HasVFP2,DontUseNEONForFP,UseFPVMLx]> { + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; +} def : Pat<(fsub_mlx DPR:$dstin, (fmul_su DPR:$a, (f64 DPR:$b))), (VMLSD DPR:$dstin, DPR:$a, DPR:$b)>, @@ -807,7 +927,11 @@ [(set SPR:$Sd, (fsub_mlx (fneg (fmul_su SPR:$Sn, SPR:$Sm)), SPR:$Sdin))]>, RegConstraint<"$Sdin = $Sd">, - Requires<[HasVFP2,DontUseNEONForFP,UseFPVMLx]>; + Requires<[HasVFP2,DontUseNEONForFP,UseFPVMLx]> { + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; +} def : Pat<(fsub_mlx (fneg (fmul_su DPR:$a, (f64 DPR:$b))), DPR:$dstin), (VNMLAD DPR:$dstin, DPR:$a, DPR:$b)>, @@ -829,7 +953,11 @@ IIC_fpMAC32, "vnmls", ".f32\t$Sd, $Sn, $Sm", [(set SPR:$Sd, (fsub_mlx (fmul_su SPR:$Sn, SPR:$Sm), SPR:$Sdin))]>, RegConstraint<"$Sdin = $Sd">, - Requires<[HasVFP2,DontUseNEONForFP,UseFPVMLx]>; + Requires<[HasVFP2,DontUseNEONForFP,UseFPVMLx]> { + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; +} def : Pat<(fsub_mlx (fmul_su DPR:$a, (f64 DPR:$b)), DPR:$dstin), (VNMLSD DPR:$dstin, DPR:$a, DPR:$b)>, @@ -866,7 +994,11 @@ (outs SPR:$Sd), (ins SPR:$Sn, SPR:$Sm), IIC_fpUNA32, "vneg", ".f32\t$Sd, $Sm", [/*(set SPR:$Sd, (ARMcneg SPR:$Sn, SPR:$Sm, imm:$cc))*/]>, - RegConstraint<"$Sn = $Sd">; + RegConstraint<"$Sn = $Sd"> { + // Some single precision VFP instructions may be executed on both NEON and VFP + // pipelines. + let D = VFPNeonDomain; +} } // neverHasSideEffects //===----------------------------------------------------------------------===// From evan.cheng at apple.com Tue Feb 15 18:37:02 2011 From: evan.cheng at apple.com (Evan Cheng) Date: Wed, 16 Feb 2011 00:37:02 -0000 Subject: [llvm-commits] [llvm] r125625 - /llvm/trunk/lib/CodeGen/VirtRegRewriter.cpp Message-ID: <20110216003702.A21BF2A6C12C@llvm.org> Author: evancheng Date: Tue Feb 15 18:37:02 2011 New Revision: 125625 URL: http://llvm.org/viewvc/llvm-project?rev=125625&view=rev Log: Remove a duplicated check. Modified: llvm/trunk/lib/CodeGen/VirtRegRewriter.cpp Modified: llvm/trunk/lib/CodeGen/VirtRegRewriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/VirtRegRewriter.cpp?rev=125625&r1=125624&r2=125625&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/VirtRegRewriter.cpp (original) +++ llvm/trunk/lib/CodeGen/VirtRegRewriter.cpp Tue Feb 15 18:37:02 2011 @@ -1633,7 +1633,7 @@ /// effect and all of its defs are dead. static bool isSafeToDelete(MachineInstr &MI) { const TargetInstrDesc &TID = MI.getDesc(); - if (TID.mayLoad() || TID.mayStore() || TID.isCall() || TID.isTerminator() || + if (TID.mayLoad() || TID.mayStore() || TID.isTerminator() || TID.isCall() || TID.isBarrier() || TID.isReturn() || MI.isLabel() || MI.isDebugValue() || MI.hasUnmodeledSideEffects()) From Brice.Lin at gmail.com Tue Feb 15 18:33:04 2011 From: Brice.Lin at gmail.com (Brice Lin) Date: Wed, 16 Feb 2011 00:33:04 -0000 Subject: [llvm-commits] [poolalloc] r125622 - /poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp Message-ID: <20110216003304.A036D2A6C12C@llvm.org> Author: bglin2 Date: Tue Feb 15 18:33:04 2011 New Revision: 125622 URL: http://llvm.org/viewvc/llvm-project?rev=125622&view=rev Log: Added new visit function to fill in null pool arguments for transformed CStdLib calls using Automatic Pool Allocation. Modified: poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp Modified: poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp?rev=125622&r1=125621&r2=125622&view=diff ============================================================================== --- poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp (original) +++ poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp Tue Feb 15 18:33:04 2011 @@ -71,6 +71,7 @@ void visitMemAlignCall(CallSite CS); void visitStrdupCall(CallSite CS); void visitRuntimeCheck(CallSite CS); + void visitCStdLibCheck(CallSite CS, const unsigned argc); void visitFreeCall(CallSite &CS); void visitCallSite(CallSite &CS); void visitCallInst(CallInst &CI) { @@ -740,6 +741,49 @@ } } +/** + * Visit the call site and replace null pool arguments with the correct ones + * + * @param argc Number of pool arguments to insert + */ +void FuncTransform::visitCStdLibCheck(CallSite CS, const unsigned argc) { + // Check for the correct number of pool arguments + assert ((CS.arg_size() > argc) && "Incorrect number of pool arguments!"); + + const Type *Int8Ty = Type::getInt8Ty(CS.getInstruction()->getContext()); + const Type *VoidPtrTy = PointerType::getUnqual(Int8Ty); + + if (argc == 1) { + // Get the pool handle for the pointer argument + Value *PH = getPoolHandle(CS.getArgument(1)->stripPointerCasts()); + + // Insert the pool handle + if (PH) { + PH = castTo(PH, VoidPtrTy, PH->getName(), CS.getInstruction()); + CS.setArgument(0, PH); + AddPoolUse(*(CS.getInstruction()), PH, PoolUses); + } + } else if (argc == 2) { + // Get the pool handles for the pointer arguments + Value *dstPH = getPoolHandle(CS.getArgument(2)->stripPointerCasts()); + Value *srcPH = getPoolHandle(CS.getArgument(3)->stripPointerCasts()); + + // Insert the destination pool handle + if (dstPH) { + dstPH = castTo(dstPH, VoidPtrTy, dstPH->getName(), CS.getInstruction()); + CS.setArgument(0, dstPH); + AddPoolUse(*(CS.getInstruction()), dstPH, PoolUses); + } + + // Insert the source pool handle + if (srcPH) { + srcPH = castTo(srcPH, VoidPtrTy, srcPH->getName(), CS.getInstruction()); + CS.setArgument(1, srcPH); + AddPoolUse(*(CS.getInstruction()), srcPH, PoolUses); + } + } +} + // // Method: visitCallSite() // @@ -826,6 +870,8 @@ (CF->getName() == "sc.pool_unregister") || (CF->getName() == "sc.get_actual_val")) { visitRuntimeCheck (CS); + } else if (CF->getName() == "pool_strcpy") { + visitCStdLibCheck(CS, 2); } else if (CF->getName() == "pthread_create") { thread_creation_point = true; From rafael.espindola at gmail.com Tue Feb 15 19:08:29 2011 From: rafael.espindola at gmail.com (Rafael Espindola) Date: Wed, 16 Feb 2011 01:08:29 -0000 Subject: [llvm-commits] [llvm] r125629 - in /llvm/trunk: include/llvm/MC/MCObjectStreamer.h include/llvm/MC/MCStreamer.h lib/MC/MCAsmStreamer.cpp lib/MC/MCELFStreamer.cpp lib/MC/MCLoggingStreamer.cpp lib/MC/MCMachOStreamer.cpp lib/MC/MCNullStreamer.cpp lib/MC/MCObjectStreamer.cpp lib/MC/MCParser/ELFAsmParser.cpp lib/MC/MCPureStreamer.cpp lib/MC/MCStreamer.cpp lib/Target/PTX/PTXMCAsmStreamer.cpp test/MC/AsmParser/section.s Message-ID: <20110216010829.8A93D2A6C12C@llvm.org> Author: rafael Date: Tue Feb 15 19:08:29 2011 New Revision: 125629 URL: http://llvm.org/viewvc/llvm-project?rev=125629&view=rev Log: Add support for pushsection and popsection. Patch by Joerg Sonnenberger. Added: llvm/trunk/test/MC/AsmParser/section.s Modified: llvm/trunk/include/llvm/MC/MCObjectStreamer.h llvm/trunk/include/llvm/MC/MCStreamer.h llvm/trunk/lib/MC/MCAsmStreamer.cpp llvm/trunk/lib/MC/MCELFStreamer.cpp llvm/trunk/lib/MC/MCLoggingStreamer.cpp llvm/trunk/lib/MC/MCMachOStreamer.cpp llvm/trunk/lib/MC/MCNullStreamer.cpp llvm/trunk/lib/MC/MCObjectStreamer.cpp llvm/trunk/lib/MC/MCParser/ELFAsmParser.cpp llvm/trunk/lib/MC/MCPureStreamer.cpp llvm/trunk/lib/MC/MCStreamer.cpp llvm/trunk/lib/Target/PTX/PTXMCAsmStreamer.cpp Modified: llvm/trunk/include/llvm/MC/MCObjectStreamer.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCObjectStreamer.h?rev=125629&r1=125628&r2=125629&view=diff ============================================================================== --- llvm/trunk/include/llvm/MC/MCObjectStreamer.h (original) +++ llvm/trunk/include/llvm/MC/MCObjectStreamer.h Tue Feb 15 19:08:29 2011 @@ -64,7 +64,7 @@ virtual void EmitULEB128Value(const MCExpr *Value, unsigned AddrSpace = 0); virtual void EmitSLEB128Value(const MCExpr *Value, unsigned AddrSpace = 0); virtual void EmitWeakReference(MCSymbol *Alias, const MCSymbol *Symbol); - virtual void SwitchSection(const MCSection *Section); + virtual void ChangeSection(const MCSection *Section); virtual void EmitInstruction(const MCInst &Inst); virtual void EmitInstToFragment(const MCInst &Inst); virtual void EmitValueToOffset(const MCExpr *Offset, unsigned char Value); Modified: llvm/trunk/include/llvm/MC/MCStreamer.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCStreamer.h?rev=125629&r1=125628&r2=125629&view=diff ============================================================================== --- llvm/trunk/include/llvm/MC/MCStreamer.h (original) +++ llvm/trunk/include/llvm/MC/MCStreamer.h Tue Feb 15 19:08:29 2011 @@ -14,6 +14,7 @@ #ifndef LLVM_MC_MCSTREAMER_H #define LLVM_MC_MCSTREAMER_H +#include "llvm/ADT/SmallVector.h" #include "llvm/Support/DataTypes.h" #include "llvm/MC/MCDirectives.h" #include "llvm/MC/MCDwarf.h" @@ -56,17 +57,17 @@ MCDwarfFrameInfo *getCurrentFrameInfo(); void EnsureValidFrame(); + /// CurSectionStack - This is stack of CurSection values saved by + /// PushSection. + SmallVector CurSectionStack; + + /// PrevSectionStack - This is stack of PrevSection values saved by + /// PushSection. + SmallVector PrevSectionStack; + protected: MCStreamer(MCContext &Ctx); - /// CurSection - This is the current section code is being emitted to, it is - /// kept up to date by SwitchSection. - const MCSection *CurSection; - - /// PrevSection - This is the previous section code is being emitted to, it - /// is kept up to date by SwitchSection. - const MCSection *PrevSection; - public: virtual ~MCStreamer(); @@ -115,17 +116,63 @@ /// getCurrentSection - Return the current section that the streamer is /// emitting code to. - const MCSection *getCurrentSection() const { return CurSection; } + const MCSection *getCurrentSection() const { + if (!CurSectionStack.empty()) + return CurSectionStack.back(); + return NULL; + } /// getPreviousSection - Return the previous section that the streamer is /// emitting code to. - const MCSection *getPreviousSection() const { return PrevSection; } + const MCSection *getPreviousSection() const { + if (!PrevSectionStack.empty()) + return PrevSectionStack.back(); + return NULL; + } + + /// ChangeSection - Update streamer for a new active section. + /// + /// This is called by PopSection and SwitchSection, if the current + /// section changes. + virtual void ChangeSection(const MCSection *) = 0; + + /// pushSection - Save the current and previous section on the + /// section stack. + void PushSection() { + PrevSectionStack.push_back(getPreviousSection()); + CurSectionStack.push_back(getCurrentSection()); + } + + /// popSection - Restore the current and previous section from + /// the section stack. Calls ChangeSection as needed. + /// + /// Returns false if the stack was empty. + bool PopSection() { + if (PrevSectionStack.size() <= 1) + return false; + assert(CurSectionStack.size() > 1); + PrevSectionStack.pop_back(); + const MCSection *oldSection = CurSectionStack.pop_back_val(); + const MCSection *curSection = CurSectionStack.back(); + + if (oldSection != curSection) + ChangeSection(curSection); + return true; + } /// SwitchSection - Set the current section where code is being emitted to /// @p Section. This is required to update CurSection. /// /// This corresponds to assembler directives like .section, .text, etc. - virtual void SwitchSection(const MCSection *Section) = 0; + void SwitchSection(const MCSection *Section) { + assert(Section && "Cannot switch to a null section!"); + const MCSection *curSection = CurSectionStack.back(); + PrevSectionStack.back() = curSection; + if (Section != curSection) { + CurSectionStack.back() = Section; + ChangeSection(Section); + } + } /// InitSections - Create the default sections and set the initial one. virtual void InitSections() = 0; Modified: llvm/trunk/lib/MC/MCAsmStreamer.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAsmStreamer.cpp?rev=125629&r1=125628&r2=125629&view=diff ============================================================================== --- llvm/trunk/lib/MC/MCAsmStreamer.cpp (original) +++ llvm/trunk/lib/MC/MCAsmStreamer.cpp Tue Feb 15 19:08:29 2011 @@ -107,7 +107,7 @@ /// @name MCStreamer Interface /// @{ - virtual void SwitchSection(const MCSection *Section); + virtual void ChangeSection(const MCSection *Section); virtual void InitSections() { // FIXME, this is MachO specific, but the testsuite @@ -254,23 +254,19 @@ return Value & ((uint64_t) (int64_t) -1 >> (64 - Bytes * 8)); } -void MCAsmStreamer::SwitchSection(const MCSection *Section) { +void MCAsmStreamer::ChangeSection(const MCSection *Section) { assert(Section && "Cannot switch to a null section!"); - if (Section != CurSection) { - PrevSection = CurSection; - CurSection = Section; - Section->PrintSwitchToSection(MAI, OS); - } + Section->PrintSwitchToSection(MAI, OS); } void MCAsmStreamer::EmitLabel(MCSymbol *Symbol) { assert(Symbol->isUndefined() && "Cannot define a symbol twice!"); assert(!Symbol->isVariable() && "Cannot emit a variable symbol!"); - assert(CurSection && "Cannot emit before setting section!"); + assert(getCurrentSection() && "Cannot emit before setting section!"); OS << *Symbol << MAI.getLabelSuffix(); EmitEOL(); - Symbol->setSection(*CurSection); + Symbol->setSection(*getCurrentSection()); } void MCAsmStreamer::EmitAssemblerFlag(MCAssemblerFlag Flag) { @@ -486,7 +482,7 @@ void MCAsmStreamer::EmitBytes(StringRef Data, unsigned AddrSpace) { - assert(CurSection && "Cannot emit contents before setting section!"); + assert(getCurrentSection() && "Cannot emit contents before setting section!"); if (Data.empty()) return; if (Data.size() == 1) { @@ -517,7 +513,7 @@ void MCAsmStreamer::EmitValueImpl(const MCExpr *Value, unsigned Size, bool isPCRel, unsigned AddrSpace) { - assert(CurSection && "Cannot emit contents before setting section!"); + assert(getCurrentSection() && "Cannot emit contents before setting section!"); assert(!isPCRel && "Cannot emit pc relative relocations!"); const char *Directive = 0; switch (Size) { @@ -864,7 +860,7 @@ } void MCAsmStreamer::EmitInstruction(const MCInst &Inst) { - assert(CurSection && "Cannot emit contents before setting section!"); + assert(getCurrentSection() && "Cannot emit contents before setting section!"); if (!UseLoc) MCLineEntry::Make(this, getCurrentSection()); Modified: llvm/trunk/lib/MC/MCELFStreamer.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCELFStreamer.cpp?rev=125629&r1=125628&r2=125629&view=diff ============================================================================== --- llvm/trunk/lib/MC/MCELFStreamer.cpp (original) +++ llvm/trunk/lib/MC/MCELFStreamer.cpp Tue Feb 15 19:08:29 2011 @@ -80,12 +80,12 @@ /// @{ virtual void InitSections(); + virtual void ChangeSection(const MCSection *Section); virtual void EmitLabel(MCSymbol *Symbol); virtual void EmitAssemblerFlag(MCAssemblerFlag Flag); virtual void EmitThumbFunc(MCSymbol *Func); virtual void EmitAssignment(MCSymbol *Symbol, const MCExpr *Value); virtual void EmitWeakReference(MCSymbol *Alias, const MCSymbol *Symbol); - virtual void SwitchSection(const MCSection *Section); virtual void EmitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute); virtual void EmitSymbolDesc(MCSymbol *Symbol, unsigned DescValue) { assert(0 && "ELF doesn't support this directive"); @@ -222,11 +222,11 @@ Symbol->setVariableValue(AddValueSymbols(Value)); } -void MCELFStreamer::SwitchSection(const MCSection *Section) { +void MCELFStreamer::ChangeSection(const MCSection *Section) { const MCSymbol *Grp = static_cast(Section)->getGroup(); if (Grp) getAssembler().getOrCreateSymbolData(*Grp); - this->MCObjectStreamer::SwitchSection(Section); + this->MCObjectStreamer::ChangeSection(Section); } void MCELFStreamer::EmitWeakReference(MCSymbol *Alias, const MCSymbol *Symbol) { @@ -411,7 +411,7 @@ // entry in the module's symbol table (the first being the null symbol). void MCELFStreamer::EmitFileDirective(StringRef Filename) { MCSymbol *Symbol = getAssembler().getContext().GetOrCreateSymbol(Filename); - Symbol->setSection(*CurSection); + Symbol->setSection(*getCurrentSection()); Symbol->setAbsolute(); MCSymbolData &SD = getAssembler().getOrCreateSymbolData(*Symbol); Modified: llvm/trunk/lib/MC/MCLoggingStreamer.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCLoggingStreamer.cpp?rev=125629&r1=125628&r2=125629&view=diff ============================================================================== --- llvm/trunk/lib/MC/MCLoggingStreamer.cpp (original) +++ llvm/trunk/lib/MC/MCLoggingStreamer.cpp Tue Feb 15 19:08:29 2011 @@ -48,10 +48,9 @@ return Child->AddBlankLine(); } - virtual void SwitchSection(const MCSection *Section) { - CurSection = Section; - LogCall("SwitchSection"); - return Child->SwitchSection(Section); + virtual void ChangeSection(const MCSection *Section) { + LogCall("ChangeSection"); + return Child->ChangeSection(Section); } virtual void InitSections() { Modified: llvm/trunk/lib/MC/MCMachOStreamer.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCMachOStreamer.cpp?rev=125629&r1=125628&r2=125629&view=diff ============================================================================== --- llvm/trunk/lib/MC/MCMachOStreamer.cpp (original) +++ llvm/trunk/lib/MC/MCMachOStreamer.cpp Tue Feb 15 19:08:29 2011 @@ -105,7 +105,7 @@ assert(Symbol->isUndefined() && "Cannot define a symbol twice!"); // isSymbolLinkerVisible uses the section. - Symbol->setSection(*CurSection); + Symbol->setSection(*getCurrentSection()); // We have to create a new fragment if this is an atom defining symbol, // fragments cannot span atoms. if (getAssembler().isSymbolLinkerVisible(*Symbol)) Modified: llvm/trunk/lib/MC/MCNullStreamer.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCNullStreamer.cpp?rev=125629&r1=125628&r2=125629&view=diff ============================================================================== --- llvm/trunk/lib/MC/MCNullStreamer.cpp (original) +++ llvm/trunk/lib/MC/MCNullStreamer.cpp Tue Feb 15 19:08:29 2011 @@ -28,15 +28,13 @@ virtual void InitSections() { } - virtual void SwitchSection(const MCSection *Section) { - PrevSection = CurSection; - CurSection = Section; + virtual void ChangeSection(const MCSection *Section) { } virtual void EmitLabel(MCSymbol *Symbol) { assert(Symbol->isUndefined() && "Cannot define a symbol twice!"); - assert(CurSection && "Cannot emit before setting section!"); - Symbol->setSection(*CurSection); + assert(getCurrentSection() && "Cannot emit before setting section!"); + Symbol->setSection(*getCurrentSection()); } virtual void EmitAssemblerFlag(MCAssemblerFlag Flag) {} Modified: llvm/trunk/lib/MC/MCObjectStreamer.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCObjectStreamer.cpp?rev=125629&r1=125628&r2=125629&view=diff ============================================================================== --- llvm/trunk/lib/MC/MCObjectStreamer.cpp (original) +++ llvm/trunk/lib/MC/MCObjectStreamer.cpp Tue Feb 15 19:08:29 2011 @@ -101,9 +101,9 @@ void MCObjectStreamer::EmitLabel(MCSymbol *Symbol) { assert(!Symbol->isVariable() && "Cannot emit a variable symbol!"); - assert(CurSection && "Cannot emit before setting section!"); + assert(getCurrentSection() && "Cannot emit before setting section!"); - Symbol->setSection(*CurSection); + Symbol->setSection(*getCurrentSection()); MCSymbolData &SD = getAssembler().getOrCreateSymbolData(*Symbol); @@ -142,14 +142,9 @@ report_fatal_error("This file format doesn't support weak aliases."); } -void MCObjectStreamer::SwitchSection(const MCSection *Section) { +void MCObjectStreamer::ChangeSection(const MCSection *Section) { assert(Section && "Cannot switch to a null section!"); - // If already in this section, then this is a noop. - if (Section == CurSection) return; - - PrevSection = CurSection; - CurSection = Section; CurSectionData = &getAssembler().getOrCreateSectionData(*Section); } Modified: llvm/trunk/lib/MC/MCParser/ELFAsmParser.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCParser/ELFAsmParser.cpp?rev=125629&r1=125628&r2=125629&view=diff ============================================================================== --- llvm/trunk/lib/MC/MCParser/ELFAsmParser.cpp (original) +++ llvm/trunk/lib/MC/MCParser/ELFAsmParser.cpp Tue Feb 15 19:08:29 2011 @@ -49,6 +49,8 @@ AddDirectiveHandler<&ELFAsmParser::ParseSectionDirectiveDataRelRoLocal>(".data.rel.ro.local"); AddDirectiveHandler<&ELFAsmParser::ParseSectionDirectiveEhFrame>(".eh_frame"); AddDirectiveHandler<&ELFAsmParser::ParseDirectiveSection>(".section"); + AddDirectiveHandler<&ELFAsmParser::ParseDirectivePushSection>(".pushsection"); + AddDirectiveHandler<&ELFAsmParser::ParseDirectivePopSection>(".popsection"); AddDirectiveHandler<&ELFAsmParser::ParseDirectiveSize>(".size"); AddDirectiveHandler<&ELFAsmParser::ParseDirectivePrevious>(".previous"); AddDirectiveHandler<&ELFAsmParser::ParseDirectiveType>(".type"); @@ -115,6 +117,8 @@ ELF::SHF_WRITE, SectionKind::getDataRel()); } + bool ParseDirectivePushSection(StringRef, SMLoc); + bool ParseDirectivePopSection(StringRef, SMLoc); bool ParseDirectiveSection(StringRef, SMLoc); bool ParseDirectiveSize(StringRef, SMLoc); bool ParseDirectivePrevious(StringRef, SMLoc); @@ -253,6 +257,23 @@ return flags; } +bool ELFAsmParser::ParseDirectivePushSection(StringRef s, SMLoc loc) { + getStreamer().PushSection(); + + if (ParseDirectiveSection(s, loc)) { + getStreamer().PopSection(); + return true; + } + + return false; +} + +bool ELFAsmParser::ParseDirectivePopSection(StringRef, SMLoc) { + if (!getStreamer().PopSection()) + return TokError(".popsection without corresponding .pushsection"); + return false; +} + // FIXME: This is a work in progress. bool ELFAsmParser::ParseDirectiveSection(StringRef, SMLoc) { StringRef SectionName; @@ -364,8 +385,9 @@ bool ELFAsmParser::ParseDirectivePrevious(StringRef DirName, SMLoc) { const MCSection *PreviousSection = getStreamer().getPreviousSection(); - if (PreviousSection != NULL) - getStreamer().SwitchSection(PreviousSection); + if (PreviousSection == NULL) + return TokError(".previous without corresponding .section"); + getStreamer().SwitchSection(PreviousSection); return false; } @@ -427,7 +449,6 @@ Lex(); - const MCSection *OldSection = getStreamer().getCurrentSection(); const MCSection *Comment = getContext().getELFSection(".comment", ELF::SHT_PROGBITS, ELF::SHF_MERGE | @@ -437,13 +458,14 @@ static bool First = true; + getStreamer().PushSection(); getStreamer().SwitchSection(Comment); if (First) getStreamer().EmitIntValue(0, 1); First = false; getStreamer().EmitBytes(Data, 0); getStreamer().EmitIntValue(0, 1); - getStreamer().SwitchSection(OldSection); + getStreamer().PopSection(); return false; } Modified: llvm/trunk/lib/MC/MCPureStreamer.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCPureStreamer.cpp?rev=125629&r1=125628&r2=125629&view=diff ============================================================================== --- llvm/trunk/lib/MC/MCPureStreamer.cpp (original) +++ llvm/trunk/lib/MC/MCPureStreamer.cpp Tue Feb 15 19:08:29 2011 @@ -113,9 +113,9 @@ void MCPureStreamer::EmitLabel(MCSymbol *Symbol) { assert(Symbol->isUndefined() && "Cannot define a symbol twice!"); assert(!Symbol->isVariable() && "Cannot emit a variable symbol!"); - assert(CurSection && "Cannot emit before setting section!"); + assert(getCurrentSection() && "Cannot emit before setting section!"); - Symbol->setSection(*CurSection); + Symbol->setSection(*getCurrentSection()); MCSymbolData &SD = getAssembler().getOrCreateSymbolData(*Symbol); Modified: llvm/trunk/lib/MC/MCStreamer.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCStreamer.cpp?rev=125629&r1=125628&r2=125629&view=diff ============================================================================== --- llvm/trunk/lib/MC/MCStreamer.cpp (original) +++ llvm/trunk/lib/MC/MCStreamer.cpp Tue Feb 15 19:08:29 2011 @@ -19,8 +19,9 @@ #include using namespace llvm; -MCStreamer::MCStreamer(MCContext &Ctx) : Context(Ctx), CurSection(0), - PrevSection(0) { +MCStreamer::MCStreamer(MCContext &Ctx) : Context(Ctx) { + PrevSectionStack.push_back(NULL); + CurSectionStack.push_back(NULL); } MCStreamer::~MCStreamer() { Modified: llvm/trunk/lib/Target/PTX/PTXMCAsmStreamer.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/PTXMCAsmStreamer.cpp?rev=125629&r1=125628&r2=125629&view=diff ============================================================================== --- llvm/trunk/lib/Target/PTX/PTXMCAsmStreamer.cpp (original) +++ llvm/trunk/lib/Target/PTX/PTXMCAsmStreamer.cpp Tue Feb 15 19:08:29 2011 @@ -100,8 +100,7 @@ /// @name MCStreamer Interface /// @{ - virtual void SwitchSection(const MCSection *Section); - + virtual void ChangeSection(const MCSection *Section); virtual void InitSections() {} virtual void EmitLabel(MCSymbol *Symbol); @@ -227,22 +226,18 @@ return Value & ((uint64_t) (int64_t) -1 >> (64 - Bytes * 8)); } -void PTXMCAsmStreamer::SwitchSection(const MCSection *Section) { +void PTXMCAsmStreamer::ChangeSection(const MCSection *Section) { assert(Section && "Cannot switch to a null section!"); - if (Section != CurSection) { - PrevSection = CurSection; - CurSection = Section; - } } void PTXMCAsmStreamer::EmitLabel(MCSymbol *Symbol) { assert(Symbol->isUndefined() && "Cannot define a symbol twice!"); assert(!Symbol->isVariable() && "Cannot emit a variable symbol!"); - assert(CurSection && "Cannot emit before setting section!"); + assert(getCurrentSection() && "Cannot emit before setting section!"); OS << *Symbol << MAI.getLabelSuffix(); EmitEOL(); - Symbol->setSection(*CurSection); + Symbol->setSection(*getCurrentSection()); } void PTXMCAsmStreamer::EmitAssemblerFlag(MCAssemblerFlag Flag) {} @@ -332,7 +327,7 @@ } void PTXMCAsmStreamer::EmitBytes(StringRef Data, unsigned AddrSpace) { - assert(CurSection && "Cannot emit contents before setting section!"); + assert(getCurrentSection() && "Cannot emit contents before setting section!"); if (Data.empty()) return; if (Data.size() == 1) { @@ -358,7 +353,7 @@ void PTXMCAsmStreamer::EmitValueImpl(const MCExpr *Value, unsigned Size, bool isPCRel, unsigned AddrSpace) { - assert(CurSection && "Cannot emit contents before setting section!"); + assert(getCurrentSection() && "Cannot emit contents before setting section!"); assert(!isPCRel && "Cannot emit pc relative relocations!"); const char *Directive = 0; switch (Size) { @@ -502,7 +497,7 @@ void PTXMCAsmStreamer::AddEncodingComment(const MCInst &Inst) {} void PTXMCAsmStreamer::EmitInstruction(const MCInst &Inst) { - assert(CurSection && "Cannot emit contents before setting section!"); + assert(getCurrentSection() && "Cannot emit contents before setting section!"); // Show the encoding in a comment if we have a code emitter. if (Emitter) Added: llvm/trunk/test/MC/AsmParser/section.s URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AsmParser/section.s?rev=125629&view=auto ============================================================================== --- llvm/trunk/test/MC/AsmParser/section.s (added) +++ llvm/trunk/test/MC/AsmParser/section.s Tue Feb 15 19:08:29 2011 @@ -0,0 +1,107 @@ +# RUN: llvm-mc -triple i386-pc-linux-gnu -filetype=obj -o %t %s +# RUN: elf-dump --dump-section-data < %t | FileCheck %s +.section test1 +.byte 1 +.section test2 +.byte 2 +.previous +.byte 1 +.section test2 +.byte 2 +.previous +.byte 1 +.section test1 +.byte 1 +.previous +.byte 1 +.section test2 +.byte 2 +.pushsection test3 +.byte 3 +.pushsection test4 +.byte 4 +.pushsection test5 +.byte 5 +.popsection +.byte 4 +.popsection +.byte 3 +.popsection +.byte 2 +.pushsection test3 +.byte 3 +.pushsection test4 +.byte 4 +.previous +.byte 3 +.popsection +.byte 3 +.previous +.byte 2 +.section test1 +.byte 1 +.popsection +.byte 2 +.previous +.byte 1 +.previous +# CHECK: (('sh_name', 0x00000012) # 'test1' +# CHECK-NEXT: ('sh_type', 0x00000001) +# CHECK-NEXT: ('sh_flags', 0x00000000) +# CHECK-NEXT: ('sh_addr', 0x00000000) +# CHECK-NEXT: ('sh_offset', 0x00000034) +# CHECK-NEXT: ('sh_size', 0x00000007) +# CHECK-NEXT: ('sh_link', 0x00000000) +# CHECK-NEXT: ('sh_info', 0x00000000) +# CHECK-NEXT: ('sh_addralign', 0x00000001) +# CHECK-NEXT: ('sh_entsize', 0x00000000) +# CHECK-NEXT: ('_section_data', '01010101 010101') +# CHECK-NEXT: ), +# CHECK: (('sh_name', 0x00000018) # 'test2' +# CHECK-NEXT: ('sh_type', 0x00000001) +# CHECK-NEXT: ('sh_flags', 0x00000000) +# CHECK-NEXT: ('sh_addr', 0x00000000) +# CHECK-NEXT: ('sh_offset', 0x0000003b) +# CHECK-NEXT: ('sh_size', 0x00000006) +# CHECK-NEXT: ('sh_link', 0x00000000) +# CHECK-NEXT: ('sh_info', 0x00000000) +# CHECK-NEXT: ('sh_addralign', 0x00000001) +# CHECK-NEXT: ('sh_entsize', 0x00000000) +# CHECK-NEXT: ('_section_data', '02020202 0202') +# CHECK-NEXT: ), +# CHECK: (('sh_name', 0x0000001e) # 'test3' +# CHECK-NEXT: ('sh_type', 0x00000001) +# CHECK-NEXT: ('sh_flags', 0x00000000) +# CHECK-NEXT: ('sh_addr', 0x00000000) +# CHECK-NEXT: ('sh_offset', 0x00000041) +# CHECK-NEXT: ('sh_size', 0x00000005) +# CHECK-NEXT: ('sh_link', 0x00000000) +# CHECK-NEXT: ('sh_info', 0x00000000) +# CHECK-NEXT: ('sh_addralign', 0x00000001) +# CHECK-NEXT: ('sh_entsize', 0x00000000) +# CHECK-NEXT: ('_section_data', '03030303 03') +# CHECK-NEXT: ), +# CHECK: (('sh_name', 0x00000024) # 'test4' +# CHECK-NEXT: ('sh_type', 0x00000001) +# CHECK-NEXT: ('sh_flags', 0x00000000) +# CHECK-NEXT: ('sh_addr', 0x00000000) +# CHECK-NEXT: ('sh_offset', 0x00000046) +# CHECK-NEXT: ('sh_size', 0x00000003) +# CHECK-NEXT: ('sh_link', 0x00000000) +# CHECK-NEXT: ('sh_info', 0x00000000) +# CHECK-NEXT: ('sh_addralign', 0x00000001) +# CHECK-NEXT: ('sh_entsize', 0x00000000) +# CHECK-NEXT: ('_section_data', '040404') +# CHECK-NEXT: ), +# CHECK: (('sh_name', 0x0000002a) # 'test5' +# CHECK-NEXT: ('sh_type', 0x00000001) +# CHECK-NEXT: ('sh_flags', 0x00000000) +# CHECK-NEXT: ('sh_addr', 0x00000000) +# CHECK-NEXT: ('sh_offset', 0x00000049) +# CHECK-NEXT: ('sh_size', 0x00000001) +# CHECK-NEXT: ('sh_link', 0x00000000) +# CHECK-NEXT: ('sh_info', 0x00000000) +# CHECK-NEXT: ('sh_addralign', 0x00000001) +# CHECK-NEXT: ('sh_entsize', 0x00000000) +# CHECK-NEXT: ('_section_data', '05') +# CHECK-NEXT: ), From echristo at apple.com Tue Feb 15 19:08:31 2011 From: echristo at apple.com (Eric Christopher) Date: Wed, 16 Feb 2011 01:08:31 -0000 Subject: [llvm-commits] [llvm] r125630 - /llvm/trunk/test/CodeGen/X86/legalize-sub-zero.ll Message-ID: <20110216010831.2D86F2A6C12D@llvm.org> Author: echristo Date: Tue Feb 15 19:08:31 2011 New Revision: 125630 URL: http://llvm.org/viewvc/llvm-project?rev=125630&view=rev Log: Add testcase for PR9190. Added: llvm/trunk/test/CodeGen/X86/legalize-sub-zero.ll Added: llvm/trunk/test/CodeGen/X86/legalize-sub-zero.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/legalize-sub-zero.ll?rev=125630&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/legalize-sub-zero.ll (added) +++ llvm/trunk/test/CodeGen/X86/legalize-sub-zero.ll Tue Feb 15 19:08:31 2011 @@ -0,0 +1,35 @@ +; RUN: llc < %s -mtriple=i686-pc-win32 + +;target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-f80:128:128-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32" +;target triple = "i686-pc-win32" + +define void @test() nounwind { + %1 = fdiv <3 x double> zeroinitializer, undef + %2 = fdiv <2 x double> zeroinitializer, undef + %3 = shufflevector <2 x double> %2, <2 x double> undef, <3 x i32> + %4 = insertelement <3 x double> %3, double undef, i32 2 + %5 = bitcast <3 x double> %1 to <3 x i64> + %6 = bitcast <3 x double> %4 to <3 x i64> + %7 = sub <3 x i64> %5, %6 + %8 = shufflevector <3 x i64> %7, <3 x i64> undef, <2 x i32> + %9 = xor <2 x i64> %8, zeroinitializer + %10 = add nsw <2 x i64> %9, zeroinitializer + %11 = shufflevector <2 x i64> %10, <2 x i64> undef, <3 x i32> + %12 = insertelement <3 x i64> %11, i64 0, i32 2 + %13 = shufflevector <3 x i64> %12, <3 x i64> undef, <4 x i32> + %14 = shufflevector <4 x i64> %13, <4 x i64> undef, <2 x i32> + %15 = bitcast <2 x i64> %14 to <4 x i32> + %16 = shufflevector <4 x i32> %15, <4 x i32> undef, <4 x i32> + %17 = bitcast <4 x i32> %16 to <2 x i64> + %18 = shufflevector <2 x i64> %17, <2 x i64> undef, <2 x i32> + %19 = bitcast <2 x i64> %18 to <4 x i32> + %20 = shufflevector <4 x i32> %19, <4 x i32> undef, <3 x i32> + %21 = or <3 x i32> %20, zeroinitializer + store <3 x i32> %21, <3 x i32> addrspace(1)* undef, align 16 + ret void +} From echristo at apple.com Tue Feb 15 19:10:03 2011 From: echristo at apple.com (Eric Christopher) Date: Wed, 16 Feb 2011 01:10:03 -0000 Subject: [llvm-commits] [llvm] r125631 - in /llvm/trunk: lib/CodeGen/SelectionDAG/DAGCombiner.cpp test/CodeGen/X86/legalize-sub-zero-2.ll Message-ID: <20110216011003.EFB5B2A6C12C@llvm.org> Author: echristo Date: Tue Feb 15 19:10:03 2011 New Revision: 125631 URL: http://llvm.org/viewvc/llvm-project?rev=125631&view=rev Log: The change for PR9190 wasn't quite right. We need to avoid making the transformation if we can't legally create a build vector of the correct type. Check that we can make the transformation first, and add a TODO to refactor this code with similar cases. Fixes: PR9223 and rdar://9000350 Added: llvm/trunk/test/CodeGen/X86/legalize-sub-zero-2.ll Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp?rev=125631&r1=125630&r2=125631&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Tue Feb 15 19:10:03 2011 @@ -1532,8 +1532,18 @@ } // fold (sub x, x) -> 0 - if (N0 == N1) - return DAG.getConstant(0, N->getValueType(0), LegalTypes); + // FIXME: Refactor this and xor and other similar operations together. + if (N0 == N1) { + if (!VT.isVector()) { + return DAG.getConstant(0, VT); + } else if (!LegalOperations || TLI.isOperationLegal(ISD::BUILD_VECTOR, VT)){ + // Produce a vector of zeros. + SDValue El = DAG.getConstant(0, VT.getVectorElementType()); + std::vector Ops(VT.getVectorNumElements(), El); + return DAG.getNode(ISD::BUILD_VECTOR, N->getDebugLoc(), VT, + &Ops[0], Ops.size()); + } + } // fold (sub c1, c2) -> c1-c2 if (N0C && N1C) return DAG.FoldConstantArithmetic(ISD::SUB, VT, N0C, N1C); Added: llvm/trunk/test/CodeGen/X86/legalize-sub-zero-2.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/legalize-sub-zero-2.ll?rev=125631&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/legalize-sub-zero-2.ll (added) +++ llvm/trunk/test/CodeGen/X86/legalize-sub-zero-2.ll Tue Feb 15 19:10:03 2011 @@ -0,0 +1,41 @@ +; RUN: llc < %s -mtriple=i386-apple-darwin + +define fastcc void @foo(i32 %type) nounwind optsize { +entry: + switch i32 %type, label %bb26 [ + i32 33634, label %bb11 + i32 5121, label %bb27 + ] + +bb11: ; preds = %entry + br label %bb27 + +bb26: ; preds = %entry + unreachable + +bb27: ; preds = %bb11, %entry + %srcpb.0 = phi i32 [ 1, %bb11 ], [ 0, %entry ] + br i1 undef, label %bb348, label %bb30.lr.ph + +bb30.lr.ph: ; preds = %bb27 + %.sum743 = shl i32 %srcpb.0, 1 + %0 = mul i32 %srcpb.0, -2 + %.sum745 = add i32 %.sum743, %0 + br i1 undef, label %bb70, label %bb71 + +bb70: ; preds = %bb30.lr.ph + unreachable + +bb71: ; preds = %bb30.lr.ph + br i1 undef, label %bb92, label %bb80 + +bb80: ; preds = %bb71 + unreachable + +bb92: ; preds = %bb71 + %1 = getelementptr inbounds i8* undef, i32 %.sum745 + unreachable + +bb348: ; preds = %bb27 + ret void +} From echristo at apple.com Tue Feb 15 19:15:03 2011 From: echristo at apple.com (Eric Christopher) Date: Tue, 15 Feb 2011 17:15:03 -0800 Subject: [llvm-commits] [llvm] r125631 - in /llvm/trunk: lib/CodeGen/SelectionDAG/DAGCombiner.cpp test/CodeGen/X86/legalize-sub-zero-2.ll In-Reply-To: <20110216011003.EFB5B2A6C12C@llvm.org> References: <20110216011003.EFB5B2A6C12C@llvm.org> Message-ID: On Feb 15, 2011, at 5:10 PM, Eric Christopher wrote: > + // FIXME: Refactor this and xor and other similar operations together. And, just to say it, I plan on doing this in short order. -eric From grosbach at apple.com Tue Feb 15 20:02:10 2011 From: grosbach at apple.com (Jim Grosbach) Date: Tue, 15 Feb 2011 18:02:10 -0800 Subject: [llvm-commits] [llvm] r125595 - in /llvm/trunk: lib/MC/MCParser/AsmParser.cpp test/MC/AsmParser/exprs.s test/MC/AsmParser/paren.s In-Reply-To: <20110215204339.453842A6C12C@llvm.org> References: <20110215204339.453842A6C12C@llvm.org> Message-ID: Shouldn't something like this, at minimum, be predicated on a target enabling it? I doubt this is something all assembly variants want. For example, on x86 does Intel vs ATT syntax change whether this is supported? What about other targets? Do they want this enabled at all? Square brackets often have special meaning (memory references being the most common) and this could very easily complicate that. -Jim On Feb 15, 2011, at 12:43 PM, Roman Divacky wrote: > Author: rdivacky > Date: Tue Feb 15 14:43:39 2011 > New Revision: 125595 > > URL: http://llvm.org/viewvc/llvm-project?rev=125595&view=rev > Log: > Add support for parsing [expr]. > > This is submitted by Joerg Sonnenberger and fixes his PR8685. > > > Added: > llvm/trunk/test/MC/AsmParser/paren.s > Modified: > llvm/trunk/lib/MC/MCParser/AsmParser.cpp > llvm/trunk/test/MC/AsmParser/exprs.s > > Modified: llvm/trunk/lib/MC/MCParser/AsmParser.cpp > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCParser/AsmParser.cpp?rev=125595&r1=125594&r2=125595&view=diff > ============================================================================== > --- llvm/trunk/lib/MC/MCParser/AsmParser.cpp (original) > +++ llvm/trunk/lib/MC/MCParser/AsmParser.cpp Tue Feb 15 14:43:39 2011 > @@ -173,6 +173,7 @@ > bool ParsePrimaryExpr(const MCExpr *&Res, SMLoc &EndLoc); > bool ParseBinOpRHS(unsigned Precedence, const MCExpr *&Res, SMLoc &EndLoc); > bool ParseParenExpr(const MCExpr *&Res, SMLoc &EndLoc); > + bool ParseBracketExpr(const MCExpr *&Res, SMLoc &EndLoc); > > /// ParseIdentifier - Parse an identifier or string (as a quoted identifier) > /// and set \arg Res to the identifier contents. > @@ -492,6 +493,20 @@ > return false; > } > > +/// ParseBracketExpr - Parse a bracket expression and return it. > +/// NOTE: This assumes the leading '[' has already been consumed. > +/// > +/// bracketexpr ::= expr] > +/// > +bool AsmParser::ParseBracketExpr(const MCExpr *&Res, SMLoc &EndLoc) { > + if (ParseExpression(Res)) return true; > + if (Lexer.isNot(AsmToken::RBrac)) > + return TokError("expected ']' in brackets expression"); > + EndLoc = Lexer.getLoc(); > + Lex(); > + return false; > +} > + > /// ParsePrimaryExpr - Parse a primary expression and return it. > /// primaryexpr ::= (parenexpr > /// primaryexpr ::= symbol > @@ -587,6 +602,9 @@ > case AsmToken::LParen: > Lex(); // Eat the '('. > return ParseParenExpr(Res, EndLoc); > + case AsmToken::LBrac: > + Lex(); // Eat the '['. > + return ParseBracketExpr(Res, EndLoc); > case AsmToken::Minus: > Lex(); // Eat the operator. > if (ParsePrimaryExpr(Res, EndLoc)) > > Modified: llvm/trunk/test/MC/AsmParser/exprs.s > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AsmParser/exprs.s?rev=125595&r1=125594&r2=125595&view=diff > ============================================================================== > --- llvm/trunk/test/MC/AsmParser/exprs.s (original) > +++ llvm/trunk/test/MC/AsmParser/exprs.s Tue Feb 15 14:43:39 2011 > @@ -35,6 +35,8 @@ > check_expr 1 << 1, 2 > check_expr 2 >> 1, 1 > check_expr (~0 >> 1), -1 > + check_expr [~0 >> 1], -1 > + check_expr 4 * [4 + (3 + [2 * 2] + 1)], 48 > check_expr 3 - 2, 1 > check_expr 1 ^ 3, 2 > check_expr 1 && 2, 1 > > Added: llvm/trunk/test/MC/AsmParser/paren.s > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AsmParser/paren.s?rev=125595&view=auto > ============================================================================== > --- llvm/trunk/test/MC/AsmParser/paren.s (added) > +++ llvm/trunk/test/MC/AsmParser/paren.s Tue Feb 15 14:43:39 2011 > @@ -0,0 +1,8 @@ > +// RUN: not llvm-mc -triple i386-unknown-unknown %s 2> %t1 > %t2 > +// RUN: FileCheck < %t1 %s > + > +// CHECK: error: expected ']' in brackets expression > +.size x, [.-x) > + > +// CHECK: error: expected ')' in parentheses expression > +.size y, (.-y] > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From joerg at britannica.bec.de Tue Feb 15 20:25:06 2011 From: joerg at britannica.bec.de (Joerg Sonnenberger) Date: Wed, 16 Feb 2011 03:25:06 +0100 Subject: [llvm-commits] [llvm] r125595 - in /llvm/trunk: lib/MC/MCParser/AsmParser.cpp test/MC/AsmParser/exprs.s test/MC/AsmParser/paren.s In-Reply-To: References: <20110215204339.453842A6C12C@llvm.org> Message-ID: <20110216022506.GA22148@britannica.bec.de> On Tue, Feb 15, 2011 at 06:02:10PM -0800, Jim Grosbach wrote: > Shouldn't something like this, at minimum, be predicated on a target > enabling it? I doubt this is something all assembly variants want. ParseBracketExpr can be made virtual if necessary, but the current status quo breaks completely legal code on i386. > For example, on x86 does Intel vs ATT syntax change whether this is > supported? What about other targets? Do they want this enabled at all? > Square brackets often have special meaning (memory references being > the most common) and this could very easily complicate that. AT&T syntax doesn't care about [], I think. Intel syntax is messy as best, but if it could only need a virtual override. Joerg From rafael.espindola at gmail.com Tue Feb 15 21:25:55 2011 From: rafael.espindola at gmail.com (Rafael Espindola) Date: Wed, 16 Feb 2011 03:25:55 -0000 Subject: [llvm-commits] [llvm] r125648 - in /llvm/trunk: include/llvm/MC/MCObjectWriter.h lib/MC/ELFObjectWriter.cpp lib/MC/MCAssembler.cpp lib/MC/MCObjectWriter.cpp lib/MC/WinCOFFObjectWriter.cpp test/MC/ELF/relax.s Message-ID: <20110216032555.F2CC42A6C12C@llvm.org> Author: rafael Date: Tue Feb 15 21:25:55 2011 New Revision: 125648 URL: http://llvm.org/viewvc/llvm-project?rev=125648&view=rev Log: Gas is very inconsistent about when a relaxation/relocation is needed. Do the right thing and stop trying to copy it. Fixes PR8944. Modified: llvm/trunk/include/llvm/MC/MCObjectWriter.h llvm/trunk/lib/MC/ELFObjectWriter.cpp llvm/trunk/lib/MC/MCAssembler.cpp llvm/trunk/lib/MC/MCObjectWriter.cpp llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp llvm/trunk/test/MC/ELF/relax.s Modified: llvm/trunk/include/llvm/MC/MCObjectWriter.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCObjectWriter.h?rev=125648&r1=125647&r2=125648&view=diff ============================================================================== --- llvm/trunk/include/llvm/MC/MCObjectWriter.h (original) +++ llvm/trunk/include/llvm/MC/MCObjectWriter.h Tue Feb 15 21:25:55 2011 @@ -96,7 +96,7 @@ const MCSymbolData &DataA, const MCFragment &FB, bool InSet, - bool IsPCRel) const = 0; + bool IsPCRel) const; /// Write the object file. Modified: llvm/trunk/lib/MC/ELFObjectWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/ELFObjectWriter.cpp?rev=125648&r1=125647&r2=125648&view=diff ============================================================================== --- llvm/trunk/lib/MC/ELFObjectWriter.cpp (original) +++ llvm/trunk/lib/MC/ELFObjectWriter.cpp Tue Feb 15 21:25:55 2011 @@ -359,13 +359,6 @@ MCDataFragment *F, const MCSectionData *SD); - virtual bool - IsSymbolRefDifferenceFullyResolvedImpl(const MCAssembler &Asm, - const MCSymbolData &DataA, - const MCFragment &FB, - bool InSet, - bool IsPCRel) const; - virtual void WriteObject(MCAssembler &Asm, const MCAsmLayout &Layout); virtual void WriteSection(MCAssembler &Asm, const SectionIndexMapTy &SectionIndexMap, @@ -1181,24 +1174,6 @@ } } -bool -ELFObjectWriter::IsSymbolRefDifferenceFullyResolvedImpl(const MCAssembler &Asm, - const MCSymbolData &DataA, - const MCFragment &FB, - bool InSet, - bool IsPCRel) const { - // FIXME: This is in here just to match gnu as output. If the two ends - // are in the same section, there is nothing that the linker can do to - // break it. - if (DataA.isExternal()) - return false; - - const MCSection &SecA = DataA.getSymbol().AliasedSymbol().getSection(); - const MCSection &SecB = FB.getParent()->getSection(); - // On ELF A - B is absolute if A and B are in the same section. - return &SecA == &SecB; -} - void ELFObjectWriter::CreateIndexedSections(MCAssembler &Asm, MCAsmLayout &Layout, GroupMapTy &GroupMap, Modified: llvm/trunk/lib/MC/MCAssembler.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAssembler.cpp?rev=125648&r1=125647&r2=125648&view=diff ============================================================================== --- llvm/trunk/lib/MC/MCAssembler.cpp (original) +++ llvm/trunk/lib/MC/MCAssembler.cpp Tue Feb 15 21:25:55 2011 @@ -229,8 +229,10 @@ } else if (!Target.getSymA()) { IsResolved = false; } else { - const MCSymbol &SA = Target.getSymA()->getSymbol(); - if (SA.AliasedSymbol().isUndefined()) { + const MCSymbolRefExpr *A = Target.getSymA(); + const MCSymbol &SA = A->getSymbol(); + if (A->getKind() != MCSymbolRefExpr::VK_None || + SA.AliasedSymbol().isUndefined()) { IsResolved = false; } else { const MCSymbolData &DataA = getSymbolData(SA); Modified: llvm/trunk/lib/MC/MCObjectWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCObjectWriter.cpp?rev=125648&r1=125647&r2=125648&view=diff ============================================================================== --- llvm/trunk/lib/MC/MCObjectWriter.cpp (original) +++ llvm/trunk/lib/MC/MCObjectWriter.cpp Tue Feb 15 21:25:55 2011 @@ -66,3 +66,15 @@ InSet, false); } + +bool +MCObjectWriter::IsSymbolRefDifferenceFullyResolvedImpl(const MCAssembler &Asm, + const MCSymbolData &DataA, + const MCFragment &FB, + bool InSet, + bool IsPCRel) const { + const MCSection &SecA = DataA.getSymbol().AliasedSymbol().getSection(); + const MCSection &SecB = FB.getParent()->getSection(); + // On ELF and COFF A - B is absolute if A and B are in the same section. + return &SecA == &SecB; +} Modified: llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp?rev=125648&r1=125647&r2=125648&view=diff ============================================================================== --- llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp (original) +++ llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp Tue Feb 15 21:25:55 2011 @@ -179,13 +179,6 @@ MCValue Target, uint64_t &FixedValue); - virtual bool - IsSymbolRefDifferenceFullyResolvedImpl(const MCAssembler &Asm, - const MCSymbolData &DataA, - const MCFragment &FB, - bool InSet, - bool IsPCRel) const; - void WriteObject(MCAssembler &Asm, const MCAsmLayout &Layout); }; } @@ -719,19 +712,6 @@ coff_section->Relocations.push_back(Reloc); } -bool -WinCOFFObjectWriter::IsSymbolRefDifferenceFullyResolvedImpl( - const MCAssembler &Asm, - const MCSymbolData &DataA, - const MCFragment &FB, - bool InSet, - bool IsPCRel) const { - const MCSection &SecA = DataA.getSymbol().AliasedSymbol().getSection(); - const MCSection &SecB = FB.getParent()->getSection(); - // On COFF A - B is absolute if A and B are in the same section. - return &SecA == &SecB; -} - void WinCOFFObjectWriter::WriteObject(MCAssembler &Asm, const MCAsmLayout &Layout) { // Assign symbol and section indexes and offsets. Modified: llvm/trunk/test/MC/ELF/relax.s URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ELF/relax.s?rev=125648&r1=125647&r2=125648&view=diff ============================================================================== --- llvm/trunk/test/MC/ELF/relax.s (original) +++ llvm/trunk/test/MC/ELF/relax.s Tue Feb 15 21:25:55 2011 @@ -1,10 +1,6 @@ // RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | elf-dump --dump-section-data | FileCheck %s -// Test that we do a relaxation for foo but not for bar or zed. Relaxing foo is -// probably not necessary, but matches what gnu as does. - -// Also test that the relaxation done for foo uses the symbol, not section and -// offset. +// Test that we do not relax these. bar: .globl foo @@ -20,22 +16,12 @@ // CHECK-NEXT: ('sh_flags', 0x00000006) // CHECK-NEXT: ('sh_addr', 0x00000000) // CHECK-NEXT: ('sh_offset', 0x00000040) -// CHECK-NEXT: ('sh_size', 0x00000009) +// CHECK-NEXT: ('sh_size', 0x00000006) // CHECK-NEXT: ('sh_link', 0x00000000) // CHECK-NEXT: ('sh_info', 0x00000000) // CHECK-NEXT: ('sh_addralign', 0x00000004) // CHECK-NEXT: ('sh_entsize', 0x00000000) -// CHECK-NEXT: ('_section_data', 'ebfee900 000000eb f7') +// CHECK-NEXT: ('_section_data', 'ebfeebfc ebfa') // CHECK: # Symbol 0x00000006 // CHECK-NEXT: (('st_name', 0x00000005) # 'foo' - -// CHECK: .rela.text -// CHECK: ('_relocations', [ -// CHECK-NEXT: Relocation 0x00000000 -// CHECK-NEXT: (('r_offset', 0x00000003) -// CHECK-NEXT: ('r_sym', 0x00000006) -// CHECK-NEXT: ('r_type', 0x00000002) -// CHECK-NEXT: ('r_addend', 0xfffffffc) -// CHECK-NEXT: ), -// CHECK-NEXT: ]) From geek4civic at gmail.com Tue Feb 15 21:57:59 2011 From: geek4civic at gmail.com (NAKAMURA Takumi) Date: Wed, 16 Feb 2011 12:57:59 +0900 Subject: [llvm-commits] [PATCH][llvm][clang] Use Triple::MinGW32 instead of Triple::MinGW64 Message-ID: Hello. I have reworked Triple patches. - Use Triple::MinGW32. (I got rid of Triple::MinGW) - *-mingw64 is no longer recognized. Use *-mingw32. Please take a look into them, thank you. * clang-0001-Triple-MinGW64-is-deprecated-and-removed.-We-can.patch.txt * llvm-0001-Triple-MinGW64-is-deprecated-and-removed.-We-can.patch.txt Reworked. * clang-0002-lib-Frontend-InitHeaderSearch.cpp-Add-mingw-w64-.patch.txt Almost same as last one. ...Takumi -------------- next part -------------- From ae588cf518e2ffe66fac97d58ca2477e6de3e234 Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Wed, 16 Feb 2011 10:47:25 +0900 Subject: [PATCH 1/2] Triple::MinGW64 is deprecated and removed. We can use Triple::MinGW32 instead. MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------1.7.1.GIT" This is a multi-part message in MIME format. --------------1.7.1.GIT Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: 8bit No one uses *-mingw64. mingw-w64 is represented as {i686|x86_64}-w64-mingw32. --- lib/Basic/Targets.cpp | 2 +- lib/CodeGen/TargetInfo.cpp | 2 +- lib/Driver/Driver.cpp | 1 - lib/Driver/Tools.cpp | 3 +-- lib/Frontend/InitHeaderSearch.cpp | 9 --------- lib/Sema/TargetAttributesSema.cpp | 3 +-- 6 files changed, 4 insertions(+), 16 deletions(-) --------------1.7.1.GIT Content-Type: text/x-patch; name="0001-Triple-MinGW64-is-deprecated-and-removed.-We-can.patch.txt" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0001-Triple-MinGW64-is-deprecated-and-removed.-We-can.patch.txt" diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index 2af28d6..35817a2 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -2691,7 +2691,7 @@ static TargetInfo *AllocateTarget(const std::string &T) { return new FreeBSDTargetInfo(T); case llvm::Triple::Solaris: return new SolarisTargetInfo(T); - case llvm::Triple::MinGW64: + case llvm::Triple::MinGW32: return new MinGWX86_64TargetInfo(T); case llvm::Triple::Win32: // This is what Triple.h supports now. if (Triple.getEnvironment() == llvm::Triple::MachO) diff --git a/lib/CodeGen/TargetInfo.cpp b/lib/CodeGen/TargetInfo.cpp index c12e540..e27292c 100644 --- a/lib/CodeGen/TargetInfo.cpp +++ b/lib/CodeGen/TargetInfo.cpp @@ -2829,7 +2829,7 @@ const TargetCodeGenInfo &CodeGenModule::getTargetCodeGenInfo() { case llvm::Triple::x86_64: switch (Triple.getOS()) { case llvm::Triple::Win32: - case llvm::Triple::MinGW64: + case llvm::Triple::MinGW32: case llvm::Triple::Cygwin: return *(TheTargetCodeGenInfo = new WinX86_64TargetCodeGenInfo(Types)); default: diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index a4f6c3f..5a5986b 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -1349,7 +1349,6 @@ const HostInfo *Driver::GetHostInfo(const char *TripleStr) const { case llvm::Triple::Win32: return createWindowsHostInfo(*this, Triple); case llvm::Triple::MinGW32: - case llvm::Triple::MinGW64: return createMinGWHostInfo(*this, Triple); default: return createUnknownHostInfo(*this, Triple); diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index c8a3ef7..176384a 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -1448,8 +1448,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, if (KernelOrKext || !Args.hasFlag(options::OPT_fuse_cxa_atexit, options::OPT_fno_use_cxa_atexit, getToolChain().getTriple().getOS() != llvm::Triple::Cygwin && - getToolChain().getTriple().getOS() != llvm::Triple::MinGW32 && - getToolChain().getTriple().getOS() != llvm::Triple::MinGW64)) + getToolChain().getTriple().getOS() != llvm::Triple::MinGW32)) CmdArgs.push_back("-fno-use-cxa-atexit"); // -fms-extensions=0 is default. diff --git a/lib/Frontend/InitHeaderSearch.cpp b/lib/Frontend/InitHeaderSearch.cpp index 50b89aa..39f30e5 100644 --- a/lib/Frontend/InitHeaderSearch.cpp +++ b/lib/Frontend/InitHeaderSearch.cpp @@ -529,7 +529,6 @@ void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple, case llvm::Triple::Cygwin: AddPath("/usr/include/w32api", System, true, false, false); break; - case llvm::Triple::MinGW64: case llvm::Triple::MinGW32: AddPath("c:/mingw/include", System, true, false, false); break; @@ -566,14 +565,6 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple) { // FIXME: Do we support g++-3.4.4? AddMinGWCPlusPlusIncludePaths("/usr/lib/gcc", "i686-pc-cygwin", "3.4.4"); break; - case llvm::Triple::MinGW64: - // Try gcc 4.5.0 - AddMinGWCPlusPlusIncludePaths("c:/MinGW/lib/gcc", "mingw64", "4.5.0"); - // Try gcc 4.4.0 - AddMinGWCPlusPlusIncludePaths("c:/MinGW/lib/gcc", "mingw64", "4.4.0"); - // Try gcc 4.3.0 - AddMinGWCPlusPlusIncludePaths("c:/MinGW/lib/gcc", "mingw64", "4.3.0"); - // Fall through. case llvm::Triple::MinGW32: // Try gcc 4.5.0 AddMinGWCPlusPlusIncludePaths("c:/MinGW/lib/gcc", "mingw32", "4.5.0"); diff --git a/lib/Sema/TargetAttributesSema.cpp b/lib/Sema/TargetAttributesSema.cpp index bb61802..6d7f2e6 100644 --- a/lib/Sema/TargetAttributesSema.cpp +++ b/lib/Sema/TargetAttributesSema.cpp @@ -238,8 +238,7 @@ namespace { const AttributeList &Attr, Sema &S) const { const llvm::Triple &Triple(S.Context.Target.getTriple()); if (Triple.getOS() == llvm::Triple::Win32 || - Triple.getOS() == llvm::Triple::MinGW32 || - Triple.getOS() == llvm::Triple::MinGW64) { + Triple.getOS() == llvm::Triple::MinGW32) { switch (Attr.getKind()) { case AttributeList::AT_dllimport: HandleDLLImportAttr(D, Attr, S); return true; --------------1.7.1.GIT-- -------------- next part -------------- From 7b89bb61e24b3f2e51aa6d0be94938de8a5700d5 Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Wed, 16 Feb 2011 10:41:06 +0900 Subject: [PATCH] Triple::MinGW64 is deprecated and removed. We can use Triple::MinGW32 generally. MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------1.7.1.GIT" This is a multi-part message in MIME format. --------------1.7.1.GIT Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: 8bit No one uses *-mingw64. mingw-w64 is represented as {i686|x86_64}-w64-mingw32. In llvm side, i686 and x64 can be treated as similar way. --- include/llvm/ADT/Triple.h | 3 +-- lib/Support/Triple.cpp | 3 --- lib/Target/ARM/ARMTargetMachine.cpp | 1 - lib/Target/MBlaze/MBlazeTargetMachine.cpp | 1 - lib/Target/X86/X86AsmBackend.cpp | 2 +- lib/Target/X86/X86Subtarget.h | 4 +--- lib/Target/X86/X86TargetMachine.cpp | 2 -- test/CodeGen/X86/2009-06-03-Win64DisableRedZone.ll | 2 +- test/CodeGen/X86/2009-06-03-Win64SpillXMM.ll | 2 +- 9 files changed, 5 insertions(+), 15 deletions(-) --------------1.7.1.GIT Content-Type: text/x-patch; name="0001-Triple-MinGW64-is-deprecated-and-removed.-We-can.patch.txt" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0001-Triple-MinGW64-is-deprecated-and-removed.-We-can.patch.txt" diff --git a/include/llvm/ADT/Triple.h b/include/llvm/ADT/Triple.h index 9e2eb86..e6dcc23 100644 --- a/include/llvm/ADT/Triple.h +++ b/include/llvm/ADT/Triple.h @@ -84,8 +84,7 @@ public: FreeBSD, Linux, Lv2, // PS3 - MinGW32, - MinGW64, + MinGW32, // i*86-pc-mingw32, *-w64-mingw32 NetBSD, OpenBSD, Psp, diff --git a/lib/Support/Triple.cpp b/lib/Support/Triple.cpp index d4a7dec..36edf6e 100644 --- a/lib/Support/Triple.cpp +++ b/lib/Support/Triple.cpp @@ -101,7 +101,6 @@ const char *Triple::getOSTypeName(OSType Kind) { case Linux: return "linux"; case Lv2: return "lv2"; case MinGW32: return "mingw32"; - case MinGW64: return "mingw64"; case NetBSD: return "netbsd"; case OpenBSD: return "openbsd"; case Psp: return "psp"; @@ -318,8 +317,6 @@ Triple::OSType Triple::ParseOS(StringRef OSName) { return Lv2; else if (OSName.startswith("mingw32")) return MinGW32; - else if (OSName.startswith("mingw64")) - return MinGW64; else if (OSName.startswith("netbsd")) return NetBSD; else if (OSName.startswith("openbsd")) diff --git a/lib/Target/ARM/ARMTargetMachine.cpp b/lib/Target/ARM/ARMTargetMachine.cpp index 60df718..0ee773b 100644 --- a/lib/Target/ARM/ARMTargetMachine.cpp +++ b/lib/Target/ARM/ARMTargetMachine.cpp @@ -45,7 +45,6 @@ static MCStreamer *createMCStreamer(const Target &T, const std::string &TT, case Triple::Darwin: return createMachOStreamer(Ctx, TAB, OS, Emitter, RelaxAll); case Triple::MinGW32: - case Triple::MinGW64: case Triple::Cygwin: case Triple::Win32: llvm_unreachable("ARM does not support Windows COFF format"); diff --git a/lib/Target/MBlaze/MBlazeTargetMachine.cpp b/lib/Target/MBlaze/MBlazeTargetMachine.cpp index f83f70b..cd949e1 100644 --- a/lib/Target/MBlaze/MBlazeTargetMachine.cpp +++ b/lib/Target/MBlaze/MBlazeTargetMachine.cpp @@ -41,7 +41,6 @@ static MCStreamer *createMCStreamer(const Target &T, const std::string &TT, llvm_unreachable("MBlaze does not support Darwin MACH-O format"); return NULL; case Triple::MinGW32: - case Triple::MinGW64: case Triple::Cygwin: case Triple::Win32: llvm_unreachable("MBlaze does not support Windows COFF format"); diff --git a/lib/Target/X86/X86AsmBackend.cpp b/lib/Target/X86/X86AsmBackend.cpp index 3c426be..da5f5b1 100644 --- a/lib/Target/X86/X86AsmBackend.cpp +++ b/lib/Target/X86/X86AsmBackend.cpp @@ -428,7 +428,7 @@ TargetAsmBackend *llvm::createX86_64AsmBackend(const Target &T, switch (Triple(TT).getOS()) { case Triple::Darwin: return new DarwinX86_64AsmBackend(T); - case Triple::MinGW64: + case Triple::MinGW32: case Triple::Cygwin: case Triple::Win32: if (Triple(TT).getEnvironment() == Triple::MachO) diff --git a/lib/Target/X86/X86Subtarget.h b/lib/Target/X86/X86Subtarget.h index 48ceb21..2bd60da 100644 --- a/lib/Target/X86/X86Subtarget.h +++ b/lib/Target/X86/X86Subtarget.h @@ -175,9 +175,7 @@ public: bool isTargetLinux() const { return TargetTriple.getOS() == Triple::Linux; } bool isTargetWindows() const { return TargetTriple.getOS() == Triple::Win32; } - bool isTargetMingw() const { - return TargetTriple.getOS() == Triple::MinGW32 || - TargetTriple.getOS() == Triple::MinGW64; } + bool isTargetMingw() const { return TargetTriple.getOS() == Triple::MinGW32; } bool isTargetCygwin() const { return TargetTriple.getOS() == Triple::Cygwin; } bool isTargetCygMing() const { return isTargetMingw() || isTargetCygwin(); diff --git a/lib/Target/X86/X86TargetMachine.cpp b/lib/Target/X86/X86TargetMachine.cpp index f216279..b2a9a5c 100644 --- a/lib/Target/X86/X86TargetMachine.cpp +++ b/lib/Target/X86/X86TargetMachine.cpp @@ -30,7 +30,6 @@ static MCAsmInfo *createMCAsmInfo(const Target &T, StringRef TT) { case Triple::Darwin: return new X86MCAsmInfoDarwin(TheTriple); case Triple::MinGW32: - case Triple::MinGW64: case Triple::Cygwin: case Triple::Win32: if (TheTriple.getEnvironment() == Triple::MachO) @@ -53,7 +52,6 @@ static MCStreamer *createMCStreamer(const Target &T, const std::string &TT, case Triple::Darwin: return createMachOStreamer(Ctx, TAB, _OS, _Emitter, RelaxAll); case Triple::MinGW32: - case Triple::MinGW64: case Triple::Cygwin: case Triple::Win32: if (TheTriple.getEnvironment() == Triple::MachO) diff --git a/test/CodeGen/X86/2009-06-03-Win64DisableRedZone.ll b/test/CodeGen/X86/2009-06-03-Win64DisableRedZone.ll index 9d06a9e..98b1e0e 100644 --- a/test/CodeGen/X86/2009-06-03-Win64DisableRedZone.ll +++ b/test/CodeGen/X86/2009-06-03-Win64DisableRedZone.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=x86_64-pc-mingw64 < %s | FileCheck %s +; RUN: llc -mtriple=x86_64-mingw32 < %s | FileCheck %s ; CHECK-NOT: -{{[1-9][0-9]*}}(%rsp) define x86_fp80 @a(i64 %x) nounwind readnone { diff --git a/test/CodeGen/X86/2009-06-03-Win64SpillXMM.ll b/test/CodeGen/X86/2009-06-03-Win64SpillXMM.ll index 6e8d9a9..12bd285 100644 --- a/test/CodeGen/X86/2009-06-03-Win64SpillXMM.ll +++ b/test/CodeGen/X86/2009-06-03-Win64SpillXMM.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=x86_64-pc-mingw64 < %s | FileCheck %s +; RUN: llc -mtriple=x86_64-mingw32 < %s | FileCheck %s ; CHECK: subq $40, %rsp ; CHECK: movaps %xmm8, (%rsp) ; CHECK: movaps %xmm7, 16(%rsp) --------------1.7.1.GIT-- -------------- next part -------------- From 641db868ffb08e4a49ea8207405e385dcd2d42df Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Wed, 16 Feb 2011 11:01:30 +0900 Subject: [PATCH 2/2] lib/Frontend/InitHeaderSearch.cpp: Add mingw-w64's include paths. MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------1.7.1.GIT" This is a multi-part message in MIME format. --------------1.7.1.GIT Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: 8bit --- lib/Frontend/InitHeaderSearch.cpp | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) --------------1.7.1.GIT Content-Type: text/x-patch; name="0002-lib-Frontend-InitHeaderSearch.cpp-Add-mingw-w64-.patch.txt" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0002-lib-Frontend-InitHeaderSearch.cpp-Add-mingw-w64-.patch.txt" diff --git a/lib/Frontend/InitHeaderSearch.cpp b/lib/Frontend/InitHeaderSearch.cpp index 39f30e5..cc9bb0c 100644 --- a/lib/Frontend/InitHeaderSearch.cpp +++ b/lib/Frontend/InitHeaderSearch.cpp @@ -566,6 +566,14 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple) { AddMinGWCPlusPlusIncludePaths("/usr/lib/gcc", "i686-pc-cygwin", "3.4.4"); break; case llvm::Triple::MinGW32: + // mingw-w64-20110207 + AddPath("c:/MinGW/include/c++/4.5.3", System, true, false, false); + AddPath("c:/MinGW/include/c++/4.5.3/x86_64-w64-mingw32", System, true, false, false); + AddPath("c:/MinGW/include/c++/4.5.3/backward", System, true, false, false); + // mingw-w64-20101129 + AddPath("c:/MinGW/include/c++/4.5.2", System, true, false, false); + AddPath("c:/MinGW/include/c++/4.5.2/x86_64-w64-mingw32", System, true, false, false); + AddPath("c:/MinGW/include/c++/4.5.2/backward", System, true, false, false); // Try gcc 4.5.0 AddMinGWCPlusPlusIncludePaths("c:/MinGW/lib/gcc", "mingw32", "4.5.0"); // Try gcc 4.4.0 --------------1.7.1.GIT-- From geek4civic at gmail.com Tue Feb 15 22:12:49 2011 From: geek4civic at gmail.com (NAKAMURA Takumi) Date: Wed, 16 Feb 2011 13:12:49 +0900 Subject: [llvm-commits] [PATCH][llvm][clang] Triple::{MinGW32|MinGW64} => Triple::MinGW In-Reply-To: <4D5A4C14.7010603@free.fr> References: <4D5A4924.6090407@free.fr> <4D5A4C14.7010603@free.fr> Message-ID: Duncan, Thank you to give me comments! On Tue, Feb 15, 2011 at 6:49 PM, Duncan Sands wrote: > if I understand right no project understands mingw64 except for LLVM, so you > are > going to remove mingw64. ?Also, other projects use "w64" rather than "pc" to > say > ... well, I'm not sure what this says, but presumably to say whatever > mingw64 > was trying to say; so you plan to teach LLVM about w64. ?Is that right? For now, I don't think recognition of -w64- would be needed to clang and llvm. I would propose to tweak -w64- to llvm::Triple if I needed one. ...Takumi From echristo at apple.com Tue Feb 15 22:50:12 2011 From: echristo at apple.com (Eric Christopher) Date: Wed, 16 Feb 2011 04:50:12 -0000 Subject: [llvm-commits] [llvm] r125651 - /llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Message-ID: <20110216045012.945012A6C12C@llvm.org> Author: echristo Date: Tue Feb 15 22:50:12 2011 New Revision: 125651 URL: http://llvm.org/viewvc/llvm-project?rev=125651&view=rev Log: Refactor zero folding slightly. Clean up todo. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp?rev=125651&r1=125650&r2=125651&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Tue Feb 15 22:50:12 2011 @@ -1518,6 +1518,22 @@ return SDValue(); } +// Since it may not be valid to emit a fold to zero for vector initializers +// check if we can before folding. +static SDValue tryFoldToZero(DebugLoc DL, const TargetLowering &TLI, EVT VT, + SelectionDAG &DAG, bool LegalOperations) { + if (!VT.isVector()) { + return DAG.getConstant(0, VT); + } else if (!LegalOperations || TLI.isOperationLegal(ISD::BUILD_VECTOR, VT)) { + // Produce a vector of zeros. + SDValue El = DAG.getConstant(0, VT.getVectorElementType()); + std::vector Ops(VT.getVectorNumElements(), El); + return DAG.getNode(ISD::BUILD_VECTOR, DL, VT, + &Ops[0], Ops.size()); + } + return SDValue(); +} + SDValue DAGCombiner::visitSUB(SDNode *N) { SDValue N0 = N->getOperand(0); SDValue N1 = N->getOperand(1); @@ -1533,17 +1549,8 @@ // fold (sub x, x) -> 0 // FIXME: Refactor this and xor and other similar operations together. - if (N0 == N1) { - if (!VT.isVector()) { - return DAG.getConstant(0, VT); - } else if (!LegalOperations || TLI.isOperationLegal(ISD::BUILD_VECTOR, VT)){ - // Produce a vector of zeros. - SDValue El = DAG.getConstant(0, VT.getVectorElementType()); - std::vector Ops(VT.getVectorNumElements(), El); - return DAG.getNode(ISD::BUILD_VECTOR, N->getDebugLoc(), VT, - &Ops[0], Ops.size()); - } - } + if (N0 == N1) + return tryFoldToZero(N->getDebugLoc(), TLI, VT, DAG, LegalOperations); // fold (sub c1, c2) -> c1-c2 if (N0C && N1C) return DAG.FoldConstantArithmetic(ISD::SUB, VT, N0C, N1C); @@ -2843,17 +2850,8 @@ N01C->getAPIntValue(), VT)); } // fold (xor x, x) -> 0 - if (N0 == N1) { - if (!VT.isVector()) { - return DAG.getConstant(0, VT); - } else if (!LegalOperations || TLI.isOperationLegal(ISD::BUILD_VECTOR, VT)){ - // Produce a vector of zeros. - SDValue El = DAG.getConstant(0, VT.getVectorElementType()); - std::vector Ops(VT.getVectorNumElements(), El); - return DAG.getNode(ISD::BUILD_VECTOR, N->getDebugLoc(), VT, - &Ops[0], Ops.size()); - } - } + if (N0 == N1) + return tryFoldToZero(N->getDebugLoc(), TLI, VT, DAG, LegalOperations); // Simplify: xor (op x...), (op y...) -> (op (xor x, y)) if (N0.getOpcode() == N1.getOpcode()) { From eli.friedman at gmail.com Wed Feb 16 01:17:44 2011 From: eli.friedman at gmail.com (Eli Friedman) Date: Wed, 16 Feb 2011 07:17:44 -0000 Subject: [llvm-commits] [llvm] r125658 - /llvm/trunk/lib/Target/README.txt Message-ID: <20110216071744.DB3342A6C12C@llvm.org> Author: efriedma Date: Wed Feb 16 01:17:44 2011 New Revision: 125658 URL: http://llvm.org/viewvc/llvm-project?rev=125658&view=rev Log: Update README entry. Modified: llvm/trunk/lib/Target/README.txt Modified: llvm/trunk/lib/Target/README.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/README.txt?rev=125658&r1=125657&r2=125658&view=diff ============================================================================== --- llvm/trunk/lib/Target/README.txt (original) +++ llvm/trunk/lib/Target/README.txt Wed Feb 16 01:17:44 2011 @@ -1783,13 +1783,12 @@ } Generated code: - addq %rcx, %rdx - movl $0, %eax - adcq $0, %rax - addq %r8, %rax - movq %rax, (%rdi) - movq %rdx, (%rsi) - ret + addq %rcx, %rdx + sbbq %rax, %rax + subq %rax, %r8 + movq %r8, (%rdi) + movq %rdx, (%rsi) + ret Expected code: addq %rcx, %rdx @@ -1798,12 +1797,6 @@ movq %rdx, (%rsi) ret -The generated SelectionDAG has an ADD of an ADDE, where both operands of the -ADDE are zero. Replacing one of the operands of the ADDE with the other operand -of the ADD, and replacing the ADD with the ADDE, should give the desired result. - -(That said, we are doing a lot better than gcc on this testcase. :) ) - //===---------------------------------------------------------------------===// Switch lowering generates less than ideal code for the following switch: From eli.friedman at gmail.com Wed Feb 16 01:18:19 2011 From: eli.friedman at gmail.com (Eli Friedman) Date: Wed, 16 Feb 2011 07:18:19 -0000 Subject: [llvm-commits] [llvm] r125659 - /llvm/trunk/lib/Target/README.txt Message-ID: <20110216071819.0B7792A6C12C@llvm.org> Author: efriedma Date: Wed Feb 16 01:18:18 2011 New Revision: 125659 URL: http://llvm.org/viewvc/llvm-project?rev=125659&view=rev Log: Remove outdated README entry. Modified: llvm/trunk/lib/Target/README.txt Modified: llvm/trunk/lib/Target/README.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/README.txt?rev=125659&r1=125658&r2=125659&view=diff ============================================================================== --- llvm/trunk/lib/Target/README.txt (original) +++ llvm/trunk/lib/Target/README.txt Wed Feb 16 01:18:18 2011 @@ -1840,23 +1840,7 @@ ret .LBB0_2: jmp foo # TAILCALL -//===---------------------------------------------------------------------===// -Given a branch where the two target blocks are identical ("ret i32 %b" in -both), simplifycfg will simplify them away. But not so for a switch statement: - -define i32 @f(i32 %a, i32 %b) nounwind readnone { -entry: - switch i32 %a, label %bb3 [ - i32 4, label %bb - i32 6, label %bb - ] -bb: ; preds = %entry, %entry - ret i32 %b - -bb3: ; preds = %entry - ret i32 %b -} //===---------------------------------------------------------------------===// We compile this: From eli.friedman at gmail.com Wed Feb 16 01:41:19 2011 From: eli.friedman at gmail.com (Eli Friedman) Date: Wed, 16 Feb 2011 07:41:19 -0000 Subject: [llvm-commits] [llvm] r125660 - /llvm/trunk/lib/Target/README.txt Message-ID: <20110216074119.D09682A6C12C@llvm.org> Author: efriedma Date: Wed Feb 16 01:41:19 2011 New Revision: 125660 URL: http://llvm.org/viewvc/llvm-project?rev=125660&view=rev Log: Remove outdated README entry. Modified: llvm/trunk/lib/Target/README.txt Modified: llvm/trunk/lib/Target/README.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/README.txt?rev=125660&r1=125659&r2=125660&view=diff ============================================================================== --- llvm/trunk/lib/Target/README.txt (original) +++ llvm/trunk/lib/Target/README.txt Wed Feb 16 01:41:19 2011 @@ -733,18 +733,6 @@ //===---------------------------------------------------------------------===// -We miss some instcombines for stuff like this: -void bar (void); -void foo (unsigned int a) { - /* This one is equivalent to a >= (3 << 2). */ - if ((a >> 2) >= 3) - bar (); -} - -A few other related ones are in GCC PR14753. - -//===---------------------------------------------------------------------===// - Divisibility by constant can be simplified (according to GCC PR12849) from being a mulhi to being a mul lo (cheaper). Testcase: From rafael.espindola at gmail.com Wed Feb 16 05:19:44 2011 From: rafael.espindola at gmail.com (Rafael Espindola) Date: Wed, 16 Feb 2011 11:19:44 -0000 Subject: [llvm-commits] [llvm] r125663 - /llvm/trunk/tools/gold/gold-plugin.cpp Message-ID: <20110216111944.5EE1D2A6C12C@llvm.org> Author: rafael Date: Wed Feb 16 05:19:44 2011 New Revision: 125663 URL: http://llvm.org/viewvc/llvm-project?rev=125663&view=rev Log: Add a debug obj-path option to make it easy to keep the .o produce by LTO. Modified: llvm/trunk/tools/gold/gold-plugin.cpp Modified: llvm/trunk/tools/gold/gold-plugin.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/gold/gold-plugin.cpp?rev=125663&r1=125662&r2=125663&view=diff ============================================================================== --- llvm/trunk/tools/gold/gold-plugin.cpp (original) +++ llvm/trunk/tools/gold/gold-plugin.cpp Wed Feb 16 05:19:44 2011 @@ -72,6 +72,7 @@ static bool generate_api_file = false; static generate_bc generate_bc_file = BC_NO; static std::string bc_path; + static std::string obj_path; static std::string as_path; static std::vector as_args; static std::vector pass_through; @@ -112,6 +113,8 @@ pass_through.push_back(item.str()); } else if (opt.startswith("mtriple=")) { triple = opt.substr(strlen("mtriple=")); + } else if (opt.startswith("obj-path=")) { + obj_path = opt.substr(strlen("obj-path=")); } else if (opt == "emit-llvm") { generate_bc_file = BC_ONLY; } else if (opt == "also-emit-llvm") { @@ -471,23 +474,29 @@ std::string ErrMsg; - sys::Path uniqueObjPath("/tmp/llvmgold.o"); - if (uniqueObjPath.createTemporaryFileOnDisk(true, &ErrMsg)) { - (*message)(LDPL_ERROR, "%s", ErrMsg.c_str()); - return LDPS_ERR; - } - tool_output_file objFile(uniqueObjPath.c_str(), ErrMsg, - raw_fd_ostream::F_Binary); - if (!ErrMsg.empty()) { - (*message)(LDPL_ERROR, "%s", ErrMsg.c_str()); - return LDPS_ERR; + const char *objPath; + if (!options::obj_path.empty()) { + objPath = options::obj_path.c_str(); + } else { + sys::Path uniqueObjPath("/tmp/llvmgold.o"); + if (uniqueObjPath.createTemporaryFileOnDisk(true, &ErrMsg)) { + (*message)(LDPL_ERROR, "%s", ErrMsg.c_str()); + return LDPS_ERR; + } + objPath = uniqueObjPath.c_str(); } + tool_output_file objFile(objPath, ErrMsg, + raw_fd_ostream::F_Binary); + if (!ErrMsg.empty()) { + (*message)(LDPL_ERROR, "%s", ErrMsg.c_str()); + return LDPS_ERR; + } objFile.os().write(buffer, bufsize); objFile.os().close(); if (objFile.os().has_error()) { (*message)(LDPL_ERROR, "Error writing output file '%s'", - uniqueObjPath.c_str()); + objPath); objFile.os().clear_error(); return LDPS_ERR; } @@ -495,9 +504,9 @@ lto_codegen_dispose(cg); - if ((*add_input_file)(uniqueObjPath.c_str()) != LDPS_OK) { + if ((*add_input_file)(objPath) != LDPS_OK) { (*message)(LDPL_ERROR, "Unable to add .o file to the link."); - (*message)(LDPL_ERROR, "File left behind in: %s", uniqueObjPath.c_str()); + (*message)(LDPL_ERROR, "File left behind in: %s", objPath); return LDPS_ERR; } @@ -525,7 +534,8 @@ } } - Cleanup.push_back(uniqueObjPath); + if (options::obj_path.empty()) + Cleanup.push_back(sys::Path(objPath)); return LDPS_OK; } From dmalyshev at accesssoftek.com Wed Feb 16 10:21:54 2011 From: dmalyshev at accesssoftek.com (Danil Malyshev) Date: Wed, 16 Feb 2011 08:21:54 -0800 Subject: [llvm-commits] Fix floating point numbers in tests on MinGW In-Reply-To: References: <6AE1604EE3EC5F4296C096518C6B77EE1774A4AA26@mail.accesssoftek.com> Message-ID: <6AE1604EE3EC5F4296C096518C6B77EE17DD2905F9@mail.accesssoftek.com> Hello, A week passed and nobody else replyed yet, so it seems we are the only two who cares of this issue. :) Defining PRINTF_EXPONENT_DIGITS env is the suggested way to make MinGW ANSI/POSIX compatible. This is not only about the case we are discussing, but in general, I'd like to have explicitly defined compatibility mode for all the tests running on MinGW. I understand that it does not fix issues with scientific notation in general. It seems that you need to follow up with your patch, since you feel strong for it. This patch does not block you or affect you on any way. Could you or somebody else apply my patch, please? I have attached it to this e-mail for convenience. Thank you, Danil -------------- next part -------------- A non-text attachment was scrubbed... Name: fix-scientific-02.diff Type: application/octet-stream Size: 519 bytes Desc: fix-scientific-02.diff Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110216/c65a53df/attachment.obj From stuart at apple.com Wed Feb 16 10:23:55 2011 From: stuart at apple.com (Stuart Hastings) Date: Wed, 16 Feb 2011 16:23:55 -0000 Subject: [llvm-commits] [llvm] r125665 - in /llvm/trunk: include/llvm/CodeGen/ lib/CodeGen/SelectionDAG/ lib/Target/Alpha/ lib/Target/PowerPC/ lib/Target/Sparc/ lib/Target/X86/ lib/Target/XCore/ Message-ID: <20110216162355.8C0D32A6C12C@llvm.org> Author: stuart Date: Wed Feb 16 10:23:55 2011 New Revision: 125665 URL: http://llvm.org/viewvc/llvm-project?rev=125665&view=rev Log: Swap VT and DebugLoc operands of getExtLoad() for consistency with other getNode() methods. Radar 9002173. Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAG.h llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp llvm/trunk/lib/Target/Alpha/AlphaISelLowering.cpp llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp llvm/trunk/lib/Target/Sparc/SparcISelLowering.cpp llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp llvm/trunk/lib/Target/X86/X86ISelLowering.cpp llvm/trunk/lib/Target/XCore/XCoreISelLowering.cpp Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAG.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAG.h?rev=125665&r1=125664&r2=125665&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/SelectionDAG.h (original) +++ llvm/trunk/include/llvm/CodeGen/SelectionDAG.h Wed Feb 16 10:23:55 2011 @@ -634,7 +634,7 @@ MachinePointerInfo PtrInfo, bool isVolatile, bool isNonTemporal, unsigned Alignment, const MDNode *TBAAInfo = 0); - SDValue getExtLoad(ISD::LoadExtType ExtType, EVT VT, DebugLoc dl, + SDValue getExtLoad(ISD::LoadExtType ExtType, DebugLoc dl, EVT VT, SDValue Chain, SDValue Ptr, MachinePointerInfo PtrInfo, EVT MemVT, bool isVolatile, bool isNonTemporal, unsigned Alignment, Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp?rev=125665&r1=125664&r2=125665&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Wed Feb 16 10:23:55 2011 @@ -674,7 +674,7 @@ : ISD::EXTLOAD) : LD->getExtensionType(); Replace = true; - return DAG.getExtLoad(ExtType, PVT, dl, + return DAG.getExtLoad(ExtType, dl, PVT, LD->getChain(), LD->getBasePtr(), LD->getPointerInfo(), MemVT, LD->isVolatile(), @@ -897,7 +897,7 @@ ? (TLI.isLoadExtLegal(ISD::ZEXTLOAD, MemVT) ? ISD::ZEXTLOAD : ISD::EXTLOAD) : LD->getExtensionType(); - SDValue NewLD = DAG.getExtLoad(ExtType, PVT, dl, + SDValue NewLD = DAG.getExtLoad(ExtType, dl, PVT, LD->getChain(), LD->getBasePtr(), LD->getPointerInfo(), MemVT, LD->isVolatile(), @@ -2327,7 +2327,7 @@ BitWidth - MemVT.getScalarType().getSizeInBits())) && ((!LegalOperations && !LN0->isVolatile()) || TLI.isLoadExtLegal(ISD::ZEXTLOAD, MemVT))) { - SDValue ExtLoad = DAG.getExtLoad(ISD::ZEXTLOAD, VT, N0.getDebugLoc(), + SDValue ExtLoad = DAG.getExtLoad(ISD::ZEXTLOAD, N0.getDebugLoc(), VT, LN0->getChain(), LN0->getBasePtr(), LN0->getPointerInfo(), MemVT, LN0->isVolatile(), LN0->isNonTemporal(), @@ -2349,7 +2349,7 @@ BitWidth - MemVT.getScalarType().getSizeInBits())) && ((!LegalOperations && !LN0->isVolatile()) || TLI.isLoadExtLegal(ISD::ZEXTLOAD, MemVT))) { - SDValue ExtLoad = DAG.getExtLoad(ISD::ZEXTLOAD, VT, N0.getDebugLoc(), + SDValue ExtLoad = DAG.getExtLoad(ISD::ZEXTLOAD, N0.getDebugLoc(), VT, LN0->getChain(), LN0->getBasePtr(), LN0->getPointerInfo(), MemVT, @@ -2383,7 +2383,7 @@ EVT LoadResultTy = HasAnyExt ? LN0->getValueType(0) : VT; SDValue NewLoad = - DAG.getExtLoad(ISD::ZEXTLOAD, LoadResultTy, LN0->getDebugLoc(), + DAG.getExtLoad(ISD::ZEXTLOAD, LN0->getDebugLoc(), LoadResultTy, LN0->getChain(), LN0->getBasePtr(), LN0->getPointerInfo(), ExtVT, LN0->isVolatile(), LN0->isNonTemporal(), @@ -2419,7 +2419,7 @@ EVT LoadResultTy = HasAnyExt ? LN0->getValueType(0) : VT; SDValue Load = - DAG.getExtLoad(ISD::ZEXTLOAD, LoadResultTy, LN0->getDebugLoc(), + DAG.getExtLoad(ISD::ZEXTLOAD, LN0->getDebugLoc(), LoadResultTy, LN0->getChain(), NewPtr, LN0->getPointerInfo(), ExtVT, LN0->isVolatile(), LN0->isNonTemporal(), @@ -3694,7 +3694,7 @@ DoXform = ExtendUsesToFormExtLoad(N, N0, ISD::SIGN_EXTEND, SetCCs, TLI); if (DoXform) { LoadSDNode *LN0 = cast(N0); - SDValue ExtLoad = DAG.getExtLoad(ISD::SEXTLOAD, VT, N->getDebugLoc(), + SDValue ExtLoad = DAG.getExtLoad(ISD::SEXTLOAD, N->getDebugLoc(), VT, LN0->getChain(), LN0->getBasePtr(), LN0->getPointerInfo(), N0.getValueType(), @@ -3737,7 +3737,7 @@ EVT MemVT = LN0->getMemoryVT(); if ((!LegalOperations && !LN0->isVolatile()) || TLI.isLoadExtLegal(ISD::SEXTLOAD, MemVT)) { - SDValue ExtLoad = DAG.getExtLoad(ISD::SEXTLOAD, VT, N->getDebugLoc(), + SDValue ExtLoad = DAG.getExtLoad(ISD::SEXTLOAD, N->getDebugLoc(), VT, LN0->getChain(), LN0->getBasePtr(), LN0->getPointerInfo(), MemVT, @@ -3896,7 +3896,7 @@ DoXform = ExtendUsesToFormExtLoad(N, N0, ISD::ZERO_EXTEND, SetCCs, TLI); if (DoXform) { LoadSDNode *LN0 = cast(N0); - SDValue ExtLoad = DAG.getExtLoad(ISD::ZEXTLOAD, VT, N->getDebugLoc(), + SDValue ExtLoad = DAG.getExtLoad(ISD::ZEXTLOAD, N->getDebugLoc(), VT, LN0->getChain(), LN0->getBasePtr(), LN0->getPointerInfo(), N0.getValueType(), @@ -3939,7 +3939,7 @@ EVT MemVT = LN0->getMemoryVT(); if ((!LegalOperations && !LN0->isVolatile()) || TLI.isLoadExtLegal(ISD::ZEXTLOAD, MemVT)) { - SDValue ExtLoad = DAG.getExtLoad(ISD::ZEXTLOAD, VT, N->getDebugLoc(), + SDValue ExtLoad = DAG.getExtLoad(ISD::ZEXTLOAD, N->getDebugLoc(), VT, LN0->getChain(), LN0->getBasePtr(), LN0->getPointerInfo(), MemVT, @@ -4103,7 +4103,7 @@ DoXform = ExtendUsesToFormExtLoad(N, N0, ISD::ANY_EXTEND, SetCCs, TLI); if (DoXform) { LoadSDNode *LN0 = cast(N0); - SDValue ExtLoad = DAG.getExtLoad(ISD::EXTLOAD, VT, N->getDebugLoc(), + SDValue ExtLoad = DAG.getExtLoad(ISD::EXTLOAD, N->getDebugLoc(), VT, LN0->getChain(), LN0->getBasePtr(), LN0->getPointerInfo(), N0.getValueType(), @@ -4146,9 +4146,8 @@ N0.hasOneUse()) { LoadSDNode *LN0 = cast(N0); EVT MemVT = LN0->getMemoryVT(); - SDValue ExtLoad = DAG.getExtLoad(LN0->getExtensionType(), VT, - N->getDebugLoc(), - LN0->getChain(), LN0->getBasePtr(), + SDValue ExtLoad = DAG.getExtLoad(LN0->getExtensionType(), N->getDebugLoc(), + VT, LN0->getChain(), LN0->getBasePtr(), LN0->getPointerInfo(), MemVT, LN0->isVolatile(), LN0->isNonTemporal(), LN0->getAlignment()); @@ -4350,7 +4349,7 @@ LN0->getPointerInfo().getWithOffset(PtrOff), LN0->isVolatile(), LN0->isNonTemporal(), NewAlign); else - Load = DAG.getExtLoad(ExtType, VT, N0.getDebugLoc(), LN0->getChain(),NewPtr, + Load = DAG.getExtLoad(ExtType, N0.getDebugLoc(), VT, LN0->getChain(),NewPtr, LN0->getPointerInfo().getWithOffset(PtrOff), ExtVT, LN0->isVolatile(), LN0->isNonTemporal(), NewAlign); @@ -4444,7 +4443,7 @@ ((!LegalOperations && !cast(N0)->isVolatile()) || TLI.isLoadExtLegal(ISD::SEXTLOAD, EVT))) { LoadSDNode *LN0 = cast(N0); - SDValue ExtLoad = DAG.getExtLoad(ISD::SEXTLOAD, VT, N->getDebugLoc(), + SDValue ExtLoad = DAG.getExtLoad(ISD::SEXTLOAD, N->getDebugLoc(), VT, LN0->getChain(), LN0->getBasePtr(), LN0->getPointerInfo(), EVT, @@ -4461,7 +4460,7 @@ ((!LegalOperations && !cast(N0)->isVolatile()) || TLI.isLoadExtLegal(ISD::SEXTLOAD, EVT))) { LoadSDNode *LN0 = cast(N0); - SDValue ExtLoad = DAG.getExtLoad(ISD::SEXTLOAD, VT, N->getDebugLoc(), + SDValue ExtLoad = DAG.getExtLoad(ISD::SEXTLOAD, N->getDebugLoc(), VT, LN0->getChain(), LN0->getBasePtr(), LN0->getPointerInfo(), EVT, @@ -5233,7 +5232,7 @@ ((!LegalOperations && !cast(N0)->isVolatile()) || TLI.isLoadExtLegal(ISD::EXTLOAD, N0.getValueType()))) { LoadSDNode *LN0 = cast(N0); - SDValue ExtLoad = DAG.getExtLoad(ISD::EXTLOAD, VT, N->getDebugLoc(), + SDValue ExtLoad = DAG.getExtLoad(ISD::EXTLOAD, N->getDebugLoc(), VT, LN0->getChain(), LN0->getBasePtr(), LN0->getPointerInfo(), N0.getValueType(), @@ -5821,8 +5820,8 @@ if (OptLevel != CodeGenOpt::None && LD->isUnindexed()) { if (unsigned Align = DAG.InferPtrAlignment(Ptr)) { if (Align > LD->getAlignment()) - return DAG.getExtLoad(LD->getExtensionType(), LD->getValueType(0), - N->getDebugLoc(), + return DAG.getExtLoad(LD->getExtensionType(), N->getDebugLoc(), + LD->getValueType(0), Chain, Ptr, LD->getPointerInfo(), LD->getMemoryVT(), LD->isVolatile(), LD->isNonTemporal(), Align); @@ -5844,8 +5843,8 @@ LD->isVolatile(), LD->isNonTemporal(), LD->getAlignment()); } else { - ReplLoad = DAG.getExtLoad(LD->getExtensionType(), LD->getValueType(0), - LD->getDebugLoc(), + ReplLoad = DAG.getExtLoad(LD->getExtensionType(), LD->getDebugLoc(), + LD->getValueType(0), BetterChain, Ptr, LD->getPointerInfo(), LD->getMemoryVT(), LD->isVolatile(), @@ -6970,8 +6969,8 @@ } else { Load = DAG.getExtLoad(LLD->getExtensionType() == ISD::EXTLOAD ? RLD->getExtensionType() : LLD->getExtensionType(), - TheSelect->getValueType(0), TheSelect->getDebugLoc(), + TheSelect->getValueType(0), // FIXME: Discards pointer info. LLD->getChain(), Addr, MachinePointerInfo(), LLD->getMemoryVT(), LLD->isVolatile(), Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp?rev=125665&r1=125664&r2=125665&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Wed Feb 16 10:23:55 2011 @@ -394,7 +394,7 @@ SDValue CPIdx = DAG.getConstantPool(LLVMC, TLI.getPointerTy()); unsigned Alignment = cast(CPIdx)->getAlignment(); if (Extend) - return DAG.getExtLoad(ISD::EXTLOAD, OrigVT, dl, + return DAG.getExtLoad(ISD::EXTLOAD, dl, OrigVT, DAG.getEntryNode(), CPIdx, MachinePointerInfo::getConstantPool(), VT, false, false, Alignment); @@ -471,7 +471,7 @@ 8 * (StoredBytes - Offset)); // Load from the stack slot. - SDValue Load = DAG.getExtLoad(ISD::EXTLOAD, RegVT, dl, Store, StackPtr, + SDValue Load = DAG.getExtLoad(ISD::EXTLOAD, dl, RegVT, Store, StackPtr, MachinePointerInfo(), MemVT, false, false, 0); @@ -575,7 +575,7 @@ // The last copy may be partial. Do an extending load. EVT MemVT = EVT::getIntegerVT(*DAG.getContext(), 8 * (LoadedBytes - Offset)); - SDValue Load = DAG.getExtLoad(ISD::EXTLOAD, RegVT, dl, Chain, Ptr, + SDValue Load = DAG.getExtLoad(ISD::EXTLOAD, dl, RegVT, Chain, Ptr, LD->getPointerInfo().getWithOffset(Offset), MemVT, LD->isVolatile(), LD->isNonTemporal(), @@ -592,7 +592,7 @@ Stores.size()); // Finally, perform the original load only redirected to the stack slot. - Load = DAG.getExtLoad(LD->getExtensionType(), VT, dl, TF, StackBase, + Load = DAG.getExtLoad(LD->getExtensionType(), dl, VT, TF, StackBase, MachinePointerInfo(), LoadedVT, false, false, 0); // Callers expect a MERGE_VALUES node. @@ -620,22 +620,22 @@ // Load the value in two parts SDValue Lo, Hi; if (TLI.isLittleEndian()) { - Lo = DAG.getExtLoad(ISD::ZEXTLOAD, VT, dl, Chain, Ptr, LD->getPointerInfo(), + Lo = DAG.getExtLoad(ISD::ZEXTLOAD, dl, VT, Chain, Ptr, LD->getPointerInfo(), NewLoadedVT, LD->isVolatile(), LD->isNonTemporal(), Alignment); Ptr = DAG.getNode(ISD::ADD, dl, Ptr.getValueType(), Ptr, DAG.getConstant(IncrementSize, TLI.getPointerTy())); - Hi = DAG.getExtLoad(HiExtType, VT, dl, Chain, Ptr, + Hi = DAG.getExtLoad(HiExtType, dl, VT, Chain, Ptr, LD->getPointerInfo().getWithOffset(IncrementSize), NewLoadedVT, LD->isVolatile(), LD->isNonTemporal(), MinAlign(Alignment,IncrementSize)); } else { - Hi = DAG.getExtLoad(HiExtType, VT, dl, Chain, Ptr, LD->getPointerInfo(), + Hi = DAG.getExtLoad(HiExtType, dl, VT, Chain, Ptr, LD->getPointerInfo(), NewLoadedVT, LD->isVolatile(), LD->isNonTemporal(), Alignment); Ptr = DAG.getNode(ISD::ADD, dl, Ptr.getValueType(), Ptr, DAG.getConstant(IncrementSize, TLI.getPointerTy())); - Lo = DAG.getExtLoad(ISD::ZEXTLOAD, VT, dl, Chain, Ptr, + Lo = DAG.getExtLoad(ISD::ZEXTLOAD, dl, VT, Chain, Ptr, LD->getPointerInfo().getWithOffset(IncrementSize), NewLoadedVT, LD->isVolatile(), LD->isNonTemporal(), MinAlign(Alignment,IncrementSize)); @@ -1204,7 +1204,7 @@ ISD::LoadExtType NewExtType = ExtType == ISD::ZEXTLOAD ? ISD::ZEXTLOAD : ISD::EXTLOAD; - Result = DAG.getExtLoad(NewExtType, Node->getValueType(0), dl, + Result = DAG.getExtLoad(NewExtType, dl, Node->getValueType(0), Tmp1, Tmp2, LD->getPointerInfo(), NVT, isVolatile, isNonTemporal, Alignment); @@ -1240,7 +1240,7 @@ if (TLI.isLittleEndian()) { // EXTLOAD:i24 -> ZEXTLOAD:i16 | (shl EXTLOAD at +2:i8, 16) // Load the bottom RoundWidth bits. - Lo = DAG.getExtLoad(ISD::ZEXTLOAD, Node->getValueType(0), dl, + Lo = DAG.getExtLoad(ISD::ZEXTLOAD, dl, Node->getValueType(0), Tmp1, Tmp2, LD->getPointerInfo(), RoundVT, isVolatile, isNonTemporal, Alignment); @@ -1249,7 +1249,7 @@ IncrementSize = RoundWidth / 8; Tmp2 = DAG.getNode(ISD::ADD, dl, Tmp2.getValueType(), Tmp2, DAG.getIntPtrConstant(IncrementSize)); - Hi = DAG.getExtLoad(ExtType, Node->getValueType(0), dl, Tmp1, Tmp2, + Hi = DAG.getExtLoad(ExtType, dl, Node->getValueType(0), Tmp1, Tmp2, LD->getPointerInfo().getWithOffset(IncrementSize), ExtraVT, isVolatile, isNonTemporal, MinAlign(Alignment, IncrementSize)); @@ -1269,7 +1269,7 @@ // Big endian - avoid unaligned loads. // EXTLOAD:i24 -> (shl EXTLOAD:i16, 8) | ZEXTLOAD at +2:i8 // Load the top RoundWidth bits. - Hi = DAG.getExtLoad(ExtType, Node->getValueType(0), dl, Tmp1, Tmp2, + Hi = DAG.getExtLoad(ExtType, dl, Node->getValueType(0), Tmp1, Tmp2, LD->getPointerInfo(), RoundVT, isVolatile, isNonTemporal, Alignment); @@ -1278,7 +1278,7 @@ Tmp2 = DAG.getNode(ISD::ADD, dl, Tmp2.getValueType(), Tmp2, DAG.getIntPtrConstant(IncrementSize)); Lo = DAG.getExtLoad(ISD::ZEXTLOAD, - Node->getValueType(0), dl, Tmp1, Tmp2, + dl, Node->getValueType(0), Tmp1, Tmp2, LD->getPointerInfo().getWithOffset(IncrementSize), ExtraVT, isVolatile, isNonTemporal, MinAlign(Alignment, IncrementSize)); @@ -1365,7 +1365,7 @@ "EXTLOAD should always be supported!"); // Turn the unsupported load into an EXTLOAD followed by an explicit // zero/sign extend inreg. - Result = DAG.getExtLoad(ISD::EXTLOAD, Node->getValueType(0), dl, + Result = DAG.getExtLoad(ISD::EXTLOAD, dl, Node->getValueType(0), Tmp1, Tmp2, LD->getPointerInfo(), SrcVT, LD->isVolatile(), LD->isNonTemporal(), LD->getAlignment()); @@ -1580,7 +1580,7 @@ if (Op.getValueType().isVector()) return DAG.getLoad(Op.getValueType(), dl, Ch, StackPtr,MachinePointerInfo(), false, false, 0); - return DAG.getExtLoad(ISD::EXTLOAD, Op.getValueType(), dl, Ch, StackPtr, + return DAG.getExtLoad(ISD::EXTLOAD, dl, Op.getValueType(), Ch, StackPtr, MachinePointerInfo(), Vec.getValueType().getVectorElementType(), false, false, 0); @@ -1861,7 +1861,7 @@ false, false, DestAlign); assert(SlotSize < DestSize && "Unknown extension!"); - return DAG.getExtLoad(ISD::EXTLOAD, DestVT, dl, Store, FIPtr, + return DAG.getExtLoad(ISD::EXTLOAD, dl, DestVT, Store, FIPtr, PtrInfo, SlotVT, false, false, DestAlign); } @@ -2288,7 +2288,7 @@ false, false, Alignment); else { FudgeInReg = - LegalizeOp(DAG.getExtLoad(ISD::EXTLOAD, DestVT, dl, + LegalizeOp(DAG.getExtLoad(ISD::EXTLOAD, dl, DestVT, DAG.getEntryNode(), CPIdx, MachinePointerInfo::getConstantPool(), MVT::f32, false, false, Alignment)); @@ -3318,7 +3318,7 @@ SDValue Addr = DAG.getNode(ISD::ADD, dl, PTy, Index, Table); EVT MemVT = EVT::getIntegerVT(*DAG.getContext(), EntrySize * 8); - SDValue LD = DAG.getExtLoad(ISD::SEXTLOAD, PTy, dl, Chain, Addr, + SDValue LD = DAG.getExtLoad(ISD::SEXTLOAD, dl, PTy, Chain, Addr, MachinePointerInfo::getJumpTable(), MemVT, false, false, 0); Addr = LD; Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp?rev=125665&r1=125664&r2=125665&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp Wed Feb 16 10:23:55 2011 @@ -1110,7 +1110,7 @@ assert(NVT.isByteSized() && "Expanded type not byte sized!"); assert(LD->getMemoryVT().bitsLE(NVT) && "Float type not round?"); - Hi = DAG.getExtLoad(LD->getExtensionType(), NVT, dl, Chain, Ptr, + Hi = DAG.getExtLoad(LD->getExtensionType(), dl, NVT, Chain, Ptr, LD->getPointerInfo(), LD->getMemoryVT(), LD->isVolatile(), LD->isNonTemporal(), LD->getAlignment()); Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp?rev=125665&r1=125664&r2=125665&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Wed Feb 16 10:23:55 2011 @@ -370,7 +370,7 @@ ISD::LoadExtType ExtType = ISD::isNON_EXTLoad(N) ? ISD::EXTLOAD : N->getExtensionType(); DebugLoc dl = N->getDebugLoc(); - SDValue Res = DAG.getExtLoad(ExtType, NVT, dl, N->getChain(), N->getBasePtr(), + SDValue Res = DAG.getExtLoad(ExtType, dl, NVT, N->getChain(), N->getBasePtr(), N->getPointerInfo(), N->getMemoryVT(), N->isVolatile(), N->isNonTemporal(), N->getAlignment()); @@ -1682,7 +1682,7 @@ if (N->getMemoryVT().bitsLE(NVT)) { EVT MemVT = N->getMemoryVT(); - Lo = DAG.getExtLoad(ExtType, NVT, dl, Ch, Ptr, N->getPointerInfo(), + Lo = DAG.getExtLoad(ExtType, dl, NVT, Ch, Ptr, N->getPointerInfo(), MemVT, isVolatile, isNonTemporal, Alignment); // Remember the chain. @@ -1715,7 +1715,7 @@ unsigned IncrementSize = NVT.getSizeInBits()/8; Ptr = DAG.getNode(ISD::ADD, dl, Ptr.getValueType(), Ptr, DAG.getIntPtrConstant(IncrementSize)); - Hi = DAG.getExtLoad(ExtType, NVT, dl, Ch, Ptr, + Hi = DAG.getExtLoad(ExtType, dl, NVT, Ch, Ptr, N->getPointerInfo().getWithOffset(IncrementSize), NEVT, isVolatile, isNonTemporal, MinAlign(Alignment, IncrementSize)); @@ -1733,7 +1733,7 @@ unsigned ExcessBits = (EBytes - IncrementSize)*8; // Load both the high bits and maybe some of the low bits. - Hi = DAG.getExtLoad(ExtType, NVT, dl, Ch, Ptr, N->getPointerInfo(), + Hi = DAG.getExtLoad(ExtType, dl, NVT, Ch, Ptr, N->getPointerInfo(), EVT::getIntegerVT(*DAG.getContext(), MemVT.getSizeInBits() - ExcessBits), isVolatile, isNonTemporal, Alignment); @@ -1742,7 +1742,7 @@ Ptr = DAG.getNode(ISD::ADD, dl, Ptr.getValueType(), Ptr, DAG.getIntPtrConstant(IncrementSize)); // Load the rest of the low bits. - Lo = DAG.getExtLoad(ISD::ZEXTLOAD, NVT, dl, Ch, Ptr, + Lo = DAG.getExtLoad(ISD::ZEXTLOAD, dl, NVT, Ch, Ptr, N->getPointerInfo().getWithOffset(IncrementSize), EVT::getIntegerVT(*DAG.getContext(), ExcessBits), isVolatile, isNonTemporal, @@ -2632,7 +2632,7 @@ // Load the value out, extending it from f32 to the destination float type. // FIXME: Avoid the extend by constructing the right constant pool? - SDValue Fudge = DAG.getExtLoad(ISD::EXTLOAD, DstVT, dl, DAG.getEntryNode(), + SDValue Fudge = DAG.getExtLoad(ISD::EXTLOAD, dl, DstVT, DAG.getEntryNode(), FudgePtr, MachinePointerInfo::getConstantPool(), MVT::f32, Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp?rev=125665&r1=125664&r2=125665&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp Wed Feb 16 10:23:55 2011 @@ -1103,7 +1103,7 @@ // Load back the required element. StackPtr = GetVectorElementPointer(StackPtr, EltVT, Idx); - return DAG.getExtLoad(ISD::EXTLOAD, N->getValueType(0), dl, Store, StackPtr, + return DAG.getExtLoad(ISD::EXTLOAD, dl, N->getValueType(0), Store, StackPtr, MachinePointerInfo(), EltVT, false, false, 0); } @@ -2387,7 +2387,7 @@ unsigned WidenNumElts = WidenVT.getVectorNumElements(); SmallVector Ops(WidenNumElts); unsigned Increment = LdEltVT.getSizeInBits() / 8; - Ops[0] = DAG.getExtLoad(ExtType, EltVT, dl, Chain, BasePtr, + Ops[0] = DAG.getExtLoad(ExtType, dl, EltVT, Chain, BasePtr, LD->getPointerInfo(), LdEltVT, isVolatile, isNonTemporal, Align); LdChain.push_back(Ops[0].getValue(1)); @@ -2395,7 +2395,7 @@ for (i=1; i < NumElts; ++i, Offset += Increment) { SDValue NewBasePtr = DAG.getNode(ISD::ADD, dl, BasePtr.getValueType(), BasePtr, DAG.getIntPtrConstant(Offset)); - Ops[i] = DAG.getExtLoad(ExtType, EltVT, dl, Chain, NewBasePtr, + Ops[i] = DAG.getExtLoad(ExtType, dl, EltVT, Chain, NewBasePtr, LD->getPointerInfo().getWithOffset(Offset), LdEltVT, isVolatile, isNonTemporal, Align); LdChain.push_back(Ops[i].getValue(1)); Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=125665&r1=125664&r2=125665&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Wed Feb 16 10:23:55 2011 @@ -3462,7 +3462,7 @@ // FIXME does the case above also need this? EVT NVT = TLI.getTypeToTransformTo(*DAG.getContext(), VT); assert(NVT.bitsGE(VT)); - Value = DAG.getExtLoad(ISD::EXTLOAD, NVT, dl, Chain, + Value = DAG.getExtLoad(ISD::EXTLOAD, dl, NVT, Chain, getMemBasePlusOffset(Src, SrcOff, DAG), SrcPtrInfo.getWithOffset(SrcOff), VT, isVol, false, MinAlign(SrcAlign, SrcOff)); @@ -4113,7 +4113,7 @@ PtrInfo, VT, isVolatile, isNonTemporal, Alignment, TBAAInfo); } -SDValue SelectionDAG::getExtLoad(ISD::LoadExtType ExtType, EVT VT, DebugLoc dl, +SDValue SelectionDAG::getExtLoad(ISD::LoadExtType ExtType, DebugLoc dl, EVT VT, SDValue Chain, SDValue Ptr, MachinePointerInfo PtrInfo, EVT MemVT, bool isVolatile, bool isNonTemporal, Modified: llvm/trunk/lib/Target/Alpha/AlphaISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Alpha/AlphaISelLowering.cpp?rev=125665&r1=125664&r2=125665&view=diff ============================================================================== --- llvm/trunk/lib/Target/Alpha/AlphaISelLowering.cpp (original) +++ llvm/trunk/lib/Target/Alpha/AlphaISelLowering.cpp Wed Feb 16 10:23:55 2011 @@ -542,7 +542,7 @@ false, false, 0); SDValue Tmp = DAG.getNode(ISD::ADD, dl, MVT::i64, VAListP, DAG.getConstant(8, MVT::i64)); - SDValue Offset = DAG.getExtLoad(ISD::SEXTLOAD, MVT::i64, dl, Base.getValue(1), + SDValue Offset = DAG.getExtLoad(ISD::SEXTLOAD, dl, MVT::i64, Base.getValue(1), Tmp, MachinePointerInfo(), MVT::i32, false, false, 0); DataPtr = DAG.getNode(ISD::ADD, dl, MVT::i64, Base, Offset); @@ -709,7 +709,7 @@ SDValue Result; if (Op.getValueType() == MVT::i32) - Result = DAG.getExtLoad(ISD::SEXTLOAD, MVT::i64, dl, Chain, DataPtr, + Result = DAG.getExtLoad(ISD::SEXTLOAD, dl, MVT::i64, Chain, DataPtr, MachinePointerInfo(), MVT::i32, false, false, 0); else Result = DAG.getLoad(Op.getValueType(), dl, Chain, DataPtr, @@ -732,7 +732,7 @@ false, false, 0); SDValue NP = DAG.getNode(ISD::ADD, dl, MVT::i64, SrcP, DAG.getConstant(8, MVT::i64)); - Val = DAG.getExtLoad(ISD::SEXTLOAD, MVT::i64, dl, Result, + Val = DAG.getExtLoad(ISD::SEXTLOAD, dl, MVT::i64, Result, NP, MachinePointerInfo(), MVT::i32, false, false, 0); SDValue NPD = DAG.getNode(ISD::ADD, dl, MVT::i64, DestP, DAG.getConstant(8, MVT::i64)); Modified: llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp?rev=125665&r1=125664&r2=125665&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp (original) +++ llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp Wed Feb 16 10:23:55 2011 @@ -3050,7 +3050,7 @@ // Everything else is passed left-justified. EVT VT = (Size==1) ? MVT::i8 : MVT::i16; if (GPR_idx != NumGPRs) { - SDValue Load = DAG.getExtLoad(ISD::EXTLOAD, PtrVT, dl, Chain, Arg, + SDValue Load = DAG.getExtLoad(ISD::EXTLOAD, dl, PtrVT, Chain, Arg, MachinePointerInfo(), VT, false, false, 0); MemOpChains.push_back(Load.getValue(1)); Modified: llvm/trunk/lib/Target/Sparc/SparcISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcISelLowering.cpp?rev=125665&r1=125664&r2=125665&view=diff ============================================================================== --- llvm/trunk/lib/Target/Sparc/SparcISelLowering.cpp (original) +++ llvm/trunk/lib/Target/Sparc/SparcISelLowering.cpp Wed Feb 16 10:23:55 2011 @@ -274,7 +274,7 @@ unsigned Offset = 4-std::max(1U, VA.getValVT().getSizeInBits()/8); FIPtr = DAG.getNode(ISD::ADD, dl, MVT::i32, FIPtr, DAG.getConstant(Offset, MVT::i32)); - Load = DAG.getExtLoad(LoadOp, MVT::i32, dl, Chain, FIPtr, + Load = DAG.getExtLoad(LoadOp, dl, MVT::i32, Chain, FIPtr, MachinePointerInfo(), VA.getValVT(), false, false,0); Load = DAG.getNode(ISD::TRUNCATE, dl, VA.getValVT(), Load); Modified: llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp?rev=125665&r1=125664&r2=125665&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp Wed Feb 16 10:23:55 2011 @@ -506,7 +506,7 @@ N->getOperand(0), MemTmp, MachinePointerInfo(), MemVT, false, false, 0); - SDValue Result = CurDAG->getExtLoad(ISD::EXTLOAD, DstVT, dl, Store, MemTmp, + SDValue Result = CurDAG->getExtLoad(ISD::EXTLOAD, dl, DstVT, Store, MemTmp, MachinePointerInfo(), MemVT, false, false, 0); Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=125665&r1=125664&r2=125665&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Wed Feb 16 10:23:55 2011 @@ -6889,7 +6889,7 @@ // Load the value out, extending it from f32 to f80. // FIXME: Avoid the extend by constructing the right constant pool? - SDValue Fudge = DAG.getExtLoad(ISD::EXTLOAD, MVT::f80, dl, DAG.getEntryNode(), + SDValue Fudge = DAG.getExtLoad(ISD::EXTLOAD, dl, MVT::f80, DAG.getEntryNode(), FudgePtr, MachinePointerInfo::getConstantPool(), MVT::f32, false, false, 4); // Extend everything to 80 bits to force it to be done on x87. Modified: llvm/trunk/lib/Target/XCore/XCoreISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/XCoreISelLowering.cpp?rev=125665&r1=125664&r2=125665&view=diff ============================================================================== --- llvm/trunk/lib/Target/XCore/XCoreISelLowering.cpp (original) +++ llvm/trunk/lib/Target/XCore/XCoreISelLowering.cpp Wed Feb 16 10:23:55 2011 @@ -455,12 +455,12 @@ } if (LD->getAlignment() == 2) { - SDValue Low = DAG.getExtLoad(ISD::ZEXTLOAD, MVT::i32, DL, Chain, + SDValue Low = DAG.getExtLoad(ISD::ZEXTLOAD, DL, MVT::i32, Chain, BasePtr, LD->getPointerInfo(), MVT::i16, LD->isVolatile(), LD->isNonTemporal(), 2); SDValue HighAddr = DAG.getNode(ISD::ADD, DL, MVT::i32, BasePtr, DAG.getConstant(2, MVT::i32)); - SDValue High = DAG.getExtLoad(ISD::EXTLOAD, MVT::i32, DL, Chain, + SDValue High = DAG.getExtLoad(ISD::EXTLOAD, DL, MVT::i32, Chain, HighAddr, LD->getPointerInfo().getWithOffset(2), MVT::i16, LD->isVolatile(), From baldrick at free.fr Wed Feb 16 11:09:42 2011 From: baldrick at free.fr (Duncan Sands) Date: Wed, 16 Feb 2011 17:09:42 -0000 Subject: [llvm-commits] [dragonegg] r125666 - /dragonegg/trunk/llvm-backend.cpp Message-ID: <20110216170943.019E52A6C12C@llvm.org> Author: baldrick Date: Wed Feb 16 11:09:42 2011 New Revision: 125666 URL: http://llvm.org/viewvc/llvm-project?rev=125666&view=rev Log: Recent GCC has does an (undocumented) optimization by which it generates "same body aliases" rather than multiple copies of the same function. If the aliasee has "extern inline" semantics then GCC discards it along with all of its aliases after running the inliner. We were creating a function with AvailableExternally linkage for the "extern inline" function and weak aliases for the same body aliases. At LLVM codegen time the aliasee would be discarded, leading to unresolved external references for the aliases. Solve this by arranging for all uses of the aliases to be replaced with the corresponding use of the aliasee, so when the aliasee is discarded in effect so are all the aliases. This fixes the OpenCV version 2.0 build, reported broken by sabaliauskas g. (gs5g08) on the mailing list. Modified: dragonegg/trunk/llvm-backend.cpp Modified: dragonegg/trunk/llvm-backend.cpp URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/llvm-backend.cpp?rev=125666&r1=125665&r2=125666&view=diff ============================================================================== --- dragonegg/trunk/llvm-backend.cpp (original) +++ dragonegg/trunk/llvm-backend.cpp Wed Feb 16 11:09:42 2011 @@ -1859,7 +1859,25 @@ if (errorcount || sorrycount) return; // Do not process broken code. - emit_alias(alias->decl, alias->thunk.alias); + // If the target is not "extern inline" then output an ordinary alias. + tree target = alias->thunk.alias; + if (!DECL_EXTERNAL(target)) { + emit_alias(alias->decl, target); + return; + } + + // Same body aliases have the property that if the body of the aliasee is not + // output then neither are the aliases. To arrange this for "extern inline" + // functions, which have AvailableExternally linkage in LLVM, make all users + // of the alias directly use the aliasee instead. + GlobalValue *Alias = cast(DECL_LLVM(alias->decl)); + GlobalValue *Aliasee = cast(DEFINITION_LLVM(target)); + Alias->replaceAllUsesWith(ConstantExpr::getBitCast(Aliasee,Alias->getType())); + changeLLVMConstant(Alias, Aliasee); + Alias->eraseFromParent(); + + // Mark the alias as written so gcc doesn't waste time outputting it. + TREE_ASM_WRITTEN(alias->decl) = 1; } /// emit_file_scope_asm - Emit the specified string as a file-scope inline From grosbach at apple.com Wed Feb 16 11:47:22 2011 From: grosbach at apple.com (Jim Grosbach) Date: Wed, 16 Feb 2011 09:47:22 -0800 Subject: [llvm-commits] [llvm] r125595 - in /llvm/trunk: lib/MC/MCParser/AsmParser.cpp test/MC/AsmParser/exprs.s test/MC/AsmParser/paren.s In-Reply-To: <20110216022506.GA22148@britannica.bec.de> References: <20110215204339.453842A6C12C@llvm.org> <20110216022506.GA22148@britannica.bec.de> Message-ID: <3075B8C8-F8FA-4C99-99AE-6BA896521B42@apple.com> On Feb 15, 2011, at 6:25 PM, Joerg Sonnenberger wrote: > On Tue, Feb 15, 2011 at 06:02:10PM -0800, Jim Grosbach wrote: >> Shouldn't something like this, at minimum, be predicated on a target >> enabling it? I doubt this is something all assembly variants want. > > ParseBracketExpr can be made virtual if necessary, but the current > status quo breaks completely legal code on i386. > >> For example, on x86 does Intel vs ATT syntax change whether this is >> supported? What about other targets? Do they want this enabled at all? >> Square brackets often have special meaning (memory references being >> the most common) and this could very easily complicate that. > > AT&T syntax doesn't care about [], I think. Intel syntax is messy as best, > but if it could only need a virtual override. What about other targets? ARM, MIPS, etc.. shouldn't accept bracket-as-parens expressions unless that's part of their documented syntax. I don't know for sure how this fits into the overall asmparser scheme of things (Daniel would be the right person to answer that). I'm just noting that we want to make sure to keep things like this isolated to those targets that want the behavior. For example, the following is not legal ARM assembly and should give a syntax error on the '[' token. add r0, r1, #[_foo - _bar] With these changes, that's not happening anymore. -Jim From joerg at britannica.bec.de Wed Feb 16 12:12:40 2011 From: joerg at britannica.bec.de (Joerg Sonnenberger) Date: Wed, 16 Feb 2011 19:12:40 +0100 Subject: [llvm-commits] [llvm] r125595 - in /llvm/trunk: lib/MC/MCParser/AsmParser.cpp test/MC/AsmParser/exprs.s test/MC/AsmParser/paren.s In-Reply-To: <3075B8C8-F8FA-4C99-99AE-6BA896521B42@apple.com> References: <20110215204339.453842A6C12C@llvm.org> <20110216022506.GA22148@britannica.bec.de> <3075B8C8-F8FA-4C99-99AE-6BA896521B42@apple.com> Message-ID: <20110216181240.GB23037@britannica.bec.de> On Wed, Feb 16, 2011 at 09:47:22AM -0800, Jim Grosbach wrote: > > AT&T syntax doesn't care about [], I think. Intel syntax is messy as best, > > but if it could only need a virtual override. > > What about other targets? ARM, MIPS, etc.. shouldn't accept > bracket-as-parens expressions unless that's part of their documented syntax. Do we really want to repeat the mistakes of GNU as? Having a slightly different assembler syntax on every platforms just sucks. So unless there is a very good reason, I would strongly discourage having such diversity. Joerg From grosbach at apple.com Wed Feb 16 12:17:53 2011 From: grosbach at apple.com (Jim Grosbach) Date: Wed, 16 Feb 2011 10:17:53 -0800 Subject: [llvm-commits] [llvm] r125595 - in /llvm/trunk: lib/MC/MCParser/AsmParser.cpp test/MC/AsmParser/exprs.s test/MC/AsmParser/paren.s In-Reply-To: <20110216181240.GB23037@britannica.bec.de> References: <20110215204339.453842A6C12C@llvm.org> <20110216022506.GA22148@britannica.bec.de> <3075B8C8-F8FA-4C99-99AE-6BA896521B42@apple.com> <20110216181240.GB23037@britannica.bec.de> Message-ID: On Feb 16, 2011, at 10:12 AM, Joerg Sonnenberger wrote: > On Wed, Feb 16, 2011 at 09:47:22AM -0800, Jim Grosbach wrote: >>> AT&T syntax doesn't care about [], I think. Intel syntax is messy as best, >>> but if it could only need a virtual override. >> >> What about other targets? ARM, MIPS, etc.. shouldn't accept >> bracket-as-parens expressions unless that's part of their documented syntax. > > Do we really want to repeat the mistakes of GNU as? Having a slightly > different assembler syntax on every platforms just sucks. So unless > there is a very good reason, I would strongly discourage having such > diversity. That's not a choice that's up to us. We're not deciding what the syntax is. We're supporting existing (hopefully documented) syntax. -Jim From rafael.espindola at gmail.com Wed Feb 16 12:28:23 2011 From: rafael.espindola at gmail.com (Rafael Avila de Espindola) Date: Wed, 16 Feb 2011 13:28:23 -0500 Subject: [llvm-commits] [llvm] r125595 - in /llvm/trunk: lib/MC/MCParser/AsmParser.cpp test/MC/AsmParser/exprs.s test/MC/AsmParser/paren.s In-Reply-To: References: <20110215204339.453842A6C12C@llvm.org> <20110216022506.GA22148@britannica.bec.de> <3075B8C8-F8FA-4C99-99AE-6BA896521B42@apple.com> <20110216181240.GB23037@britannica.bec.de> Message-ID: <4D5C1747.9030404@gmail.com> > That's not a choice that's up to us. We're not deciding what the syntax is. We're supporting existing (hopefully documented) syntax. So we need to support what gas does, but we can support a superset of it when we find some advantaged in doing so. Is there a case where handling [] changes the meaning of a valid asm file or we now just accept more code then gas does? > -Jim Cheers, Rafael From sabre at nondot.org Wed Feb 16 13:16:34 2011 From: sabre at nondot.org (Chris Lattner) Date: Wed, 16 Feb 2011 19:16:34 -0000 Subject: [llvm-commits] [llvm] r125681 - /llvm/trunk/lib/Target/README.txt Message-ID: <20110216191634.861282A6C12C@llvm.org> Author: lattner Date: Wed Feb 16 13:16:34 2011 New Revision: 125681 URL: http://llvm.org/viewvc/llvm-project?rev=125681&view=rev Log: Add a few missed xforms from GCC PR14753 Modified: llvm/trunk/lib/Target/README.txt Modified: llvm/trunk/lib/Target/README.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/README.txt?rev=125681&r1=125680&r2=125681&view=diff ============================================================================== --- llvm/trunk/lib/Target/README.txt (original) +++ llvm/trunk/lib/Target/README.txt Wed Feb 16 13:16:34 2011 @@ -2218,3 +2218,32 @@ avoids partial register stalls in some important cases. //===---------------------------------------------------------------------===// + +Some missed instcombine xforms (from GCC PR14753): + +void bar (void); + +void mask_gt (unsigned int a) { +/* This is equivalent to a > 15. */ +if ((a & ~7) > 8) +bar(); +} + +void neg_eq_cst(unsigned int a) { +if (-a == 123) +bar(); +} + +void minus_cst(unsigned int a) { +if (20 - a == 5) +bar(); +} + +void rotate_cst (unsigned a) { +a = (a << 10) | (a >> 22); +if (a == 123) +bar (); +} + +//===---------------------------------------------------------------------===// + From benny.kra at googlemail.com Wed Feb 16 13:30:00 2011 From: benny.kra at googlemail.com (Benjamin Kramer) Date: Wed, 16 Feb 2011 20:30:00 +0100 Subject: [llvm-commits] [llvm] r125681 - /llvm/trunk/lib/Target/README.txt In-Reply-To: <20110216191634.861282A6C12C@llvm.org> References: <20110216191634.861282A6C12C@llvm.org> Message-ID: <54177972-2C7C-46B8-BC17-117DD2B8F75A@googlemail.com> On 16.02.2011, at 20:16, Chris Lattner wrote: > Author: lattner > Date: Wed Feb 16 13:16:34 2011 > New Revision: 125681 > > URL: http://llvm.org/viewvc/llvm-project?rev=125681&view=rev > Log: > Add a few missed xforms from GCC PR14753 > > Modified: > llvm/trunk/lib/Target/README.txt > > Modified: llvm/trunk/lib/Target/README.txt > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/README.txt?rev=125681&r1=125680&r2=125681&view=diff > ============================================================================== > --- llvm/trunk/lib/Target/README.txt (original) > +++ llvm/trunk/lib/Target/README.txt Wed Feb 16 13:16:34 2011 > @@ -2218,3 +2218,32 @@ > avoids partial register stalls in some important cases. > > //===---------------------------------------------------------------------===// > + > +Some missed instcombine xforms (from GCC PR14753): > + > +void bar (void); > + > +void mask_gt (unsigned int a) { > +/* This is equivalent to a > 15. */ > +if ((a & ~7) > 8) > +bar(); > +} > + > +void neg_eq_cst(unsigned int a) { > +if (-a == 123) > +bar(); > +} > + > +void minus_cst(unsigned int a) { > +if (20 - a == 5) > +bar(); > +} > + > +void rotate_cst (unsigned a) { > +a = (a << 10) | (a >> 22); > +if (a == 123) > +bar (); > +} > + > +//===---------------------------------------------------------------------===// > + Some of those are in the other PR14753 section in README.txt already ? From nadav.rotem at intel.com Wed Feb 16 14:26:56 2011 From: nadav.rotem at intel.com (Rotem, Nadav) Date: Wed, 16 Feb 2011 22:26:56 +0200 Subject: [llvm-commits] [llvm] r125393 - in /llvm/trunk: lib/VMCore/ConstantFold.cpp test/Transforms/InstCombine/bitcast-vec-uniform.ll test/Transforms/InstCombine/fold-vector-select.ll In-Reply-To: References: <20110211193756.00C782A6C12C@llvm.org> <33543FF9-1ACE-4D44-8E7F-6D73B5F52D06@googlemail.com> <6594DDFF12B03D4E89690887C24869940270CCB0D6@hasmsx504.ger.corp.intel.com> <4D580EB3.2070701@free.fr> <4D5855BE.5080307@mxc.ca> <6594DDFF12B03D4E89690887C24869940270FC96E7@hasmsx504.ger.corp.intel.com> Message-ID: <6594DDFF12B03D4E89690887C2486994027105D780@hasmsx504.ger.corp.intel.com> Hi Frits, Nick and Duncan, I attached a revised patch which supports getAllOnesValue on FP values. I added minor changes to APFloat as well as new tests. Thanks, Nadav -----Original Message----- From: Frits van Bommel [mailto:fvbommel at gmail.com] Sent: Tuesday, February 15, 2011 00:25 To: Rotem, Nadav Cc: Nick Lewycky; Duncan Sands; llvm-commits at cs.uiuc.edu Subject: Re: [llvm-commits] [llvm] r125393 - in /llvm/trunk: lib/VMCore/ConstantFold.cpp test/Transforms/InstCombine/bitcast-vec-uniform.ll test/Transforms/InstCombine/fold-vector-select.ll On Mon, Feb 14, 2011 at 10:56 PM, Rotem, Nadav wrote: > I started by looking at adding alone support for constants. I started by adding support for float/double inside the Constant function. A change to APFloat is also possible but more complex. What do you think ? No need to go messing around with floats and doubles and reinterpret_casts (or changing APFloat). APFloat has a constructor that takes an APInt and initializes the floating-point value with those bits (just be careful with 'fp128' vs 'ppc_fp128' values, that's what the second parameter is for). --------------------------------------------------------------------- Intel Israel (74) Limited This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies. -------------- next part -------------- A non-text attachment was scrubbed... Name: fp.diff Type: application/octet-stream Size: 4493 bytes Desc: fp.diff Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110216/e7616222/attachment.obj From grosbach at apple.com Wed Feb 16 15:55:20 2011 From: grosbach at apple.com (Jim Grosbach) Date: Wed, 16 Feb 2011 13:55:20 -0800 Subject: [llvm-commits] [llvm] r125595 - in /llvm/trunk: lib/MC/MCParser/AsmParser.cpp test/MC/AsmParser/exprs.s test/MC/AsmParser/paren.s In-Reply-To: <4D5C1747.9030404@gmail.com> References: <20110215204339.453842A6C12C@llvm.org> <20110216022506.GA22148@britannica.bec.de> <3075B8C8-F8FA-4C99-99AE-6BA896521B42@apple.com> <20110216181240.GB23037@britannica.bec.de> <4D5C1747.9030404@gmail.com> Message-ID: <4682C3BA-FE60-4A76-9EBA-58CFA343CFFA@apple.com> On Feb 16, 2011, at 10:28 AM, Rafael Avila de Espindola wrote: >> That's not a choice that's up to us. We're not deciding what the syntax is. We're supporting existing (hopefully documented) syntax. > > So we need to support what gas does, but we can support a superset of it > when we find some advantaged in doing so. Close, but not quite. We have to support the documented syntax for the target. In many cases that's de-facto the documented gas behavior. Even then, gas has a lot of undocumented extensions, however. We can and should decide whether to support those on a case by case basis. Just like deciding what to do with GCC's language extensions in clang. > Is there a case where handling [] changes the meaning of a valid asm > file or we now just accept more code then gas does? Brackets have well-defined meaning in lots of asm dialects (memory references, etc). Overloading that to mean something else in expressions is dubious at best. For example, ldr r0, [r5] Is that an expression referring to a symbol named r5, or is it an indirect memory reference via register 5? -Jim From aggarwa4 at illinois.edu Wed Feb 16 17:19:40 2011 From: aggarwa4 at illinois.edu (Arushi Aggarwal) Date: Wed, 16 Feb 2011 23:19:40 -0000 Subject: [llvm-commits] [poolalloc] r125692 - in /poolalloc/trunk/lib/AssistDS: MergeGEP.cpp VarArgsFunc.cpp Message-ID: <20110216231940.991182A6C12C@llvm.org> Author: aggarwa4 Date: Wed Feb 16 17:19:40 2011 New Revision: 125692 URL: http://llvm.org/viewvc/llvm-project?rev=125692&view=rev Log: Helper functions for DSA. MergeGEP helps merge GEPs. This is similiar to some level of instruction combining. VarargsFunc, helps convert calls of type call (bitcast F(void) to (...)*)() to direct calls to F, without the bitcast. Added: poolalloc/trunk/lib/AssistDS/MergeGEP.cpp poolalloc/trunk/lib/AssistDS/VarArgsFunc.cpp Added: poolalloc/trunk/lib/AssistDS/MergeGEP.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/MergeGEP.cpp?rev=125692&view=auto ============================================================================== --- poolalloc/trunk/lib/AssistDS/MergeGEP.cpp (added) +++ poolalloc/trunk/lib/AssistDS/MergeGEP.cpp Wed Feb 16 17:19:40 2011 @@ -0,0 +1,125 @@ +//===-- MergeGEP.cpp - Merge GEPs for indexing in arrays ------------ ----===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// +//===----------------------------------------------------------------------===// +#define DEBUG_TYPE "mergegep" + +#include "llvm/Instructions.h" +#include "llvm/Module.h" +#include "llvm/Pass.h" +#include "llvm/Instructions.h" +#include "llvm/Constants.h" +#include "llvm/Support/GetElementPtrTypeIterator.h" +#include "llvm/Transforms/Utils/Cloning.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/Support/FormattedStream.h" +#include "llvm/Support/Debug.h" +#include + +using namespace llvm; + + +namespace { + class MergeGEP : public ModulePass { + public: + static char ID; + MergeGEP() : ModulePass(&ID) {} + bool runOnModule(Module& M) { + bool changed = false; + bool found; + do { + found = false; + for (Module::iterator F = M.begin(); F != M.end(); ++F){ + for (Function::iterator B = F->begin(), FE = F->end(); B != FE; ++B) { + for (BasicBlock::iterator I = B->begin(), BE = B->end(); I != BE; I++) { + if(!(isa(I))) + continue; + GetElementPtrInst *GEP = cast(I); + if(!isa(GEP->getType()->getElementType())) + continue; + for (gep_type_iterator I = gep_type_begin(GEP), E = gep_type_end(GEP); + I != E; ++I) { + if (isa(*I)) { + gep_type_iterator II = I; + if(++II == E){ + std::vector worklist; + for (Value::use_iterator UI = GEP->use_begin(), + UE = GEP->use_end(); UI != UE; ++UI){ + if(!isa(UI)) + break; + GetElementPtrInst *GEPUse = cast(UI); + worklist.push_back(GEPUse); + } + while(!worklist.empty()){ + GetElementPtrInst *GEPUse = worklist.back(); + worklist.pop_back(); + SmallVector Indices; + Indices.append(GEP->op_begin()+1, GEP->op_end()); + Indices.append(GEPUse->idx_begin()+1, GEPUse->idx_end()); + GetElementPtrInst *GEPNew = GetElementPtrInst::Create(GEP->getOperand(0), + Indices.begin(), + Indices.end(), + GEPUse->getName()+ "mod", + GEPUse); + GEPUse->replaceAllUsesWith(GEPNew); + GEPUse->eraseFromParent(); + found = true; + changed = true; + } + } + } + } + } + } + std::vector worklist; + for (Function::iterator B = F->begin(), FE = F->end(); B != FE; ++B) { + for (BasicBlock::iterator I = B->begin(), BE = B->end(); I != BE; I++) { + if(!(isa(I))) + continue; + GetElementPtrInst *GEP = cast(I); + if (Constant *C = dyn_cast(GEP->getOperand(0))) { + if (ConstantExpr *CE = dyn_cast(C)) { + if (CE->getOpcode() == Instruction::GetElementPtr) { + worklist.push_back(GEP); + } + } + } + } + } + while(!worklist.empty()) { + GetElementPtrInst *GEP = worklist.back(); + worklist.pop_back(); + Constant *C = cast(GEP->getOperand(0)); + ConstantExpr *CE = cast(C); + SmallVector Indices; + Indices.append(CE->op_begin()+1, CE->op_end()); + Indices.append(GEP->idx_begin()+1, GEP->idx_end()); + GetElementPtrInst *GEPNew = GetElementPtrInst::Create(CE->getOperand(0), + Indices.begin(), + Indices.end(), + GEP->getName()+ "mod", + GEP); + //GEP->dump(); + //GEPNew->dump(); + GEP->replaceAllUsesWith(GEPNew); + GEP->eraseFromParent(); + changed = true; + found = true; + } + } + }while(found); + return changed; + } + }; +} + +char MergeGEP::ID = 0; +static RegisterPass +X("mergegep", "Merge GEPs for arrays in structs"); Added: poolalloc/trunk/lib/AssistDS/VarArgsFunc.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/VarArgsFunc.cpp?rev=125692&view=auto ============================================================================== --- poolalloc/trunk/lib/AssistDS/VarArgsFunc.cpp (added) +++ poolalloc/trunk/lib/AssistDS/VarArgsFunc.cpp Wed Feb 16 17:19:40 2011 @@ -0,0 +1,93 @@ +//===-- VarArgsFunc.cpp - Simplify calls to bitcasted const funcs --------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +#define DEBUG_TYPE "varargfunc" + +#include "llvm/Instructions.h" +#include "llvm/Module.h" +#include "llvm/Pass.h" +#include "llvm/Transforms/Utils/Cloning.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/Support/FormattedStream.h" +#include "llvm/Support/Debug.h" + +#include +#include +#include + +using namespace llvm; + +STATISTIC(numSimplified, "Number of Calls Simplified"); + +namespace { + class VarArgsFunc : public ModulePass { + public: + static char ID; + VarArgsFunc() : ModulePass(&ID) {} + bool runOnModule(Module& M) { + bool changed = false; + std::vector worklist; + for (Module::iterator I = M.begin(); I != M.end(); ++I) { + if (!I->isDeclaration() && !I->mayBeOverridden()) { + //Call Sites + for(Value::use_iterator ui = I->use_begin(), ue = I->use_end(); + ui != ue; ++ui) { + if (Constant *C = dyn_cast(ui)) { + if (ConstantExpr *CE = dyn_cast(C)) { + if (CE->getOpcode() == Instruction::BitCast) { + if(CE->getOperand(0) == I) { + if(const FunctionType *FTy = dyn_cast((cast(CE->getType()))->getElementType())) { + if(FTy->isVarArg()) { + for(Value::use_iterator uii = CE->use_begin(), uee = CE->use_end(); + uii != uee; ++uii) { + if (CallInst* CI = dyn_cast(uii)) { + if(CI->getCalledValue() == CE) { + worklist.push_back(CI); + } + } + } + } + } + } + } + } + } + } + } + } + while(!worklist.empty()) { + CallInst *CI = worklist.back(); + worklist.pop_back(); + Function *F = cast(CI->getCalledValue()->stripPointerCasts()); + if(F->arg_size() != (CI->getNumOperands()-1)) + continue; + if(F->getReturnType() != CI->getType()) + continue; + int arg_count = 1; + bool change = true; + for (Function::arg_iterator ii = F->arg_begin(), ee = F->arg_end();ii != ee; ++ii,arg_count++) { + if(ii->getType() != CI->getOperand(arg_count)->getType()) { + change = false; + break; + } + } + + if(change) { + CI->setCalledFunction(F); + changed = true; + numSimplified++; + } + } + return changed; + } + }; +} + +char VarArgsFunc::ID = 0; +static RegisterPass +X("varargsfunc", "Specialize for ill-defined non-varargs functions"); From rafael.espindola at gmail.com Wed Feb 16 17:25:04 2011 From: rafael.espindola at gmail.com (Rafael Avila de Espindola) Date: Wed, 16 Feb 2011 18:25:04 -0500 Subject: [llvm-commits] [llvm] r125595 - in /llvm/trunk: lib/MC/MCParser/AsmParser.cpp test/MC/AsmParser/exprs.s test/MC/AsmParser/paren.s In-Reply-To: <4682C3BA-FE60-4A76-9EBA-58CFA343CFFA@apple.com> References: <20110215204339.453842A6C12C@llvm.org> <20110216022506.GA22148@britannica.bec.de> <3075B8C8-F8FA-4C99-99AE-6BA896521B42@apple.com> <20110216181240.GB23037@britannica.bec.de> <4D5C1747.9030404@gmail.com> <4682C3BA-FE60-4A76-9EBA-58CFA343CFFA@apple.com> Message-ID: <4D5C5CD0.1080703@gmail.com> > Brackets have well-defined meaning in lots of asm dialects (memory references, etc). Overloading that to mean something else in expressions is dubious at best. > > For example, > ldr r0, [r5] > > Is that an expression referring to a symbol named r5, or is it an indirect memory reference via register 5? Yes, that is bad. So, the two questions are * Should be support [] at all * If yes, everywhere? I so far have seem [] being used only one file and updated that one file :-) I think Joerg mentioned it being common on old BSD code, so we might have to support it. You have a valid argument as for why it is better to not support it is some arches, so maybe we need to make this conditional. Joerg, how common are assembly files with [] in them? If common, can you code a patch making [] conditional on x86(-64) ELF? > -Jim Cheers, Rafael From joerg at britannica.bec.de Wed Feb 16 18:08:29 2011 From: joerg at britannica.bec.de (Joerg Sonnenberger) Date: Thu, 17 Feb 2011 01:08:29 +0100 Subject: [llvm-commits] [llvm] r125595 - in /llvm/trunk: lib/MC/MCParser/AsmParser.cpp test/MC/AsmParser/exprs.s test/MC/AsmParser/paren.s In-Reply-To: <4D5C5CD0.1080703@gmail.com> References: <20110215204339.453842A6C12C@llvm.org> <20110216022506.GA22148@britannica.bec.de> <3075B8C8-F8FA-4C99-99AE-6BA896521B42@apple.com> <20110216181240.GB23037@britannica.bec.de> <4D5C1747.9030404@gmail.com> <4682C3BA-FE60-4A76-9EBA-58CFA343CFFA@apple.com> <4D5C5CD0.1080703@gmail.com> Message-ID: <20110217000829.GC23813@britannica.bec.de> On Wed, Feb 16, 2011 at 06:25:04PM -0500, Rafael Avila de Espindola wrote: > I so far have seem [] being used only one file and updated that one file > :-) I think Joerg mentioned it being common on old BSD code, so we might > have to support it. [] is used in the default PIC prologue created by various compilers. > Joerg, how common are assembly files with [] in them? If common, can you > code a patch making [] conditional on x86(-64) ELF? Why not just make the function virtual and let platforms that can't accept the default behavior overwrite it? I actually think that quite a few platforms GNU as support don't distinguish between [] and () as the patch implements. Joerg From joerg at britannica.bec.de Wed Feb 16 18:09:59 2011 From: joerg at britannica.bec.de (Joerg Sonnenberger) Date: Thu, 17 Feb 2011 01:09:59 +0100 Subject: [llvm-commits] [llvm] r125595 - in /llvm/trunk: lib/MC/MCParser/AsmParser.cpp test/MC/AsmParser/exprs.s test/MC/AsmParser/paren.s In-Reply-To: <4682C3BA-FE60-4A76-9EBA-58CFA343CFFA@apple.com> References: <20110215204339.453842A6C12C@llvm.org> <20110216022506.GA22148@britannica.bec.de> <3075B8C8-F8FA-4C99-99AE-6BA896521B42@apple.com> <20110216181240.GB23037@britannica.bec.de> <4D5C1747.9030404@gmail.com> <4682C3BA-FE60-4A76-9EBA-58CFA343CFFA@apple.com> Message-ID: <20110217000959.GD23813@britannica.bec.de> On Wed, Feb 16, 2011 at 01:55:20PM -0800, Jim Grosbach wrote: > Brackets have well-defined meaning in lots of asm dialects (memory references, etc). Overloading that to mean something else in expressions is dubious at best. > > For example, > ldr r0, [r5] > > Is that an expression referring to a symbol named r5, or is it an indirect memory reference via register 5? How is ldr r0, (r5) interpreted in this context? AT&T syntax for x86 and quite a few other platforms consider those to be equivalent. Joerg From eli.friedman at gmail.com Wed Feb 16 18:25:14 2011 From: eli.friedman at gmail.com (Eli Friedman) Date: Wed, 16 Feb 2011 16:25:14 -0800 Subject: [llvm-commits] [PATCH] Patch (WIP) to custom-lower 64-bit relational comparisons on x86-32 Message-ID: Example of what the attached patch does (x86-32): C code: int foo(); int bar(long long x, long long y) { if (x < y) foo(); } Current generated code: subl $12, %esp movl 16(%esp), %eax movl 20(%esp), %ecx cmpl 24(%esp), %eax setae %al cmpl 28(%esp), %ecx setge %cl je .LBB0_2 movb %cl, %al .LBB0_2: testb %al, %al jne .LBB0_4 calll foo .LBB0_4: addl $12, %esp ret New generated code: subl $12, %esp movl 16(%esp), %eax movl 20(%esp), %ecx subl 24(%esp), %eax sbbl 28(%esp), %ecx jge .LBB0_2 calll foo .LBB0_2: addl $12, %esp ret I initially wrote this patch a couple years ago, but the backend choked on it before some recent changes. The reason this works is that on x86, comparisons are fundamentally just subtraction. So to do a wide comparison, all that is necessary is to split the subtraction, and use the flag results of the top half. A bit of trickiness is required because the ZF flag isn't set in a useful way, but that's straightforward to solve: don't lower equality comparisons with this method and commute other comparisons that look at the ZF flag. I'm mainly looking for feedback as to whether this seems like generally a good idea... I haven't seen any compiler use this particular implementation of relational comparisons. -Eli -------------- next part -------------- Index: X86/X86ISelLowering.cpp =================================================================== --- X86/X86ISelLowering.cpp (revision 125651) +++ X86/X86ISelLowering.cpp (working copy) @@ -446,6 +446,7 @@ setOperationAction(ISD::SETCC , MVT::i8 , Custom); setOperationAction(ISD::SETCC , MVT::i16 , Custom); setOperationAction(ISD::SETCC , MVT::i32 , Custom); + setOperationAction(ISD::SETCC , MVT::i64 , Custom); setOperationAction(ISD::SETCC , MVT::f32 , Custom); setOperationAction(ISD::SETCC , MVT::f64 , Custom); setOperationAction(ISD::SETCC , MVT::f80 , Custom); @@ -7402,6 +7403,38 @@ if (X86CC == X86::COND_INVALID) return SDValue(); + if (!Subtarget->is64Bit() && Op0.getValueType() == MVT::i64) { + if (X86CC == X86::COND_E || X86CC == X86::COND_NE) + return SDValue(); + if (X86CC == X86::COND_A) { + X86CC = X86::COND_B; + std::swap(Op0, Op1); + } else if (X86CC == X86::COND_BE) { + X86CC = X86::COND_AE; + std::swap(Op0, Op1); + } else if (X86CC == X86::COND_G) { + X86CC = X86::COND_L; + std::swap(Op0, Op1); + } else if (X86CC == X86::COND_LE) { + X86CC = X86::COND_GE; + std::swap(Op0, Op1); + } + SDValue Op0Low = DAG.getNode(ISD::EXTRACT_ELEMENT, dl, MVT::i32, + Op0, DAG.getIntPtrConstant(0)); + SDValue Op1Low = DAG.getNode(ISD::EXTRACT_ELEMENT, dl, MVT::i32, + Op1, DAG.getIntPtrConstant(0)); + SDValue Op0High = DAG.getNode(ISD::EXTRACT_ELEMENT, dl, MVT::i32, + Op0, DAG.getIntPtrConstant(1)); + SDValue Op1High = DAG.getNode(ISD::EXTRACT_ELEMENT, dl, MVT::i32, + Op1, DAG.getIntPtrConstant(1)); + SDValue res1, res2; + SDVTList VTList = DAG.getVTList(MVT::i32, MVT::i32); + res1 = SDValue(DAG.getNode(X86ISD::SUB, dl, VTList, Op0Low, Op1Low).getNode(), 1); + res2 = SDValue(DAG.getNode(X86ISD::SBB, dl, VTList, Op0High, Op1High, res1).getNode(), 1); + return DAG.getNode(X86ISD::SETCC, dl, MVT::i8, + DAG.getConstant(X86CC, MVT::i8), res2); + } + SDValue EFLAGS = EmitCmp(Op0, Op1, X86CC, DAG); return DAG.getNode(X86ISD::SETCC, dl, MVT::i8, DAG.getConstant(X86CC, MVT::i8), EFLAGS); From aggarwa4 at illinois.edu Wed Feb 16 19:03:57 2011 From: aggarwa4 at illinois.edu (Arushi Aggarwal) Date: Thu, 17 Feb 2011 01:03:57 -0000 Subject: [llvm-commits] [poolalloc] r125697 - in /poolalloc/trunk/test: TEST.dsgraph.Makefile TEST.dsgraph.report Message-ID: <20110217010358.00CD72A6C12C@llvm.org> Author: aggarwa4 Date: Wed Feb 16 19:03:57 2011 New Revision: 125697 URL: http://llvm.org/viewvc/llvm-project?rev=125697&view=rev Log: Remove all type inference data from this, and move to separate makefile Modified: poolalloc/trunk/test/TEST.dsgraph.Makefile poolalloc/trunk/test/TEST.dsgraph.report Modified: poolalloc/trunk/test/TEST.dsgraph.Makefile URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/TEST.dsgraph.Makefile?rev=125697&r1=125696&r2=125697&view=diff ============================================================================== --- poolalloc/trunk/test/TEST.dsgraph.Makefile (original) +++ poolalloc/trunk/test/TEST.dsgraph.Makefile Wed Feb 16 19:03:57 2011 @@ -42,7 +42,6 @@ Output/%.$(TEST).report.txt: Output/%.base.bc Output/%.LOC.txt $(LOPT) @# Gather data -($(RUNOPT) -dsa-$(PASS) $(ANALYZE_OPTS) $<)> $@.time.1 2>&1 - -($(RUNOPT) -dsa-$(PASS) -dsa-stdlib-no-fold $(ANALYZE_OPTS) $<)> $@.time.2 2>&1 -($(RUNOPT) $(MEM) -dsa-$(PASS) -disable-verify $<)> $@.mem.1 2>&1 @# Emit data. @echo "---------------------------------------------------------------" > $@ @@ -69,36 +68,6 @@ @/bin/echo -n "SCCSIZE: " >> $@ - at grep 'Maximum SCC Size in Call Graph' $@.time.1 >> $@ @echo >> $@ - @/bin/echo -n "ACCESSES TYPED: " >> $@ - - at grep 'Number of loads/stores which are fully typed' $@.time.1 >> $@ - @echo >> $@ - @/bin/echo -n "ACCESSES UNTYPED: " >> $@ - - at grep 'Number of loads/stores which are untyped' $@.time.1 >> $@ - @echo >> $@ - @/bin/echo -n "ACCESSES TYPED1: " >> $@ - - at grep 'Number of loads/stores which are access a DSNode with 1 type' $@.time.1 >> $@ - @echo >> $@ - @/bin/echo -n "ACCESSES TYPED2: " >> $@ - - at grep 'Number of loads/stores which are access a DSNode with 2 type' $@.time.1 >> $@ - @echo >> $@ - @/bin/echo -n "ACCESSES TYPED3: " >> $@ - - at grep 'Number of loads/stores which are access a DSNode with 3 type' $@.time.1 >> $@ - @echo >> $@ - @/bin/echo -n "ACCESSES TYPED4: " >> $@ - - at grep 'Number of loads/stores which are access a DSNode with >3 type' $@.time.1 >> $@ - @echo >> $@ - @/bin/echo -n "ACCESSES I: " >> $@ - - at grep 'Number of loads/stores which are on incomplete nodes' $@.time.1 >> $@ - @echo >> $@ - @/bin/echo -n "ACCESSES E: " >> $@ - - at grep 'Number of loads/stores which are on external nodes' $@.time.1 >> $@ - @echo >> $@ - @/bin/echo -n "ACCESSES U: " >> $@ - - at grep 'Number of loads/stores which are on unknown nodes' $@.time.1 >> $@ - @echo >> $@ - @/bin/echo -n "STD_LIB_FOLD: " >> $@ - - at grep 'Number of nodes folded in std lib' $@.time.1 >> $@ - @echo >> $@ @# Emit timing data. @/bin/echo -n "TIME: " >> $@ - at grep ' Local Data Structure' $@.time.1 >> $@ Modified: poolalloc/trunk/test/TEST.dsgraph.report URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/TEST.dsgraph.report?rev=125697&r1=125696&r2=125697&view=diff ============================================================================== --- poolalloc/trunk/test/TEST.dsgraph.report (original) +++ poolalloc/trunk/test/TEST.dsgraph.report Wed Feb 16 19:03:57 2011 @@ -156,21 +156,7 @@ ["GlobGr" , "GLOBALSGRAPH: *([0-9]+)"], ["MaxSCC" , "SCCSIZE: *([0-9]+)"], [], - ["TypeSafe", "ACCESSES TYPED: *([0-9]+)"], - ["NonType", "ACCESSES UNTYPED: *([0-9]+)"], - ["TS %" , sub { return TypeSafeRatio(@_); }], - [], - ["Type1", "ACCESSES TYPED1: *([0-9]+)"], - ["Type2", "ACCESSES TYPED2: *([0-9]+)"], - ["Type3", "ACCESSES TYPED3: *([0-9]+)"], - ["Type4", "ACCESSES TYPED4: *([0-9]+)"], - ["I", "ACCESSES I: *([0-9]+)"], - ["E", "ACCESSES E: *([0-9]+)"], - ["U", "ACCESSES U: *([0-9]+)"], - ["U", "ACCESSES U: *([0-9]+)"], - [], # Nodes Folded - ["StdLibFold", "STD_LIB_FOLD: *([0-9]+)"], ["IndClone", "CLONED_INDCLONE: *([0-9]+)"], ["FuncSpec", "CLONED_FUNCSPEC: *([0-9]+)"], ); From aggarwa4 at illinois.edu Wed Feb 16 19:06:36 2011 From: aggarwa4 at illinois.edu (Arushi Aggarwal) Date: Thu, 17 Feb 2011 01:06:36 -0000 Subject: [llvm-commits] [poolalloc] r125698 - in /poolalloc/trunk/test: Makefile TEST.types.Makefile TEST.types.report Message-ID: <20110217010636.E497F2A6C12C@llvm.org> Author: aggarwa4 Date: Wed Feb 16 19:06:36 2011 New Revision: 125698 URL: http://llvm.org/viewvc/llvm-project?rev=125698&view=rev Log: Adding tests for type inference testing. Added: poolalloc/trunk/test/TEST.types.Makefile (with props) poolalloc/trunk/test/TEST.types.report (with props) Modified: poolalloc/trunk/test/Makefile Modified: poolalloc/trunk/test/Makefile URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/Makefile?rev=125698&r1=125697&r2=125698&view=diff ============================================================================== --- poolalloc/trunk/test/Makefile (original) +++ poolalloc/trunk/test/Makefile Wed Feb 16 19:06:36 2011 @@ -308,6 +308,30 @@ done @printf "\a"; sleep 1; printf "\a"; sleep 1; printf "\a" +# Program tests for Types +progtypes:: + for dir in $(LARGE_PROBLEM_SIZE_DIRS); do \ + (cd $$dir; \ + PROJECT_DIR=$(PROJ_OBJ_ROOT) $(MAKE) -j1 TEST=types \ + LARGE_PROBLEM_SIZE=1 report.html) \ + done + for dir in $(NORMAL_PROBLEM_SIZE_DIRS); do \ + (cd $$dir; \ + PROJECT_DIR=$(PROJ_OBJ_ROOT) $(MAKE) -j1 TEST=types \ + report.html) \ + done + @for dir in $(LARGE_PROBLEM_SIZE_DIRS); do \ + (cd $$dir; \ + PROJECT_DIR=$(PROJ_OBJ_ROOT) $(MAKE) -s -j1 TEST=types \ + LARGE_PROBLEM_SIZE=1 report) \ + done + @for dir in $(NORMAL_PROBLEM_SIZE_DIRS); do \ + (cd $$dir; \ + PROJECT_DIR=$(PROJ_OBJ_ROOT) $(MAKE) -s -j1 TEST=types \ + report) \ + done + @printf "\a"; sleep 1; printf "\a"; sleep 1; printf "\a" + ############################################################################## # Targets for running tests and gathering statistics for arbitrary tests Added: poolalloc/trunk/test/TEST.types.Makefile URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/TEST.types.Makefile?rev=125698&view=auto ============================================================================== --- poolalloc/trunk/test/TEST.types.Makefile (added) +++ poolalloc/trunk/test/TEST.types.Makefile Wed Feb 16 19:06:36 2011 @@ -0,0 +1,147 @@ +##===- TEST.dsgraph.Makefile -------------------------------*- Makefile -*-===## +# +# This recursively traverses the programs, computing DSGraphs for each of the +# programs in the testsuite. +# +##===----------------------------------------------------------------------===## + +RELDIR := $(subst $(PROJ_OBJ_ROOT),,$(PROJ_OBJ_DIR)) + +# We require the programs to be linked with libdummy +#include $(LEVEL)/Makefile.dummylib + +# Pathname to poolalloc object tree +PADIR := $(LLVM_OBJ_ROOT)/projects/poolalloc + +# Pathame to the DSA pass dynamic library +DSA_SO := $(PADIR)/$(CONFIGURATION)/lib/libLLVMDataStructure$(SHLIBEXT) +ASSIST_SO := $(PADIR)/$(CONFIGURATION)/lib/libAssistDS$(SHLIBEXT) + +# Command for running the opt program +RUNOPT := $(RUNTOOLSAFELY) $(LLVM_OBJ_ROOT)/projects/poolalloc/$(CONFIGURATION)/bin/watchdog $(LOPT) -load $(DSA_SO) + +# PASS - The dsgraph pass to run: ds, bu, td +PASS := td + +ANALYZE_OPTS := -stats -time-passes -disable-output -dsstats +#ANALYZE_OPTS := -stats -time-passes -dsstats +ANALYZE_OPTS += -instcount -disable-verify +MEM := -track-memory -time-passes -disable-output + +SAFE_OPTS := -internalize -scalarrepl -deadargelim -globaldce -basiccg -inline + +$(PROGRAMS_TO_TEST:%=Output/%.linked1.bc): \ +Output/%.linked1.bc: Output/%.linked.rbc $(LOPT) + -$(RUNOPT) -disable-opt $(SAFE_OPTS) -info-output-file=$(CURDIR)/$@.info -stats -time-passes $< -f -o $@ + +$(PROGRAMS_TO_TEST:%=Output/%.llvm1.bc): \ +Output/%.llvm1.bc: Output/%.linked1.bc $(LLVM_LDDPROG) + -$(RUNTOOLSAFELY) $(LLVMLD) -disable-opt $(SAFE_OPTS) -info-output-file=$(CURDIR)/$@.info -stats -time-passes $(LLVMLD_FLAGS) $< -lc $(LIBS) -o Output/$*.llvm1 + +$(PROGRAMS_TO_TEST:%=Output/%.opt.bc): \ +Output/%.opt.bc: Output/%.llvm1.bc $(LOPT) $(ASSIST_SO) + -$(RUNOPT) -load $(ASSIST_SO) -disable-opt -info-output-file=$(CURDIR)/$@.info -instnamer -internalize -varargsfunc -indclone -funcspec -ipsccp -deadargelim -mergegep -die -globaldce -stats -time-passes $< -f -o $@ + +$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \ +Output/%.$(TEST).report.txt: Output/%.opt.bc Output/%.LOC.txt $(LOPT) + @# Gather data + -($(RUNOPT) -dsa-$(PASS) -enable-type-inference-opts -dsa-stdlib-no-fold $(ANALYZE_OPTS) $<)> $@.time.1 2>&1 + -($(RUNOPT) -dsa-$(PASS) $(ANALYZE_OPTS) $<)> $@.time.2 2>&1 + @# Emit data. + @echo "---------------------------------------------------------------" > $@ + @echo ">>> ========= '$(RELDIR)/$*' Program" >> $@ + @echo "---------------------------------------------------------------" >> $@ + @/bin/echo -n "LOC: " >> $@ + @cat Output/$*.LOC.txt >> $@ + @echo >> $@ + @/bin/echo -n "MEMINSTS: " >> $@ + - at grep 'Number of memory instructions' $@.time.1 >> $@ + @echo >> $@ + @/bin/echo -n "FOLDEDNODES: " >> $@ + - at grep 'Number of nodes completely folded' $@.time.1 >> $@ + @echo >> $@ + @/bin/echo -n "TOTALNODES: " >> $@ + - at grep 'Number of nodes allocated' $@.time.1 >> $@ + @echo >> $@ + @/bin/echo -n "MAXGRAPHSIZE: " >> $@ + - at grep 'Maximum graph size' $@.time.1 >> $@ + @echo >> $@ + @/bin/echo -n "GLOBALSGRAPH: " >> $@ + - at grep 'td.GlobalsGraph.dot' $@.time.1 >> $@ + @echo >> $@ + @/bin/echo -n "SCCSIZE: " >> $@ + - at grep 'Maximum SCC Size in Call Graph' $@.time.1 >> $@ + @echo >> $@ + @/bin/echo -n "ACCESSES TYPED_O: " >> $@ + - at grep 'Number of loads/stores which are fully typed' $@.time.1 >> $@ + @echo >> $@ + @/bin/echo -n "ACCESSES UNTYPED_O: " >> $@ + - at grep 'Number of loads/stores which are untyped' $@.time.1 >> $@ + @echo >> $@ + @/bin/echo -n "ACCESSES TYPED: " >> $@ + - at grep 'Number of loads/stores which are fully typed' $@.time.2 >> $@ + @echo >> $@ + @/bin/echo -n "ACCESSES UNTYPED: " >> $@ + - at grep 'Number of loads/stores which are untyped' $@.time.2 >> $@ + @echo >> $@ + @/bin/echo -n "ACCESSES TYPED1: " >> $@ + - at grep 'Number of loads/stores which are access a DSNode with 1 type' $@.time.1 >> $@ + @echo >> $@ + @/bin/echo -n "ACCESSES TYPED2: " >> $@ + - at grep 'Number of loads/stores which are access a DSNode with 2 type' $@.time.1 >> $@ + @echo >> $@ + @/bin/echo -n "ACCESSES TYPED3: " >> $@ + - at grep 'Number of loads/stores which are access a DSNode with 3 type' $@.time.1 >> $@ + @echo >> $@ + @/bin/echo -n "ACCESSES TYPED4: " >> $@ + - at grep 'Number of loads/stores which are access a DSNode with >3 type' $@.time.1 >> $@ + @echo >> $@ + @/bin/echo -n "ACCESSES I: " >> $@ + - at grep 'Number of loads/stores which are on incomplete nodes' $@.time.1 >> $@ + @echo >> $@ + @/bin/echo -n "ACCESSES E: " >> $@ + - at grep 'Number of loads/stores which are on external nodes' $@.time.1 >> $@ + @echo >> $@ + @/bin/echo -n "ACCESSES U: " >> $@ + - at grep 'Number of loads/stores which are on unknown nodes' $@.time.1 >> $@ + @echo >> $@ + @/bin/echo -n "STD_LIB_FOLD: " >> $@ + - at grep 'Number of nodes folded in std lib' $@.time.1 >> $@ + @echo >> $@ + @# Emit timing data. + @/bin/echo -n "TIME: " >> $@ + - at grep ' Local Data Structure' $@.time.1 >> $@ + @echo >> $@ + @/bin/echo -n "TIME: " >> $@ + - at grep ' Bottom-up Data Structure' $@.time.1 >> $@ + @echo >> $@ + @/bin/echo -n "TIME: " >> $@ + - at grep ' Top-down Data Structure' $@.time.1 >> $@ + @echo >> $@ + @# Emit AssistDS stats + @/bin/echo -n "CLONED_FUNCSPEC: " >> $@ + - at grep 'Number of Functions Cloned in FuncSpec' $<.info >> $@ + @echo >> $@ + @/bin/echo -n "CLONED_INDCLONE: " >> $@ + - at grep 'Number of Functions Cloned in IndClone' $<.info >> $@ + @echo >> $@ + @/bin/echo -n "VARARGS_CALLS: " >> $@ + - at grep 'Number of Calls Simplified' $<.info >> $@ + @echo >> $@ + @/bin/echo -n "CALLS1: " >> $@ + - at grep 'Number of calls that could not be resolved' $@.time.1 >> $@ + @echo >> $@ + + +$(PROGRAMS_TO_TEST:%=test.$(TEST).%): \ +test.$(TEST).%: Output/%.$(TEST).report.txt + @echo "---------------------------------------------------------------" + @echo ">>> ========= '$(RELDIR)/$*' Program" + @echo "---------------------------------------------------------------" + @cat $< + +# Define REPORT_DEPENDENCIES so that the report is regenerated if analyze or +# dummylib is updated. +# +REPORT_DEPENDENCIES := $(DUMMYLIB) $(LOPT) + Propchange: poolalloc/trunk/test/TEST.types.Makefile ------------------------------------------------------------------------------ svn:executable = * Added: poolalloc/trunk/test/TEST.types.report URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/TEST.types.report?rev=125698&view=auto ============================================================================== --- poolalloc/trunk/test/TEST.types.report (added) +++ poolalloc/trunk/test/TEST.types.report Wed Feb 16 19:06:36 2011 @@ -0,0 +1,167 @@ +##=== TEST.dsgraph.report - Report description for dsgraph -----*- perl -*-===## +# +# This file defines a report to be generated for the dsgraph test. +# +##===----------------------------------------------------------------------===## + +$SortNumeric = 1; # Sort numerically, not textually. +$TrimAllDirectories = 1; # Trim off benchmark directories. +$SortCol = 2; # Sort by #MemInstrs +$SortReverse = 1; # Sort in descending order + + +# Helper function +sub Ratio { + my ($Cols, $Col) = @_; + if ($Cols->[$Col-2] ne "*" and + $Cols->[$Col-2] != "0") { + return $Cols->[$Col-1]/$Cols->[$Col-2]; + } else { + return "n/a"; + } +} + +sub TypeSafeRatio { + my ($Cols, $Col) = @_; + my $TS = $Cols->[$Col-2]; + my $NTS = $Cols->[$Col-1]; + $TS = 0 if ($TS eq "*"); + $NTS = 0 if ($NTS eq "*"); + + if ($TS + $NTS != 0) { + return sprintf("%4.1f%%", 100*$TS/($TS+$NTS+0.0)); + } else { + return "n/a"; + } +} + +sub FormatSize { + my $Size = shift; + if ($Size > 10*1024*1024) { + return (int $Size*10 / (1024*1024))/10 . "MB"; + } elsif ($Size > 10*1024) { + return (int $Size / 1024); + } else { + return $Size . "B"; + } +} + +sub NoStar { + return "0" if ($_[0] eq '*'); + return $_[0]; +} + +sub NoCallNodes { + $_[0] =~ m/([0-9]+)\+/; + return $1; +} + +# For latex output, limit benchmarks and rename as appropriate + at LatexRowMapOrder = ( + '-' => '-', + + '181.mcf' => '181.mcf', + '256.bzip2' => '256.bzip2', + '164.gzip' => '164.gzip', + '175.vpr' => '175.vpr', + '197.parser' => '197.parser', + '186.crafty' => '186.crafty', + '300.twolf' => '300.twolf', + '255.vortex' => '255.vortex', + '254.gap' => '254.gap', + '252.eon' => '252.eon', + '253.perlbmk' => '253.perlbmk', + '176.gcc' => '176.gcc', + '-' => '-', + '179.art' => '179.art', + '183.equake' => '183.equake', + '171.swim' => '171.swim', + '172.mgrid' => '172.mgrid', + '168.wupwise' => '168.wupwise', + '173.applu' => '173.applu', + '188.ammp' => '188.ammp', + '177.mesa' => '177.mesa', + '-' => '-', + '129.compress' => '129.compress', + '130.li' => '130.li', + '124.m88ksim' => '124.m88ksim', + '132.ijpeg' => '132.ijpeg', + '099.go' => '099.go', + '134.perl' => '134.perl', + '147.vortex' => '147.vortex', + '126.gcc' => '126.gcc', + '-' => '-', + '102.swim' => '102.swim', + '101.tomcatv' => '101.tomcatv', + '107.mgrid' => '107.mgrid', + '145.fpppp' => '145.fpppp', + '104.hydro2d' => '104.hydro2d', + '110.applu' => '110.applu', + '103.su2cor' => '103.su2cor', + '146.wave5' => '146.wave5', + '-' => '-', + 'fpgrowth' => 'fpgrowth', + 'bsim' => 'boxed-sim', + 'namd' => 'NAMD', + 'povray' => 'povray31', + ); + + at LxxatexColumns = (1, 2, 19, # LOC, #MemInstrs, MaxSCC + 15,16, # Total/Collapsed nodes + 17, 18); # Max Size, GG Size + + at LatexColumns = (2, 21, 22, 23); # Type safety numbers + + +# Specify how to format columns nicely for printing... +%LatexColumnFormat = ( +# 11 => \&FormatSize, +# 12 => \&FormatSize, + 16 => \&NoStar, + 15 => \&NoCallNodes, + 18 => \&NoCallNodes + ); + + at Graphs = (["scatter", "timeVmem.txt", 27, 7], + ["scatter", "timeVloc.txt", 1, 7]); + + +# These are the columns for the report. The first entry is the header for the +# column, the second is the regex to use to match the value. Empty list create +# seperators, and closures may be put in for custom processing. + +my $USERSYSTTIME = '([0-9.]+)[ 0-9.]+$[^)]+$[ 0-9.]+$[^)]+$ +'; +( +# Name + ["Name:" , '\'([^\']+)\' Program'], + ["LOC:" , 'LOC: *([0-9]+)'], + ["MemInsts", '([0-9]+).*Number of memory instructions'], + [], +# Misc stuff + ["NumNodes", "TOTALNODES: *([0-9]+)"], + ["NumFold", "FOLDEDNODES: *([0-9]+)"], + [], + ["TypeSafeO", "ACCESSES TYPED_O: *([0-9]+)"], + ["NonTypeO", "ACCESSES UNTYPED_O: *([0-9]+)"], + ["TSO %" , sub { return TypeSafeRatio(@_); }], + [], + ["TypeSafe", "ACCESSES TYPED: *([0-9]+)"], + ["NonType", "ACCESSES UNTYPED: *([0-9]+)"], + ["TS %" , sub { return TypeSafeRatio(@_); }], + [], + ["Type1", "ACCESSES TYPED1: *([0-9]+)"], + ["Type2", "ACCESSES TYPED2: *([0-9]+)"], + ["Type3", "ACCESSES TYPED3: *([0-9]+)"], + ["Type4", "ACCESSES TYPED4: *([0-9]+)"], + ["I", "ACCESSES I: *([0-9]+)"], + ["E", "ACCESSES E: *([0-9]+)"], + ["U", "ACCESSES U: *([0-9]+)"], + [], +# Nodes Folded + [], + ["VAFUNC", "VARARGS_CALLS: *([0-9]+)"], + ["FUNCSPEC", "CLONED_FUNCSPEC: *([0-9]+)"], + ["INDCLONE", "CLONED_INDCLONE: *([0-9]+)"], + ["StdLibFold", "STD_LIB_FOLD: *([0-9]+)"], + ["Calls", "CALLS1: *([0-9]+)"], + ); Propchange: poolalloc/trunk/test/TEST.types.report ------------------------------------------------------------------------------ svn:executable = * From clattner at apple.com Wed Feb 16 19:19:26 2011 From: clattner at apple.com (Chris Lattner) Date: Wed, 16 Feb 2011 17:19:26 -0800 Subject: [llvm-commits] Fix floating point numbers in tests on MinGW In-Reply-To: <6AE1604EE3EC5F4296C096518C6B77EE17DD2905F9@mail.accesssoftek.com> References: <6AE1604EE3EC5F4296C096518C6B77EE1774A4AA26@mail.accesssoftek.com> <6AE1604EE3EC5F4296C096518C6B77EE17DD2905F9@mail.accesssoftek.com> Message-ID: <80010C5D-B584-408E-BC06-B502B639E0E6@apple.com> On Feb 16, 2011, at 8:21 AM, Danil Malyshev wrote: > Hello, > > A week passed and nobody else replyed yet, so it seems we are the only two who cares of this issue. :) > > Defining PRINTF_EXPONENT_DIGITS env is the suggested way to make MinGW ANSI/POSIX compatible. This is not only about the case we are discussing, but in general, I'd like to have explicitly defined compatibility mode for all the tests running on MinGW. > > I understand that it does not fix issues with scientific notation in general. It seems that you need to follow up with your patch, since you feel strong for it. This patch does not block you or affect you on any way. > > Could you or somebody else apply my patch, please? > I have attached it to this e-mail for convenience. This seems fine with me. Takumi, can you apply it if it looks good to you? -Chris From sabre at nondot.org Wed Feb 16 19:29:24 2011 From: sabre at nondot.org (Chris Lattner) Date: Thu, 17 Feb 2011 01:29:24 -0000 Subject: [llvm-commits] [llvm] r125700 - in /llvm/trunk: lib/Transforms/Scalar/Reassociate.cpp test/Transforms/Reassociate/optional-flags.ll Message-ID: <20110217012924.836362A6C12C@llvm.org> Author: lattner Date: Wed Feb 16 19:29:24 2011 New Revision: 125700 URL: http://llvm.org/viewvc/llvm-project?rev=125700&view=rev Log: fix PR9215, preventing -reassociate from clearing nsw/nuw when it swaps the LHS/RHS of a single binop. Modified: llvm/trunk/lib/Transforms/Scalar/Reassociate.cpp llvm/trunk/test/Transforms/Reassociate/optional-flags.ll Modified: llvm/trunk/lib/Transforms/Scalar/Reassociate.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/Reassociate.cpp?rev=125700&r1=125699&r2=125700&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/Reassociate.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/Reassociate.cpp Wed Feb 16 19:29:24 2011 @@ -348,9 +348,10 @@ I->setOperand(0, Ops[i].Op); I->setOperand(1, Ops[i+1].Op); - // Conservatively clear all the optional flags, which may not hold - // after the reassociation. - I->clearSubclassOptionalData(); + // Clear all the optional flags, which may not hold after the + // reassociation if the expression involved more than just this operation. + if (Ops.size() != 2) + I->clearSubclassOptionalData(); DEBUG(dbgs() << "TO: " << *I << '\n'); MadeChange = true; Modified: llvm/trunk/test/Transforms/Reassociate/optional-flags.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Reassociate/optional-flags.ll?rev=125700&r1=125699&r2=125700&view=diff ============================================================================== --- llvm/trunk/test/Transforms/Reassociate/optional-flags.ll (original) +++ llvm/trunk/test/Transforms/Reassociate/optional-flags.ll Wed Feb 16 19:29:24 2011 @@ -20,3 +20,10 @@ %z = add nsw i64 %y, %a ret i64 %z } + +; PR9215 +; CHECK: %s = add nsw i32 %y, %x +define i32 @test2(i32 %x, i32 %y) { + %s = add nsw i32 %x, %y + ret i32 %s +} From sabre at nondot.org Wed Feb 16 19:43:46 2011 From: sabre at nondot.org (Chris Lattner) Date: Thu, 17 Feb 2011 01:43:46 -0000 Subject: [llvm-commits] [llvm] r125702 - /llvm/trunk/lib/Target/README.txt Message-ID: <20110217014346.51DCB2A6C12C@llvm.org> Author: lattner Date: Wed Feb 16 19:43:46 2011 New Revision: 125702 URL: http://llvm.org/viewvc/llvm-project?rev=125702&view=rev Log: add some notes on compares + binops. Remove redundant entries. Modified: llvm/trunk/lib/Target/README.txt Modified: llvm/trunk/lib/Target/README.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/README.txt?rev=125702&r1=125701&r2=125702&view=diff ============================================================================== --- llvm/trunk/lib/Target/README.txt (original) +++ llvm/trunk/lib/Target/README.txt Wed Feb 16 19:43:46 2011 @@ -873,6 +873,12 @@ if ((a >> 2) > 5) bar (); } + +void neg_eq_cst(unsigned int a) { +if (-a == 123) +bar(); +} + All should simplify to a single comparison. All of these are currently not optimized with "clang -emit-llvm-bc | opt -std-compile-opts". @@ -2219,31 +2225,52 @@ //===---------------------------------------------------------------------===// -Some missed instcombine xforms (from GCC PR14753): +We should fold compares like this: -void bar (void); + %1266 = add nsw i32 %.84.i.i.i, 1 + %560 = add nsw i32 %556, 1 + %1267 = icmp slt i32 %1266, %560 + +to a single 'icmp slt' when the add's have a single use, since they are NSW. -void mask_gt (unsigned int a) { -/* This is equivalent to a > 15. */ -if ((a & ~7) > 8) -bar(); -} - -void neg_eq_cst(unsigned int a) { -if (-a == 123) -bar(); -} - -void minus_cst(unsigned int a) { -if (20 - a == 5) -bar(); -} +//===---------------------------------------------------------------------===// -void rotate_cst (unsigned a) { -a = (a << 10) | (a >> 22); -if (a == 123) -bar (); -} +We don't fold (icmp (add) (add)) unless the two adds only have a single use. +There are a lot of cases that we're refusing to fold in (e.g.) 256.bzip2, for +example: + + %indvar.next90 = add i64 %indvar89, 1 ;; Has 2 uses + %tmp96 = add i64 %tmp95, 1 ;; Has 1 use + %exitcond97 = icmp eq i64 %indvar.next90, %tmp96 + +We don't fold this because we don't want to introduce an overlapped live range +of the ivar. However if we can make this more aggressive without causing +performance issues in two ways: + +1. If *either* the LHS or RHS has a single use, we can definitely do the + transformation. In the overlapping liverange case we're trading one register + use for one fewer operation, which is a reasonable trade. Before doing this + we should verify that the llc output actually shrinks for some benchmarks. +2. If both ops have multiple uses, we can still fold it if the operations are + both sinkable to *after* the icmp (e.g. in a subsequent block) which doesn't + increase register pressure. + +There are a ton of icmp's we aren't simplifying because of the reg pressure +concern. Care is warranted here though because many of these are induction +variables and other cases that matter a lot to performance, like the above. +Here's a blob of code that you can drop into the bottom of visitICmp to see some +missed cases: + + { Value *A, *B, *C, *D; + if (match(Op0, m_Add(m_Value(A), m_Value(B))) && + match(Op1, m_Add(m_Value(C), m_Value(D))) && + (A == C || A == D || B == C || B == D)) { + errs() << "OP0 = " << *Op0 << " U=" << Op0->getNumUses() << "\n"; + errs() << "OP1 = " << *Op1 << " U=" << Op1->getNumUses() << "\n"; + errs() << "CMP = " << I << "\n\n"; + } + } //===---------------------------------------------------------------------===// + From nicholas at mxc.ca Wed Feb 16 20:19:22 2011 From: nicholas at mxc.ca (Nick Lewycky) Date: Thu, 17 Feb 2011 02:19:22 -0000 Subject: [llvm-commits] [llvm] r125709 - /llvm/trunk/docs/ProgrammersManual.html Message-ID: <20110217021922.E8D4A2A6C12C@llvm.org> Author: nicholas Date: Wed Feb 16 20:19:22 2011 New Revision: 125709 URL: http://llvm.org/viewvc/llvm-project?rev=125709&view=rev Log: Fix thinko, basic blocks are SESE. The exits may have many edges though. Modified: llvm/trunk/docs/ProgrammersManual.html Modified: llvm/trunk/docs/ProgrammersManual.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/ProgrammersManual.html?rev=125709&r1=125708&r2=125709&view=diff ============================================================================== --- llvm/trunk/docs/ProgrammersManual.html (original) +++ llvm/trunk/docs/ProgrammersManual.html Wed Feb 16 20:19:22 2011 @@ -3856,7 +3856,7 @@ Class
Superclass: Value
-
This class represents a single entry multiple exit section of the code, +
This class represents a single entry single exit section of the code, commonly known as a basic block by the compiler community. The BasicBlock class maintains a list of Instructions, which form the body of the block. From sabre at nondot.org Wed Feb 16 20:21:03 2011 From: sabre at nondot.org (Chris Lattner) Date: Thu, 17 Feb 2011 02:21:03 -0000 Subject: [llvm-commits] [llvm] r125710 - /llvm/trunk/test/Transforms/InstCombine/add2.ll Message-ID: <20110217022103.C73CE2A6C12C@llvm.org> Author: lattner Date: Wed Feb 16 20:21:03 2011 New Revision: 125710 URL: http://llvm.org/viewvc/llvm-project?rev=125710&view=rev Log: filecheckize Modified: llvm/trunk/test/Transforms/InstCombine/add2.ll Modified: llvm/trunk/test/Transforms/InstCombine/add2.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/add2.ll?rev=125710&r1=125709&r2=125710&view=diff ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/add2.ll (original) +++ llvm/trunk/test/Transforms/InstCombine/add2.ll Wed Feb 16 20:21:03 2011 @@ -1,4 +1,4 @@ -; RUN: opt < %s -instcombine -S | not grep add +; RUN: opt < %s -instcombine -S | FileCheck %s define i64 @test1(i64 %A, i32 %B) { %tmp12 = zext i32 %B to i64 @@ -6,19 +6,30 @@ %tmp5 = add i64 %tmp3, %A %tmp6 = and i64 %tmp5, 123 ret i64 %tmp6 +; CHECK: @test1 +; CHECK-NEXT: and i64 %A, 123 +; CHECK-NEXT: ret i64 } -define i32 @test3(i32 %A) { +define i32 @test2(i32 %A) { %B = and i32 %A, 7 %C = and i32 %A, 32 %F = add i32 %B, %C ret i32 %F +; CHECK: @test2 +; CHECK-NEXT: and i32 %A, 39 +; CHECK-NEXT: ret i32 } -define i32 @test4(i32 %A) { +define i32 @test3(i32 %A) { %B = and i32 %A, 128 %C = lshr i32 %A, 30 %F = add i32 %B, %C ret i32 %F +; CHECK: @test3 +; CHECK-NEXT: and +; CHECK-NEXT: lshr +; CHECK-NEXT: or i32 %B, %C +; CHECK-NEXT: ret i32 } From sabre at nondot.org Wed Feb 16 20:23:02 2011 From: sabre at nondot.org (Chris Lattner) Date: Thu, 17 Feb 2011 02:23:02 -0000 Subject: [llvm-commits] [llvm] r125711 - in /llvm/trunk: lib/Transforms/InstCombine/InstCombineAddSub.cpp test/Transforms/InstCombine/add2.ll Message-ID: <20110217022302.D26322A6C12C@llvm.org> Author: lattner Date: Wed Feb 16 20:23:02 2011 New Revision: 125711 URL: http://llvm.org/viewvc/llvm-project?rev=125711&view=rev Log: preserve NUW/NSW when transforming add x,x Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineAddSub.cpp llvm/trunk/test/Transforms/InstCombine/add2.ll Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineAddSub.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineAddSub.cpp?rev=125711&r1=125710&r2=125711&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/InstCombine/InstCombineAddSub.cpp (original) +++ llvm/trunk/lib/Transforms/InstCombine/InstCombineAddSub.cpp Wed Feb 16 20:23:02 2011 @@ -147,8 +147,13 @@ return BinaryOperator::CreateXor(LHS, RHS); // X + X --> X << 1 - if (LHS == RHS && I.getType()->isIntegerTy()) - return BinaryOperator::CreateShl(LHS, ConstantInt::get(I.getType(), 1)); + if (LHS == RHS && I.getType()->isIntegerTy()) { + BinaryOperator *New = + BinaryOperator::CreateShl(LHS, ConstantInt::get(I.getType(), 1)); + New->setHasNoSignedWrap(I.hasNoSignedWrap()); + New->setHasNoUnsignedWrap(I.hasNoUnsignedWrap()); + return New; + } // -A + B --> B - A // -A + -B --> -(A + B) Modified: llvm/trunk/test/Transforms/InstCombine/add2.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/add2.ll?rev=125711&r1=125710&r2=125711&view=diff ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/add2.ll (original) +++ llvm/trunk/test/Transforms/InstCombine/add2.ll Wed Feb 16 20:23:02 2011 @@ -33,3 +33,11 @@ ; CHECK-NEXT: ret i32 } +define i32 @test4(i32 %A) { + %B = add nuw i32 %A, %A + ret i32 %B +; CHECK: @test4 +; CHECK-NEXT: %B = shl nuw i32 %A, 1 +; CHECK-NEXT: ret i32 %B +} + From aggarwa4 at illinois.edu Wed Feb 16 21:22:08 2011 From: aggarwa4 at illinois.edu (Arushi Aggarwal) Date: Thu, 17 Feb 2011 03:22:08 -0000 Subject: [llvm-commits] [poolalloc] r125719 - /poolalloc/trunk/lib/DSA/StdLibPass.cpp Message-ID: <20110217032208.A31E92A6C12C@llvm.org> Author: aggarwa4 Date: Wed Feb 16 21:22:08 2011 New Revision: 125719 URL: http://llvm.org/viewvc/llvm-project?rev=125719&view=rev Log: Adding a few more functions. Modified: poolalloc/trunk/lib/DSA/StdLibPass.cpp Modified: poolalloc/trunk/lib/DSA/StdLibPass.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/StdLibPass.cpp?rev=125719&r1=125718&r2=125719&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/StdLibPass.cpp (original) +++ poolalloc/trunk/lib/DSA/StdLibPass.cpp Wed Feb 16 21:22:08 2011 @@ -101,6 +101,7 @@ {"gets", {NRET_NARGS, YRET_YARGS, NRET_NARGS, YRET_YNARGS, false}}, {"fgets", {NRET_NYARGS, YRET_YNARGS, NRET_NARGS, YRET_YNARGS, false}}, {"getc", {NRET_YNARGS, YRET_YNARGS, NRET_NARGS, NRET_NARGS, false}}, + {"ungetc", {NRET_YNARGS, YRET_YARGS, NRET_NARGS, NRET_NARGS, false}}, {"_IO_getc", {NRET_YNARGS, YRET_YNARGS, NRET_NARGS, NRET_NARGS, false}}, {"fgetc", {NRET_YNARGS, YRET_YNARGS, NRET_NARGS, NRET_NARGS, false}}, {"putc", {NRET_NARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, @@ -176,6 +177,7 @@ {"unlink", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, {"perror", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"__errno_location", {NRET_NARGS, YRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, // SAFECode Intrinsics {"sc.lscheck", {NRET_NARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, From aggarwa4 at illinois.edu Wed Feb 16 21:24:58 2011 From: aggarwa4 at illinois.edu (Arushi Aggarwal) Date: Thu, 17 Feb 2011 03:24:58 -0000 Subject: [llvm-commits] [poolalloc] r125720 - in /poolalloc/trunk/lib/DSA: DSGraph.cpp Local.cpp Message-ID: <20110217032458.373762A6C12C@llvm.org> Author: aggarwa4 Date: Wed Feb 16 21:24:58 2011 New Revision: 125720 URL: http://llvm.org/viewvc/llvm-project?rev=125720&view=rev Log: 1. Add some simple type inference optimizations. 2. Remove some code that was added to handle ugly geps. We hopefully dont need that now. 3. Assume globals dont need to marked I after local unless they are passed as args. Modified: poolalloc/trunk/lib/DSA/DSGraph.cpp poolalloc/trunk/lib/DSA/Local.cpp Modified: poolalloc/trunk/lib/DSA/DSGraph.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DSGraph.cpp?rev=125720&r1=125719&r2=125720&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/DSGraph.cpp (original) +++ poolalloc/trunk/lib/DSA/DSGraph.cpp Wed Feb 16 21:24:58 2011 @@ -59,6 +59,8 @@ cl::init(false)); } +extern cl::opt TypeInferenceOptimize; + // Determines if the DSGraph 'should' have a node for a given value. static bool shouldHaveNodeForValue(const Value *V) { // Peer through casts @@ -655,12 +657,14 @@ markIncomplete(*I); // Mark all global nodes as incomplete that aren't initialized and constant. - if ((Flags & DSGraph::IgnoreGlobals) == 0) + if ((Flags & DSGraph::IgnoreGlobals) == 0) for (DSScalarMap::global_iterator I = ScalarMap.global_begin(), E = ScalarMap.global_end(); I != E; ++I) - if (const GlobalVariable *GV = dyn_cast(*I)) - if (!(GV->hasInitializer() && GV->isConstant())) - markIncompleteNode(ScalarMap[GV].getNode()); + if (const GlobalVariable *GV = dyn_cast(*I)) { + if (!(GV->hasInitializer() && GV->isConstant())){ + markIncompleteNode(ScalarMap[GV].getNode()); + } + } // Mark any node with the VAStart flag as incomplete. if (Flags & DSGraph::MarkVAStart) { @@ -741,9 +745,14 @@ const Function &F = *FI->first; // Mark its arguments, return value (and vanode) as external. for (Function::const_arg_iterator I = F.arg_begin(), E = F.arg_end(); - I != E; ++I) + I != E; ++I){ + if(TypeInferenceOptimize) { + if(I->getNameStr() == "argv") + continue; + } if (isa(I->getType())) markExternalNode(getNodeForValue(I).getNode(), processedNodes); + } markExternalNode(FI->second.getNode(), processedNodes); markExternalNode(getVANodeFor(F).getNode(), processedNodes); } @@ -791,6 +800,17 @@ for (DSScalarMap::global_iterator I = ScalarMap.global_begin(), E = ScalarMap.global_end(); I != E; ++I) { if (const GlobalVariable *GV = dyn_cast(*I)) { + if(TypeInferenceOptimize) { + if(GV->getNameStr() == "stderr"){ + continue; + } + if(GV->getNameStr() == "stdout"){ + continue; + } + if(GV->getNameStr() == "stdin"){ + continue; + } + } // If the global is external... mark it as such! DSNode * N = ScalarMap[GV].getNode(); if (!(GV->hasInternalLinkage() || GV->hasPrivateLinkage()) || N->isExternalNode()) Modified: poolalloc/trunk/lib/DSA/Local.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/Local.cpp?rev=125720&r1=125719&r2=125720&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/Local.cpp (original) +++ poolalloc/trunk/lib/DSA/Local.cpp Wed Feb 16 21:24:58 2011 @@ -45,19 +45,17 @@ STATISTIC(NumIndirectCall, "Number of indirect calls added"); STATISTIC(NumAsmCall, "Number of asm calls collapsed/seen"); STATISTIC(NumIntrinsicCall, "Number of intrinsics called"); -STATISTIC(NumUglyGep, "Number of uglygeps"); -STATISTIC(NumUglyGep1, "Number of uglygeps caught"); RegisterPass X("dsa-local", "Local Data Structure Analysis"); cl::opt hasMagicSections("dsa-magic-sections", cl::desc("File with section to global mapping")); //, cl::ReallyHidden); -static cl::opt TypeInferenceOptimize("enable-type-inference-opts", - cl::desc("Enable Type Inference Optimizations added to DSA."), - cl::Hidden, - cl::init(false)); } +cl::opt TypeInferenceOptimize("enable-type-inference-opts", + cl::desc("Enable Type Inference Optimizations added to DSA."), + cl::Hidden, + cl::init(false)); namespace { //===--------------------------------------------------------------------===// @@ -208,53 +206,6 @@ void mergeFunction(Function* F) { getValueDest(F); } }; - static bool handleUglygep(GetElementPtrInst *GEPInst, int *Offset) { - int O = 0; - llvm::Value* Val = GEPInst->getOperand(1); - if(isa(Val)) { - O = (cast(Val))->getSExtValue(); - } else { - std::vector exprs; - while(!isa(Val)){ - exprs.push_back(Val); - if(BinaryOperator *BI = dyn_cast(Val)){ - if(!isa(BI->getOperand(1))){ - return false; - } - Val = BI->getOperand(0); - }else { - return false; - } - } - PHINode *phi = cast(Val); - if(phi->getNumIncomingValues() > 3){ - return false; - } - if(isa(phi->getIncomingValue(1))) - O = (cast(phi->getIncomingValue(1)))->getSExtValue(); - else if(isa(phi->getIncomingValue(0))) - O = (cast(phi->getIncomingValue(0)))->getSExtValue(); - else if(isa(phi->getIncomingValue(2))) - O = (cast(phi->getIncomingValue(2)))->getSExtValue(); - while (!exprs.empty()) { - llvm::Value* V = exprs.back(); - exprs.pop_back(); - BinaryOperator *BI = cast(V); - unsigned O1 = (cast(BI->getOperand(1)))->getSExtValue(); - switch(BI->getOpcode()){ - case llvm::BinaryOperator::Shl: O = O << O1;break; - case llvm::BinaryOperator::Or: O = O | O1;break; - case llvm::BinaryOperator::And: O = O & O1;break; - case llvm::BinaryOperator::Add: O = O + O1;break; - case llvm::BinaryOperator::Sub: O = O - O1;break; - case llvm::BinaryOperator::Mul: O = O * O1;break; - default: errs() <<"NOT HANDLED : " << BI << "\n";return false; - } - } - } - *Offset = O; - return true; - } /// Traverse the whole DSGraph, and propagate the unknown flags through all /// out edges. static void propagateUnknownFlag(DSGraph * G) { @@ -548,6 +499,8 @@ return; } + if(GEP.use_empty()) + return; // // Okay, no easy way out. Calculate the offset into the object being // indexed. @@ -555,50 +508,6 @@ int Offset = 0; - if(TypeInferenceOptimize) { - // Trying to special case constant index GEPs - if(GetElementPtrInst *GEPInst = dyn_cast(&GEP)) { - if(GEPInst->hasAllConstantIndices()){ - if(GEPInst->getType() == - llvm::Type::getInt8PtrTy(GEPInst->getParent()->getParent()->getContext())) - if(GEPInst->getNumIndices() == 1) { - Offset = (cast(GEPInst->getOperand(1)))->getSExtValue(); - if(Value.getNode()->getSize() <= Value.getOffset() + (Offset+1)) { - Value.getNode()->growSize(Value.getOffset() + Offset + 1); - } - Value.setOffset(Value.getOffset()+Offset); - DSNode *N = Value.getNode(); - if(((int)Value.getOffset() + Offset) < 0) - N->foldNodeCompletely(); - setDestTo(GEP, Value); - return; - } - } - } - } - - if(TypeInferenceOptimize) { - if(GetElementPtrInst *GEPInst = dyn_cast(&GEP)) { - std::string name = GEPInst->getName(); - if (strncmp(name.c_str(), "uglygep", 7) == 0) { - ++NumUglyGep; - assert(GEPInst->getNumOperands() == 2); - int O; - if(handleUglygep(GEPInst, &O)) { - if(Value.getNode()->getSize() <= Value.getOffset() + O+1) - Value.getNode()->growSize(Value.getOffset() + O+1); - Value.setOffset(Value.getOffset()+O); - DSNode *N = Value.getNode(); - if(((int)Value.getOffset() + O) < 0) - N->foldNodeCompletely(); - setDestTo(GEP, Value); - ++NumUglyGep1; - return; - } - } - } - } - // FIXME: I am not sure if the code below is completely correct (especially // if we start doing fancy analysis on non-constant array indices). // What if the array is indexed using a larger index than its declared @@ -631,18 +540,20 @@ if (requiredSize > Value.getNode()->getSize()) Value.getNode()->growSize(requiredSize); } - Offset += (unsigned)TD.getStructLayout(STy)->getElementOffset(FieldNo); + if(TypeInferenceOptimize) { + if(const ArrayType* AT = dyn_cast(STy->getTypeAtIndex(FieldNo))) { + Value.getNode()->mergeTypeInfo(AT, Value.getOffset() + Offset); + if((++I) == E) { + break; + } + } + } } else if(const ArrayType *ATy = dyn_cast(*I)) { // indexing into an array. Value.getNode()->setArrayMarker(); const Type *CurTy = ATy->getElementType(); - if(TypeInferenceOptimize) { - //if(const ConstantInt* CUI = dyn_cast(I.getOperand())) - //if(ATy->getNumElements() > CUI->getZExtValue()) - //CUI->dump(); - } if(!isa(CurTy) && Value.getNode()->getSize() <= 0) { @@ -847,8 +758,7 @@ // Merge the first & second arguments, and mark the memory read and // modified. DSNodeHandle RetNH = getValueDest(*CS.arg_begin()); - if(!TypeInferenceOptimize) - RetNH.mergeWith(getValueDest(*(CS.arg_begin()+1))); + RetNH.mergeWith(getValueDest(*(CS.arg_begin()+1))); if (DSNode *N = RetNH.getNode()) N->setModifiedMarker()->setReadMarker(); return true; @@ -1281,6 +1191,7 @@ // collecting them in a list, to be used as target for call sites that // cant be resolved. formGlobalFunctionList(); + GlobalsGraph->maskIncompleteMarkers(); // Calculate all of the graphs... for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) @@ -1292,11 +1203,18 @@ propagateUnknownFlag(G); callgraph.insureEntry(I); G->buildCallGraph(callgraph, GlobalFunctionList, true); + G->maskIncompleteMarkers(); + G->markIncompleteNodes(DSGraph::MarkFormalArgs + |DSGraph::IgnoreGlobals); + cloneIntoGlobals(G, DSGraph::DontCloneCallNodes | + DSGraph::DontCloneAuxCallNodes | + DSGraph::StripAllocaBit); DEBUG(G->AssertGraphOK()); } //GlobalsGraph->removeTriviallyDeadNodes(); - GlobalsGraph->markIncompleteNodes(DSGraph::MarkFormalArgs); + GlobalsGraph->markIncompleteNodes(DSGraph::MarkFormalArgs + |DSGraph::IgnoreGlobals); GlobalsGraph->computeExternalFlags(DSGraph::ProcessCallSites); // Now that we've computed all of the graphs, and merged all of the info into @@ -1306,6 +1224,16 @@ formGlobalECs(); propagateUnknownFlag(GlobalsGraph); + for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) + if (!I->isDeclaration()) { + DSGraph *Graph = getOrCreateGraph(I); + Graph->maskIncompleteMarkers(); + cloneGlobalsInto(Graph, DSGraph::DontCloneCallNodes | + DSGraph::DontCloneAuxCallNodes); + Graph->markIncompleteNodes(DSGraph::MarkFormalArgs + |DSGraph::IgnoreGlobals); + } + return false; } From grosser at fim.uni-passau.de Wed Feb 16 21:52:20 2011 From: grosser at fim.uni-passau.de (Tobias Grosser) Date: Wed, 16 Feb 2011 22:52:20 -0500 Subject: [llvm-commits] [llvm] r125709 - /llvm/trunk/docs/ProgrammersManual.html In-Reply-To: <20110217021922.E8D4A2A6C12C@llvm.org> References: <20110217021922.E8D4A2A6C12C@llvm.org> Message-ID: <4D5C9B74.3090406@fim.uni-passau.de> On 02/16/2011 09:19 PM, Nick Lewycky wrote: > Author: nicholas > Date: Wed Feb 16 20:19:22 2011 > New Revision: 125709 > > URL: http://llvm.org/viewvc/llvm-project?rev=125709&view=rev > Log: > Fix thinko, basic blocks are SESE. The exits may have many edges though. > > Modified: > llvm/trunk/docs/ProgrammersManual.html > > Modified: llvm/trunk/docs/ProgrammersManual.html > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/ProgrammersManual.html?rev=125709&r1=125708&r2=125709&view=diff > ============================================================================== > --- llvm/trunk/docs/ProgrammersManual.html (original) > +++ llvm/trunk/docs/ProgrammersManual.html Wed Feb 16 20:19:22 2011 > @@ -3856,7 +3856,7 @@ > Class
> Superclass:Value
> > -
This class represents a single entry multiple exit section of the code, > +
This class represents a single entry single exit section of the code, Hi Nick, for me this sentence is a little confusing. What do you consider the entry and the exit of a basic block? As far as I understand single entry single exit regions commonly refer to subgraphs of the CFG that have only a single entry EDGE and a single exit EDGE. Following this definition a basic block can actually be a multiple entry multiple exit region. You could argue the first and the last instruction of a basic block are the single entry and the single exit. However, without explanation this is not obvious to me. What about changing the sentence to: "The BasicBlock class represents a section of code that is executed sequentially and does not contain any diverging control flow." or to rewrite more of this "The BasicBlock class represents a list of instructions that is executed sequentially without diverging control flow in between. Matching the language definition, the last element of this list of instructions is always a terminator instruction (a subclass of the TerminatorInst class). The terminator instruction is the only instruction after which the control flow may diverge." Cheers Tobi From scshunt at csclub.uwaterloo.ca Wed Feb 16 21:30:09 2011 From: scshunt at csclub.uwaterloo.ca (Sean Hunt) Date: Thu, 17 Feb 2011 03:30:09 -0000 Subject: [llvm-commits] [llvm] r125721 - /llvm/trunk/utils/TableGen/ClangAttrEmitter.cpp Message-ID: <20110217033009.E3F9B2A6C12C@llvm.org> Author: coppro Date: Wed Feb 16 21:30:09 2011 New Revision: 125721 URL: http://llvm.org/viewvc/llvm-project?rev=125721&view=rev Log: Add serialization for Expr* arguments for attributes to clang tablegen files. Patch thanks to Zach Anderson. Modified: llvm/trunk/utils/TableGen/ClangAttrEmitter.cpp Modified: llvm/trunk/utils/TableGen/ClangAttrEmitter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/ClangAttrEmitter.cpp?rev=125721&r1=125720&r2=125721&view=diff ============================================================================== --- llvm/trunk/utils/TableGen/ClangAttrEmitter.cpp (original) +++ llvm/trunk/utils/TableGen/ClangAttrEmitter.cpp Wed Feb 16 21:30:09 2011 @@ -45,6 +45,7 @@ .EndsWith("Decl *", "cast_or_null<" + std::string(type, 0, type.size()-1) + ">(GetDecl(Record[Idx++]))") .Case("QualType", "GetType(Record[Idx++])") + .Case("Expr *", "ReadSubExpr()") .Default("Record[Idx++]"); } @@ -54,6 +55,7 @@ .EndsWith("Decl *", "AddDeclRef(" + std::string(name) + ", Record);\n") .Case("QualType", "AddTypeRef(" + std::string(name) + ", Record);\n") + .Case("Expr *", "AddStmt(" + std::string(name) + ");\n") .Default("Record.push_back(" + std::string(name) + ");\n"); } From pawel.kunio at gmail.com Wed Feb 16 23:13:40 2011 From: pawel.kunio at gmail.com (pawel kunio) Date: Thu, 17 Feb 2011 07:13:40 +0200 Subject: [llvm-commits] my 2nd attempt at now-infamous PR889 Message-ID: Hello, In a meantime of preparing 2 tests for PR9067, I came with my 2nd and hopefully now more successful attempt at now-infamous PR889 devirtualize Value destructor. Please find patches for llvm and clang attached to this mail. As I can see from mingw build environment, it will need moving PseudoSourceValue.cpp from lib/CodeGen to lib/VMCore after applying patch (seems not to be required on vc build env, as order of libraries given to linker is not meaningful there). Please note that destructors have been moved into protected part of interface as well as empty destructors were implemented for all Value-derived classes to help in catching all destructions. Best regards, -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110217/92313f9d/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: llvm_Value_destr_devirtualize.patch Type: application/octet-stream Size: 118479 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110217/92313f9d/attachment-0002.obj -------------- next part -------------- A non-text attachment was scrubbed... Name: clang_Value_destr_devirtualize.patch Type: application/octet-stream Size: 2709 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110217/92313f9d/attachment-0003.obj From geek4civic at gmail.com Wed Feb 16 23:56:42 2011 From: geek4civic at gmail.com (NAKAMURA Takumi) Date: Thu, 17 Feb 2011 05:56:42 -0000 Subject: [llvm-commits] [llvm] r125725 - /llvm/trunk/utils/lit/lit/TestingConfig.py Message-ID: <20110217055642.25F1C2A6C12C@llvm.org> Author: chapuni Date: Wed Feb 16 23:56:41 2011 New Revision: 125725 URL: http://llvm.org/viewvc/llvm-project?rev=125725&view=rev Log: lit/TestingConfig.py: Add the environment variable PRINTF_EXPONENT_DIGITS as workaround [PR6745] for mingw's tests. Danil Malyshev suggested this. FIXME: It does not improve MSVC's issue. [Danil Malyshev] Defining PRINTF_EXPONENT_DIGITS env is the suggested way to make MinGW ANSI/POSIX compatible. This is not only about the case we are discussing, but in general, I'd like to have explicitly defined compatibility mode for all the tests running on MinGW. Modified: llvm/trunk/utils/lit/lit/TestingConfig.py Modified: llvm/trunk/utils/lit/lit/TestingConfig.py URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit/TestingConfig.py?rev=125725&r1=125724&r2=125725&view=diff ============================================================================== --- llvm/trunk/utils/lit/lit/TestingConfig.py (original) +++ llvm/trunk/utils/lit/lit/TestingConfig.py Wed Feb 16 23:56:41 2011 @@ -17,6 +17,7 @@ 'PATHEXT' : os.environ.get('PATHEXT',''), 'SYSTEMROOT' : os.environ.get('SYSTEMROOT',''), 'LLVM_DISABLE_CRT_DEBUG' : '1', + 'PRINTF_EXPONENT_DIGITS' : '2', } config = TestingConfig(parent, From geek4civic at gmail.com Thu Feb 17 00:02:59 2011 From: geek4civic at gmail.com (NAKAMURA Takumi) Date: Thu, 17 Feb 2011 15:02:59 +0900 Subject: [llvm-commits] Fix floating point numbers in tests on MinGW In-Reply-To: <6AE1604EE3EC5F4296C096518C6B77EE17DD2905F9@mail.accesssoftek.com> References: <6AE1604EE3EC5F4296C096518C6B77EE1774A4AA26@mail.accesssoftek.com> <6AE1604EE3EC5F4296C096518C6B77EE17DD2905F9@mail.accesssoftek.com> Message-ID: Danil, Committed in r125725! On Thu, Feb 17, 2011 at 1:21 AM, Danil Malyshev wrote: > A week passed and nobody else replyed yet, so it seems we are the only two who cares of this issue. :) I guess few persons would watch mingw. :D In my impression, there are many users with msvc in win32sphere. > I understand that it does not fix issues with scientific notation in general. It seems that you need to follow up with your patch, since you feel strong for it. This patch does not block you or affect you on any way. Please watch on PR6745, thank you! I will revert it in my local repo, to fix the issue. ...Takumi From zwarich at apple.com Thu Feb 17 00:13:44 2011 From: zwarich at apple.com (Cameron Zwarich) Date: Thu, 17 Feb 2011 06:13:44 -0000 Subject: [llvm-commits] [llvm] r125726 - /llvm/trunk/lib/CodeGen/PHIElimination.cpp Message-ID: <20110217061344.20B3E2A6C12C@llvm.org> Author: zwarich Date: Thu Feb 17 00:13:43 2011 New Revision: 125726 URL: http://llvm.org/viewvc/llvm-project?rev=125726&view=rev Log: Return Changed from SplitPHIEdges rather than always returning true. Modified: llvm/trunk/lib/CodeGen/PHIElimination.cpp Modified: llvm/trunk/lib/CodeGen/PHIElimination.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PHIElimination.cpp?rev=125726&r1=125725&r2=125726&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/PHIElimination.cpp (original) +++ llvm/trunk/lib/CodeGen/PHIElimination.cpp Thu Feb 17 00:13:43 2011 @@ -423,5 +423,5 @@ } } } - return true; + return Changed; } From zwarich at apple.com Thu Feb 17 00:13:46 2011 From: zwarich at apple.com (Cameron Zwarich) Date: Thu, 17 Feb 2011 06:13:46 -0000 Subject: [llvm-commits] [llvm] r125727 - /llvm/trunk/lib/CodeGen/PHIElimination.cpp Message-ID: <20110217061346.C89222A6C12D@llvm.org> Author: zwarich Date: Thu Feb 17 00:13:46 2011 New Revision: 125727 URL: http://llvm.org/viewvc/llvm-project?rev=125727&view=rev Log: Adjust indenting of arguments. Modified: llvm/trunk/lib/CodeGen/PHIElimination.cpp Modified: llvm/trunk/lib/CodeGen/PHIElimination.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PHIElimination.cpp?rev=125727&r1=125726&r2=125727&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/PHIElimination.cpp (original) +++ llvm/trunk/lib/CodeGen/PHIElimination.cpp Thu Feb 17 00:13:46 2011 @@ -393,9 +393,9 @@ } bool PHIElimination::SplitPHIEdges(MachineFunction &MF, - MachineBasicBlock &MBB, - LiveVariables &LV, - MachineLoopInfo *MLI) { + MachineBasicBlock &MBB, + LiveVariables &LV, + MachineLoopInfo *MLI) { if (MBB.empty() || !MBB.front().isPHI() || MBB.isLandingPad()) return false; // Quick exit for basic blocks without PHIs. From zwarich at apple.com Thu Feb 17 00:52:07 2011 From: zwarich at apple.com (Cameron Zwarich) Date: Thu, 17 Feb 2011 06:52:07 -0000 Subject: [llvm-commits] [llvm] r125728 - /llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp Message-ID: <20110217065207.B3F652A6C12C@llvm.org> Author: zwarich Date: Thu Feb 17 00:52:07 2011 New Revision: 125728 URL: http://llvm.org/viewvc/llvm-project?rev=125728&view=rev Log: Switch to SmallVector in SimpleRegisterCoalescing for a 3.5% speedup on 403.gcc. Modified: llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp Modified: llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp?rev=125728&r1=125727&r2=125728&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp (original) +++ llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp Thu Feb 17 00:52:07 2011 @@ -1425,9 +1425,9 @@ std::vector &TryAgain) { DEBUG(dbgs() << MBB->getName() << ":\n"); - std::vector VirtCopies; - std::vector PhysCopies; - std::vector ImpDefCopies; + SmallVector VirtCopies; + SmallVector PhysCopies; + SmallVector ImpDefCopies; for (MachineBasicBlock::iterator MII = MBB->begin(), E = MBB->end(); MII != E;) { MachineInstr *Inst = MII++; From baldrick at free.fr Thu Feb 17 01:23:15 2011 From: baldrick at free.fr (Duncan Sands) Date: Thu, 17 Feb 2011 07:23:15 -0000 Subject: [llvm-commits] [dragonegg] r125732 - /dragonegg/trunk/gcc_revision_tested_with Message-ID: <20110217072315.8FBEB2A6C12C@llvm.org> Author: baldrick Date: Thu Feb 17 01:23:15 2011 New Revision: 125732 URL: http://llvm.org/viewvc/llvm-project?rev=125732&view=rev Log: Bump the gcc revision used by the buildbots. Modified: dragonegg/trunk/gcc_revision_tested_with Modified: dragonegg/trunk/gcc_revision_tested_with URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/gcc_revision_tested_with?rev=125732&r1=125731&r2=125732&view=diff ============================================================================== --- dragonegg/trunk/gcc_revision_tested_with (original) +++ dragonegg/trunk/gcc_revision_tested_with Thu Feb 17 01:23:15 2011 @@ -1 +1 @@ -163634 +168940 From fvbommel at gmail.com Thu Feb 17 01:29:13 2011 From: fvbommel at gmail.com (Frits van Bommel) Date: Thu, 17 Feb 2011 08:29:13 +0100 Subject: [llvm-commits] [llvm] r125711 - in /llvm/trunk: lib/Transforms/InstCombine/InstCombineAddSub.cpp test/Transforms/InstCombine/add2.ll In-Reply-To: <20110217022302.D26322A6C12C@llvm.org> References: <20110217022302.D26322A6C12C@llvm.org> Message-ID: On Thu, Feb 17, 2011 at 3:23 AM, Chris Lattner wrote: > ? // X + X --> X << 1 > - ?if (LHS == RHS && I.getType()->isIntegerTy()) > - ? ?return BinaryOperator::CreateShl(LHS, ConstantInt::get(I.getType(), 1)); > + ?if (LHS == RHS && I.getType()->isIntegerTy()) { I think the isIntegerTy() check is redundant now that fadd has its own operator. From baldrick at free.fr Thu Feb 17 01:46:37 2011 From: baldrick at free.fr (Duncan Sands) Date: Thu, 17 Feb 2011 07:46:37 -0000 Subject: [llvm-commits] [llvm] r125734 - in /llvm/trunk: lib/Transforms/InstCombine/InstCombineCompares.cpp test/Transforms/InstCombine/icmp.ll Message-ID: <20110217074637.C00232A6C12C@llvm.org> Author: baldrick Date: Thu Feb 17 01:46:37 2011 New Revision: 125734 URL: http://llvm.org/viewvc/llvm-project?rev=125734&view=rev Log: Transform "A + B >= A + C" into "B >= C" if the adds do not wrap. Likewise for some variations (some of these were already present so I unified the code). Spotted by my auto-simplifier as occurring a lot. Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp llvm/trunk/test/Transforms/InstCombine/icmp.ll Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp?rev=125734&r1=125733&r2=125734&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp (original) +++ llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp Thu Feb 17 01:46:37 2011 @@ -698,13 +698,6 @@ if (Pred == ICmpInst::ICMP_NE) return ReplaceInstUsesWith(ICI, ConstantInt::getTrue(X->getContext())); - // If this is an instruction (as opposed to constantexpr) get NUW/NSW info. - bool isNUW = false, isNSW = false; - if (BinaryOperator *Add = dyn_cast(TheAdd)) { - isNUW = Add->hasNoUnsignedWrap(); - isNSW = Add->hasNoSignedWrap(); - } - // From this point on, we know that (X+C <= X) --> (X+C < X) because C != 0, // so the values can never be equal. Similiarly for all other "or equals" // operators. @@ -713,10 +706,6 @@ // (X+2) X >u (MAXUINT-2) --> X > 253 // (X+MAXUINT) X >u (MAXUINT-MAXUINT) --> X != 0 if (Pred == ICmpInst::ICMP_ULT || Pred == ICmpInst::ICMP_ULE) { - // If this is an NUW add, then this is always false. - if (isNUW) - return ReplaceInstUsesWith(ICI, ConstantInt::getFalse(X->getContext())); - Value *R = ConstantExpr::getSub(ConstantInt::getAllOnesValue(CI->getType()), CI); return new ICmpInst(ICmpInst::ICMP_UGT, X, R); @@ -725,12 +714,8 @@ // (X+1) >u X --> X X != 255 // (X+2) >u X --> X X u X --> X X X == 0 - if (Pred == ICmpInst::ICMP_UGT || Pred == ICmpInst::ICMP_UGE) { - // If this is an NUW add, then this is always true. - if (isNUW) - return ReplaceInstUsesWith(ICI, ConstantInt::getTrue(X->getContext())); + if (Pred == ICmpInst::ICMP_UGT || Pred == ICmpInst::ICMP_UGE) return new ICmpInst(ICmpInst::ICMP_ULT, X, ConstantExpr::getNeg(CI)); - } unsigned BitWidth = CI->getType()->getPrimitiveSizeInBits(); ConstantInt *SMax = ConstantInt::get(X->getContext(), @@ -742,16 +727,8 @@ // (X+MINSINT) X >s (MAXSINT-MINSINT) --> X >s -1 // (X+ -2) X >s (MAXSINT- -2) --> X >s 126 // (X+ -1) X >s (MAXSINT- -1) --> X != 127 - if (Pred == ICmpInst::ICMP_SLT || Pred == ICmpInst::ICMP_SLE) { - // If this is an NSW add, then we have two cases: if the constant is - // positive, then this is always false, if negative, this is always true. - if (isNSW) { - bool isTrue = CI->getValue().isNegative(); - return ReplaceInstUsesWith(ICI, ConstantInt::get(ICI.getType(), isTrue)); - } - + if (Pred == ICmpInst::ICMP_SLT || Pred == ICmpInst::ICMP_SLE) return new ICmpInst(ICmpInst::ICMP_SGT, X, ConstantExpr::getSub(SMax, CI)); - } // (X+ 1) >s X --> X X != 127 // (X+ 2) >s X --> X X s X --> X X s X --> X X == -128 - // If this is an NSW add, then we have two cases: if the constant is - // positive, then this is always true, if negative, this is always false. - if (isNSW) { - bool isTrue = !CI->getValue().isNegative(); - return ReplaceInstUsesWith(ICI, ConstantInt::get(ICI.getType(), isTrue)); - } - assert(Pred == ICmpInst::ICMP_SGT || Pred == ICmpInst::ICMP_SGE); Constant *C = ConstantInt::get(X->getContext(), CI->getValue()-1); return new ICmpInst(ICmpInst::ICMP_SLT, X, ConstantExpr::getSub(SMax, C)); @@ -2263,60 +2233,115 @@ if (Instruction *R = visitICmpInstWithCastAndCast(I)) return R; } - - // See if it's the same type of instruction on the left and right. - if (BinaryOperator *Op0I = dyn_cast(Op0)) { - if (BinaryOperator *Op1I = dyn_cast(Op1)) { - if (Op0I->getOpcode() == Op1I->getOpcode() && Op0I->hasOneUse() && - Op1I->hasOneUse() && Op0I->getOperand(1) == Op1I->getOperand(1)) { - switch (Op0I->getOpcode()) { - default: break; - case Instruction::Add: - case Instruction::Sub: - case Instruction::Xor: - if (I.isEquality()) // a+x icmp eq/ne b+x --> a icmp b - return new ICmpInst(I.getPredicate(), Op0I->getOperand(0), - Op1I->getOperand(0)); - // icmp u/s (a ^ signbit), (b ^ signbit) --> icmp s/u a, b - if (ConstantInt *CI = dyn_cast(Op0I->getOperand(1))) { - if (CI->getValue().isSignBit()) { - ICmpInst::Predicate Pred = I.isSigned() - ? I.getUnsignedPredicate() - : I.getSignedPredicate(); - return new ICmpInst(Pred, Op0I->getOperand(0), - Op1I->getOperand(0)); - } - - if (CI->getValue().isMaxSignedValue()) { - ICmpInst::Predicate Pred = I.isSigned() - ? I.getUnsignedPredicate() - : I.getSignedPredicate(); - Pred = I.getSwappedPredicate(Pred); - return new ICmpInst(Pred, Op0I->getOperand(0), - Op1I->getOperand(0)); - } + + // Special logic for binary operators. + BinaryOperator *BO0 = dyn_cast(Op0); + BinaryOperator *BO1 = dyn_cast(Op1); + if (BO0 || BO1) { + CmpInst::Predicate Pred = I.getPredicate(); + bool NoOp0WrapProblem = false, NoOp1WrapProblem = false; + if (BO0 && isa(BO0)) + NoOp0WrapProblem = ICmpInst::isEquality(Pred) || + (CmpInst::isUnsigned(Pred) && BO0->hasNoUnsignedWrap()) || + (CmpInst::isSigned(Pred) && BO0->hasNoSignedWrap()); + if (BO1 && isa(BO1)) + NoOp1WrapProblem = ICmpInst::isEquality(Pred) || + (CmpInst::isUnsigned(Pred) && BO1->hasNoUnsignedWrap()) || + (CmpInst::isSigned(Pred) && BO1->hasNoSignedWrap()); + + // Analyze the case when either Op0 or Op1 is an add instruction. + // Op0 = A + B (or A and B are null); Op1 = C + D (or C and D are null). + Value *A = 0, *B = 0, *C = 0, *D = 0; + if (BO0 && BO0->getOpcode() == Instruction::Add) + A = BO0->getOperand(0), B = BO0->getOperand(1); + if (BO1 && BO1->getOpcode() == Instruction::Add) + C = BO1->getOperand(0), D = BO1->getOperand(1); + + // icmp (X+Y), X -> icmp Y, 0 for equalities or if there is no overflow. + if ((A == Op1 || B == Op1) && NoOp0WrapProblem) + return new ICmpInst(Pred, A == Op1 ? B : A, + Constant::getNullValue(Op1->getType())); + + // icmp X, (X+Y) -> icmp 0, Y for equalities or if there is no overflow. + if ((C == Op0 || D == Op0) && NoOp1WrapProblem) + return new ICmpInst(Pred, Constant::getNullValue(Op0->getType()), + C == Op0 ? D : C); + + // icmp (X+Y), (X+Z) -> icmp Y,Z for equalities or if there is no overflow. + if (A && C && (A == C || A == D || B == C || B == D) && + NoOp0WrapProblem && NoOp1WrapProblem && + // Try not to increase register pressure. + BO0->hasOneUse() && BO1->hasOneUse()) { + // Determine Y and Z in the form icmp (X+Y), (X+Z). + Value *Y = (A == C || A == D) ? B : A; + Value *Z = (C == A || C == B) ? D : C; + return new ICmpInst(Pred, Y, Z); + } + + // Analyze the case when either Op0 or Op1 is a sub instruction. + // Op0 = A - B (or A and B are null); Op1 = C - D (or C and D are null). + A = 0; B = 0; C = 0; D = 0; + if (BO0 && BO0->getOpcode() == Instruction::Sub) + A = BO0->getOperand(0), B = BO0->getOperand(1); + if (BO1 && BO1->getOpcode() == Instruction::Sub) + C = BO1->getOperand(0), D = BO1->getOperand(1); + + // icmp (Y-X), (Z-X) -> icmp Y,Z for equalities or if there is no overflow. + if (B && D && B == D && NoOp0WrapProblem && NoOp1WrapProblem && + // Try not to increase register pressure. + BO0->hasOneUse() && BO1->hasOneUse()) + return new ICmpInst(Pred, A, C); + + if (BO0 && BO1 && BO0->getOpcode() == BO1->getOpcode() && + BO0->hasOneUse() && BO1->hasOneUse() && + BO0->getOperand(1) == BO1->getOperand(1)) { + switch (BO0->getOpcode()) { + default: break; + case Instruction::Add: + case Instruction::Sub: + case Instruction::Xor: + if (I.isEquality()) // a+x icmp eq/ne b+x --> a icmp b + return new ICmpInst(I.getPredicate(), BO0->getOperand(0), + BO1->getOperand(0)); + // icmp u/s (a ^ signbit), (b ^ signbit) --> icmp s/u a, b + if (ConstantInt *CI = dyn_cast(BO0->getOperand(1))) { + if (CI->getValue().isSignBit()) { + ICmpInst::Predicate Pred = I.isSigned() + ? I.getUnsignedPredicate() + : I.getSignedPredicate(); + return new ICmpInst(Pred, BO0->getOperand(0), + BO1->getOperand(0)); } - break; - case Instruction::Mul: - if (!I.isEquality()) - break; - - if (ConstantInt *CI = dyn_cast(Op0I->getOperand(1))) { - // a * Cst icmp eq/ne b * Cst --> a & Mask icmp b & Mask - // Mask = -1 >> count-trailing-zeros(Cst). - if (!CI->isZero() && !CI->isOne()) { - const APInt &AP = CI->getValue(); - ConstantInt *Mask = ConstantInt::get(I.getContext(), - APInt::getLowBitsSet(AP.getBitWidth(), - AP.getBitWidth() - - AP.countTrailingZeros())); - Value *And1 = Builder->CreateAnd(Op0I->getOperand(0), Mask); - Value *And2 = Builder->CreateAnd(Op1I->getOperand(0), Mask); - return new ICmpInst(I.getPredicate(), And1, And2); - } + + if (CI->getValue().isMaxSignedValue()) { + ICmpInst::Predicate Pred = I.isSigned() + ? I.getUnsignedPredicate() + : I.getSignedPredicate(); + Pred = I.getSwappedPredicate(Pred); + return new ICmpInst(Pred, BO0->getOperand(0), + BO1->getOperand(0)); } + } + break; + case Instruction::Mul: + if (!I.isEquality()) break; + + if (ConstantInt *CI = dyn_cast(BO0->getOperand(1))) { + // a * Cst icmp eq/ne b * Cst --> a & Mask icmp b & Mask + // Mask = -1 >> count-trailing-zeros(Cst). + if (!CI->isZero() && !CI->isOne()) { + const APInt &AP = CI->getValue(); + ConstantInt *Mask = ConstantInt::get(I.getContext(), + APInt::getLowBitsSet(AP.getBitWidth(), + AP.getBitWidth() - + AP.countTrailingZeros())); + Value *And1 = Builder->CreateAnd(BO0->getOperand(0), Mask); + Value *And2 = Builder->CreateAnd(BO1->getOperand(0), Mask); + return new ICmpInst(I.getPredicate(), And1, And2); + } } + break; } } } @@ -2400,18 +2425,6 @@ return new ICmpInst(I.getPredicate(), B, Constant::getNullValue(B->getType())); - // (A+B) == A -> B == 0 - if (match(Op0, m_Add(m_Specific(Op1), m_Value(B))) || - match(Op0, m_Add(m_Value(B), m_Specific(Op1)))) - return new ICmpInst(I.getPredicate(), B, - Constant::getNullValue(B->getType())); - - // A == (A+B) -> B == 0 - if (match(Op1, m_Add(m_Specific(Op0), m_Value(B))) || - match(Op1, m_Add(m_Value(B), m_Specific(Op0)))) - return new ICmpInst(I.getPredicate(), B, - Constant::getNullValue(B->getType())); - // (X&Z) == (Y&Z) -> (X^Y) & Z == 0 if (Op0->hasOneUse() && Op1->hasOneUse() && match(Op0, m_And(m_Value(A), m_Value(B))) && Modified: llvm/trunk/test/Transforms/InstCombine/icmp.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/icmp.ll?rev=125734&r1=125733&r2=125734&view=diff ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/icmp.ll (original) +++ llvm/trunk/test/Transforms/InstCombine/icmp.ll Thu Feb 17 01:46:37 2011 @@ -234,3 +234,22 @@ ret i1 %cmp } +; CHECK: @test25 +; CHECK: %c = icmp sgt i32 %x, %y +; CHECK: ret i1 %c +define i1 @test25(i32 %x, i32 %y, i32 %z) { + %lhs = add nsw i32 %x, %z + %rhs = add nsw i32 %y, %z + %c = icmp sgt i32 %lhs, %rhs + ret i1 %c +} + +; CHECK: @test26 +; CHECK: %c = icmp sgt i32 %x, %y +; CHECK: ret i1 %c +define i1 @test26(i32 %x, i32 %y, i32 %z) { + %lhs = sub nsw i32 %x, %z + %rhs = sub nsw i32 %y, %z + %c = icmp sgt i32 %lhs, %rhs + ret i1 %c +} From geek4civic at gmail.com Thu Feb 17 02:04:50 2011 From: geek4civic at gmail.com (NAKAMURA Takumi) Date: Thu, 17 Feb 2011 17:04:50 +0900 Subject: [llvm-commits] [Review Request][PR9234] 59 patches of test/CodeGen/X86 for Windows hosts Message-ID: Hello, guys! At first, excuse me to post bored patches. Please be patient. (IIRC, this is take 3) http://llvm.org/bugs/show_bug.cgi?id=9234 On Windows hosts, llc -march=x86_64 is inferred as -mtriple=x86_64-{mingw32|win32}, and many tests would fail due to difference of Win64 ABI. It would be easier to add explicit -mtriple=x86_64-{darwin|linux} to hide failures. Some guys have advised me not to hide such failures, and I have been working on. All patches make tests FileCheck-ized. Each patch can be categorized; - Add explicit -mtriple=x86_64-linux. They would be nonsense to apply to Win64. (eg. redzone) - Add both -mtriple=x86_64-linux and x86_64-win32 - Relax expressions to match args registers. eg. %{{rdi|rcx}} - Add a pattern for Win64. I think they would be better. - Add *as-is* pattern for Win64. I gave them up to tweak. I am happy if someone improves them. Individual patches can be browsed at github. https://github.com/chapuni/LLVM/compare/master...w32tests/20110217#files_bucket I guess it would be hard (and bored, me too!), though, please take a look into them, thank you! ...Takumi test/CodeGen/X86/2007-01-08-X86-64-Pointer.ll | 7 ++- test/CodeGen/X86/2007-07-18-Vector-Extract.ll | 6 ++- test/CodeGen/X86/add.ll | 13 +++-- test/CodeGen/X86/apm.ll | 11 ++++- test/CodeGen/X86/avoid-lea-scale2.ll | 5 ++- test/CodeGen/X86/break-sse-dep.ll | 15 +++--- test/CodeGen/X86/byval.ll | 5 ++- test/CodeGen/X86/byval2.ll | 39 +++++++++++++- test/CodeGen/X86/byval3.ll | 42 ++++++++++++++- test/CodeGen/X86/byval4.ll | 42 ++++++++++++++- test/CodeGen/X86/byval5.ll | 42 ++++++++++++++- test/CodeGen/X86/coalescer-commute2.ll | 21 +++++++- test/CodeGen/X86/codegen-prepare-extload.ll | 5 +- test/CodeGen/X86/constant-pool-remat-0.ll | 35 +++++++++++-- test/CodeGen/X86/constant-pool-sharing.ll | 7 ++- test/CodeGen/X86/convert-2-addr-3-addr-inc64.ll | 12 +++- test/CodeGen/X86/ctpop-combine.ll | 4 +- test/CodeGen/X86/fast-isel-cmp-branch.ll | 7 ++- test/CodeGen/X86/fast-isel-gep.ll | 17 +++--- test/CodeGen/X86/fold-mul-lohi.ll | 5 +- test/CodeGen/X86/gather-addresses.ll | 23 ++++---- test/CodeGen/X86/h-register-store.ll | 32 +++++++++-- test/CodeGen/X86/h-registers-0.ll | 24 ++++++++- test/CodeGen/X86/i128-ret.ll | 6 ++- test/CodeGen/X86/i64-mem-copy.ll | 8 ++- test/CodeGen/X86/lea-3.ll | 15 +++-- test/CodeGen/X86/lea.ll | 9 ++-- test/CodeGen/X86/lsr-overflow.ll | 5 +- test/CodeGen/X86/lsr-reuse-trunc.ll | 9 ++-- test/CodeGen/X86/masked-iv-safe.ll | 43 ++++++++++++--- test/CodeGen/X86/memcmp.ll | 21 ++++---- test/CodeGen/X86/mmx-copy-gprs.ll | 10 +++- test/CodeGen/X86/movgs.ll | 7 ++- test/CodeGen/X86/optimize-max-3.ll | 11 ++-- test/CodeGen/X86/peep-vector-extract-concat.ll | 6 ++- test/CodeGen/X86/pmulld.ll | 12 ++++- test/CodeGen/X86/pr9127.ll | 2 +- test/CodeGen/X86/red-zone.ll | 2 +- test/CodeGen/X86/remat-mov-0.ll | 15 +++--- test/CodeGen/X86/scalar-min-max-fill-operand.ll | 34 +++++++++++- test/CodeGen/X86/sse-align-0.ll | 16 +++++- test/CodeGen/X86/sse-align-3.ll | 20 +++++++- test/CodeGen/X86/sse-align-7.ll | 8 +++- test/CodeGen/X86/sse-commute.ll | 10 +++- test/CodeGen/X86/sse_reload_fold.ll | 5 +- test/CodeGen/X86/stdarg.ll | 16 +++++- test/CodeGen/X86/stride-nine-with-base-reg.ll | 34 +++++++++++- test/CodeGen/X86/stride-reuse.ll | 33 +++++++++++- test/CodeGen/X86/tailcallbyval64.ll | 25 +++++++-- test/CodeGen/X86/test-shrink.ll | 21 ++++---- test/CodeGen/X86/use-add-flags.ll | 15 +++--- test/CodeGen/X86/v2f32.ll | 67 +++++++++++++++++++---- test/CodeGen/X86/vec_cast.ll | 3 +- test/CodeGen/X86/vec_set-8.ll | 7 ++- test/CodeGen/X86/vec_shuffle-17.ll | 7 ++- test/CodeGen/X86/vec_shuffle-37.ll | 5 +- test/CodeGen/X86/widen_load-0.ll | 8 +++- test/CodeGen/X86/x86-64-malloc.ll | 4 +- test/CodeGen/X86/xor.ll | 9 ++-- 59 files changed, 749 insertions(+), 198 deletions(-) -------------- next part -------------- diff --git a/test/CodeGen/X86/2007-01-08-X86-64-Pointer.ll b/test/CodeGen/X86/2007-01-08-X86-64-Pointer.ll index de226a1..3458550 100644 --- a/test/CodeGen/X86/2007-01-08-X86-64-Pointer.ll +++ b/test/CodeGen/X86/2007-01-08-X86-64-Pointer.ll @@ -1,5 +1,8 @@ -; RUN: llc %s -o - -march=x86-64 | grep {(%rdi,%rax,8)} -; RUN: llc %s -o - -march=x86-64 | not grep {addq.*8} +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s +; CHECK-NOT: {{addq.*8}} +; CHECK: ({{%rdi|%rcx}},%rax,8) +; CHECK-NOT: {{addq.*8}} define void @foo(double* %y) nounwind { entry: diff --git a/test/CodeGen/X86/2007-07-18-Vector-Extract.ll b/test/CodeGen/X86/2007-07-18-Vector-Extract.ll index 8625b27..6288c4a 100644 --- a/test/CodeGen/X86/2007-07-18-Vector-Extract.ll +++ b/test/CodeGen/X86/2007-07-18-Vector-Extract.ll @@ -1,5 +1,7 @@ -; RUN: llc < %s -march=x86-64 -mattr=+sse | grep {movq (%rdi), %rax} -; RUN: llc < %s -march=x86-64 -mattr=+sse | grep {movq 8(%rdi), %rax} +; RUN: llc < %s -mtriple=x86_64-linux -mattr=+sse | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-win32 -mattr=+sse | FileCheck %s +; CHECK: movq ([[A0:%rdi|%rcx]]), %rax +; CHECK: movq 8([[A0]]), %rax define i64 @foo_0(<2 x i64>* %val) { entry: %val12 = getelementptr <2 x i64>* %val, i32 0, i32 0 ; [#uses=1] diff --git a/test/CodeGen/X86/add.ll b/test/CodeGen/X86/add.ll index 3ec5358..62c8980 100644 --- a/test/CodeGen/X86/add.ll +++ b/test/CodeGen/X86/add.ll @@ -1,5 +1,6 @@ ; RUN: llc < %s -march=x86 | FileCheck %s -check-prefix=X32 -; RUN: llc < %s -march=x86-64 | FileCheck %s -check-prefix=X64 +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s -check-prefix=X64 +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s -check-prefix=X64 ; The immediate can be encoded in a smaller way if the ; instruction is a sub instead of an add. @@ -43,7 +44,7 @@ overflow: ; X32-NEXT: jo ; X64: test4: -; X64: addl %esi, %edi +; X64: addl %e[[A1:si|dx]], %e[[A0:di|cx]] ; X64-NEXT: jo } @@ -66,7 +67,7 @@ carry: ; X32-NEXT: jb ; X64: test5: -; X64: addl %esi, %edi +; X64: addl %e[[A1]], %e[[A0]] ; X64-NEXT: jb } @@ -87,8 +88,8 @@ define i64 @test6(i64 %A, i32 %B) nounwind { ; X32-NEXT: ret ; X64: test6: -; X64: shlq $32, %rsi -; X64: leaq (%rsi,%rdi), %rax +; X64: shlq $32, %r[[A1]] +; X64: leaq (%r[[A1]],%r[[A0]]), %rax ; X64: ret } @@ -98,7 +99,7 @@ define {i32, i1} @test7(i32 %v1, i32 %v2) nounwind { } ; X64: test7: -; X64: addl %esi, %eax +; X64: addl %e[[A1]], %eax ; X64-NEXT: setb %dl ; X64-NEXT: ret diff --git a/test/CodeGen/X86/apm.ll b/test/CodeGen/X86/apm.ll index d0c64f2..b514cf6 100644 --- a/test/CodeGen/X86/apm.ll +++ b/test/CodeGen/X86/apm.ll @@ -1,10 +1,16 @@ -; RUN: llc < %s -o - -march=x86-64 | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s -check-prefix=WIN64 ; PR8573 ; CHECK: foo: ; CHECK: leaq (%rdi), %rax ; CHECK-NEXT: movl %esi, %ecx ; CHECK-NEXT: monitor +; WIN64: foo: +; WIN64: leaq (%rcx), %rax +; WIN64-NEXT: movl %edx, %ecx +; WIN64-NEXT: movl %r8d, %edx +; WIN64-NEXT: monitor define void @foo(i8* %P, i32 %E, i32 %H) nounwind { entry: tail call void @llvm.x86.sse3.monitor(i8* %P, i32 %E, i32 %H) @@ -17,6 +23,9 @@ declare void @llvm.x86.sse3.monitor(i8*, i32, i32) nounwind ; CHECK: movl %edi, %ecx ; CHECK-NEXT: movl %esi, %eax ; CHECK-NEXT: mwait +; WIN64: bar: +; WIN64: movl %edx, %eax +; WIN64-NEXT: mwait define void @bar(i32 %E, i32 %H) nounwind { entry: tail call void @llvm.x86.sse3.mwait(i32 %E, i32 %H) diff --git a/test/CodeGen/X86/avoid-lea-scale2.ll b/test/CodeGen/X86/avoid-lea-scale2.ll index 8003de2..545a3ce 100644 --- a/test/CodeGen/X86/avoid-lea-scale2.ll +++ b/test/CodeGen/X86/avoid-lea-scale2.ll @@ -1,4 +1,7 @@ -; RUN: llc < %s -march=x86-64 | grep {leal.*-2(\[%\]rdi,\[%\]rdi)} +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; CHECK: leal -2(%rdi,%rdi) +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s -check-prefix=WIN64 +; WIN64: leal -2(%rcx,%rcx) define i32 @foo(i32 %x) nounwind readnone { %t0 = shl i32 %x, 1 diff --git a/test/CodeGen/X86/break-sse-dep.ll b/test/CodeGen/X86/break-sse-dep.ll index 094cbc7..2dee575 100644 --- a/test/CodeGen/X86/break-sse-dep.ll +++ b/test/CodeGen/X86/break-sse-dep.ll @@ -1,9 +1,10 @@ -; RUN: llc < %s -march=x86-64 -mattr=+sse2 | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-linux -mattr=+sse2 | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-win32 -mattr=+sse2 | FileCheck %s define double @t1(float* nocapture %x) nounwind readonly ssp { entry: ; CHECK: t1: -; CHECK: movss (%rdi), %xmm0 +; CHECK: movss ([[A0:%rdi|%rcx]]), %xmm0 ; CHECK: cvtss2sd %xmm0, %xmm0 %0 = load float* %x, align 4 @@ -14,7 +15,7 @@ entry: define float @t2(double* nocapture %x) nounwind readonly ssp optsize { entry: ; CHECK: t2: -; CHECK: cvtsd2ss (%rdi), %xmm0 +; CHECK: cvtsd2ss ([[A0]]), %xmm0 %0 = load double* %x, align 8 %1 = fptrunc double %0 to float ret float %1 @@ -23,7 +24,7 @@ entry: define float @squirtf(float* %x) nounwind { entry: ; CHECK: squirtf: -; CHECK: movss (%rdi), %xmm0 +; CHECK: movss ([[A0]]), %xmm0 ; CHECK: sqrtss %xmm0, %xmm0 %z = load float* %x %t = call float @llvm.sqrt.f32(float %z) @@ -33,7 +34,7 @@ entry: define double @squirt(double* %x) nounwind { entry: ; CHECK: squirt: -; CHECK: movsd (%rdi), %xmm0 +; CHECK: movsd ([[A0]]), %xmm0 ; CHECK: sqrtsd %xmm0, %xmm0 %z = load double* %x %t = call double @llvm.sqrt.f64(double %z) @@ -43,7 +44,7 @@ entry: define float @squirtf_size(float* %x) nounwind optsize { entry: ; CHECK: squirtf_size: -; CHECK: sqrtss (%rdi), %xmm0 +; CHECK: sqrtss ([[A0]]), %xmm0 %z = load float* %x %t = call float @llvm.sqrt.f32(float %z) ret float %t @@ -52,7 +53,7 @@ entry: define double @squirt_size(double* %x) nounwind optsize { entry: ; CHECK: squirt_size: -; CHECK: sqrtsd (%rdi), %xmm0 +; CHECK: sqrtsd ([[A0]]), %xmm0 %z = load double* %x %t = call double @llvm.sqrt.f64(double %z) ret double %t diff --git a/test/CodeGen/X86/byval.ll b/test/CodeGen/X86/byval.ll index ac0bc09..9b75537 100644 --- a/test/CodeGen/X86/byval.ll +++ b/test/CodeGen/X86/byval.ll @@ -1,4 +1,5 @@ -; RUN: llc < %s -march=x86-64 | FileCheck -check-prefix=X86-64 %s +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck -check-prefix=X86-64 %s +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck -check-prefix=WIN64 %s ; RUN: llc < %s -march=x86 | FileCheck -check-prefix=X86 %s ; X86: movl 4(%esp), %eax @@ -6,6 +7,8 @@ ; X86-64: movq 8(%rsp), %rax +; WIN64: movq (%rcx), %rax + %struct.s = type { i64, i64, i64 } define i64 @f(%struct.s* byval %a) { diff --git a/test/CodeGen/X86/byval2.ll b/test/CodeGen/X86/byval2.ll index 71129f5..c2ac7a5 100644 --- a/test/CodeGen/X86/byval2.ll +++ b/test/CodeGen/X86/byval2.ll @@ -1,5 +1,40 @@ -; RUN: llc < %s -march=x86-64 | grep rep.movsq | count 2 -; RUN: llc < %s -march=x86 | grep rep.movsl | count 2 +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s -check-prefix=X64 +; X64: rep +; X64-NOT: rep +; X64: movsq +; X64-NOT: movsq +; X64: rep +; X64-NOT: rep +; X64: movsq +; X64-NOT: rep +; X64-NOT: movsq + +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s -check-prefix=W64 +; W64: {{^g:}} +; W64: subq $184, %rsp +; W64: movq %rsi, 176(%rsp) +; W64: movq %rcx, 32(%rsp) +; W64-NEXT: movq %rdx, 40(%rsp) +; W64-NEXT: movq %r8, 48(%rsp) +; W64-NEXT: leaq 32(%rsp), %rsi +; W64-NEXT: movq %rsi, %rcx +; W64-NEXT: callq f +; W64-NEXT: movq %rsi, %rcx +; W64-NEXT: callq f +; W64-NEXT: movq 176(%rsp), %rsi +; W64-NEXT: addq $184, %rsp +; W64-NEXT: ret + +; RUN: llc < %s -march=x86 | FileCheck %s -check-prefix=X32 +; X32: rep +; X32-NOT: rep +; X32: movsl +; X32-NOT: movsl +; X32: rep +; X32-NOT: rep +; X32: movsl +; X32-NOT: rep +; X32-NOT: movsl %struct.s = type { i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, diff --git a/test/CodeGen/X86/byval3.ll b/test/CodeGen/X86/byval3.ll index 504e0be..2f611ef 100644 --- a/test/CodeGen/X86/byval3.ll +++ b/test/CodeGen/X86/byval3.ll @@ -1,5 +1,43 @@ -; RUN: llc < %s -march=x86-64 | grep rep.movsq | count 2 -; RUN: llc < %s -march=x86 | grep rep.movsl | count 2 +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s -check-prefix=X64 +; X64-NOT: rep +; X64-NOT: movsq +; X64: rep;movsq +; X64-NOT: rep +; X64-NOT: movsq +; X64: rep;movsq +; X64-NOT: rep +; X64-NOT: movsq + +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s -check-prefix=W64 +; W64: {{^g:}} +; W64: subq $184, %rsp +; W64-NEXT: movq %rsi, 176(%rsp) +; W64-NEXT: movl %ecx, 32(%rsp) +; W64-NEXT: movl %edx, 36(%rsp) +; W64-NEXT: movl %r8d, 40(%rsp) +; W64-NEXT: movl %r9d, 44(%rsp) +; W64-NEXT: movl 224(%rsp), %eax +; W64-NEXT: movl %eax, 48(%rsp) +; W64-NEXT: movl 232(%rsp), %eax +; W64-NEXT: movl %eax, 52(%rsp) +; W64-NEXT: leaq 32(%rsp), %rsi +; W64-NEXT: movq %rsi, %rcx +; W64-NEXT: callq f +; W64-NEXT: movq %rsi, %rcx +; W64-NEXT: callq f +; W64-NEXT: movq 176(%rsp), %rsi +; W64-NEXT: addq $184, %rsp +; W64-NEXT: ret + +; RUN: llc < %s -march=x86 | FileCheck %s -check-prefix=X32 +; X32-NOT: rep +; X32-NOT: movsl +; X32: rep;movsl +; X32-NOT: rep +; X32-NOT: movsl +; X32: rep;movsl +; X32-NOT: rep +; X32-NOT: movsl %struct.s = type { i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, diff --git a/test/CodeGen/X86/byval4.ll b/test/CodeGen/X86/byval4.ll index 4db9d65..1ba23cf 100644 --- a/test/CodeGen/X86/byval4.ll +++ b/test/CodeGen/X86/byval4.ll @@ -1,5 +1,43 @@ -; RUN: llc < %s -march=x86-64 | grep rep.movsq | count 2 -; RUN: llc < %s -march=x86 | grep rep.movsl | count 2 +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s -check-prefix=X64 +; X64-NOT: rep +; X64-NOT: movsq +; X64: rep;movsq +; X64-NOT: rep +; X64-NOT: movsq +; X64: rep;movsq +; X64-NOT: rep +; X64-NOT: movsq + +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s -check-prefix=W64 +; W64: {{^g:}} +; W64: subq $184, %rsp +; W64-NEXT: movq %rsi, 176(%rsp) +; W64-NEXT: movw %cx, 32(%rsp) +; W64-NEXT: movw %dx, 34(%rsp) +; W64-NEXT: movw %r8w, 36(%rsp) +; W64-NEXT: movw %r9w, 38(%rsp) +; W64-NEXT: movw 224(%rsp), %ax +; W64-NEXT: movw %ax, 40(%rsp) +; W64-NEXT: movw 232(%rsp), %ax +; W64-NEXT: movw %ax, 42(%rsp) +; W64-NEXT: leaq 32(%rsp), %rsi +; W64-NEXT: movq %rsi, %rcx +; W64-NEXT: callq f +; W64-NEXT: movq %rsi, %rcx +; W64-NEXT: callq f +; W64-NEXT: movq 176(%rsp), %rsi +; W64-NEXT: addq $184, %rsp +; W64-NEXT: ret + +; RUN: llc < %s -march=x86 | FileCheck %s -check-prefix=X32 +; X32-NOT: rep +; X32-NOT: movsl +; X32: rep;movsl +; X32-NOT: rep +; X32-NOT: movsl +; X32: rep;movsl +; X32-NOT: rep +; X32-NOT: movsl %struct.s = type { i16, i16, i16, i16, i16, i16, i16, i16, i16, i16, i16, i16, i16, i16, i16, i16, diff --git a/test/CodeGen/X86/byval5.ll b/test/CodeGen/X86/byval5.ll index 69c115b..32c9cc7 100644 --- a/test/CodeGen/X86/byval5.ll +++ b/test/CodeGen/X86/byval5.ll @@ -1,5 +1,43 @@ -; RUN: llc < %s -march=x86-64 | grep rep.movsq | count 2 -; RUN: llc < %s -march=x86 | grep rep.movsl | count 2 +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s -check-prefix=X64 +; X64-NOT: rep +; X64-NOT: movsq +; X64: rep;movsq +; X64-NOT: rep +; X64-NOT: movsq +; X64: rep;movsq +; X64-NOT: rep +; X64-NOT: movsq + +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s -check-prefix=W64 +; W64: {{^g:}} +; W64: subq $184, %rsp +; W64: movq %rsi, 176(%rsp) +; W64-NEXT: movb %cl, 40(%rsp) +; W64-NEXT: movb %dl, 41(%rsp) +; W64-NEXT: movb %r8b, 42(%rsp) +; W64-NEXT: movb %r9b, 43(%rsp) +; W64-NEXT: movb 224(%rsp), %al +; W64-NEXT: movb %al, 44(%rsp) +; W64-NEXT: movb 232(%rsp), %al +; W64-NEXT: movb %al, 45(%rsp) +; W64-NEXT: leaq 40(%rsp), %rsi +; W64-NEXT: movq %rsi, %rcx +; W64-NEXT: callq f +; W64-NEXT: movq %rsi, %rcx +; W64-NEXT: callq f +; W64-NEXT: movq 176(%rsp), %rsi +; W64-NEXT: addq $184, %rsp +; W64-NEXT: ret + +; RUN: llc < %s -march=x86 | FileCheck %s -check-prefix=X32 +; X32-NOT: rep +; X32-NOT: movsl +; X32: rep;movsl +; X32-NOT: rep +; X32-NOT: movsl +; X32: rep;movsl +; X32-NOT: rep +; X32-NOT: movsl %struct.s = type { i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, diff --git a/test/CodeGen/X86/coalescer-commute2.ll b/test/CodeGen/X86/coalescer-commute2.ll index 5d10bba..9ff7143 100644 --- a/test/CodeGen/X86/coalescer-commute2.ll +++ b/test/CodeGen/X86/coalescer-commute2.ll @@ -1,5 +1,22 @@ -; RUN: llc < %s -march=x86-64 | grep paddw | count 2 -; RUN: llc < %s -march=x86-64 | not grep mov +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; CHECK-NOT: mov +; CHECK: paddw +; CHECK-NOT: mov +; CHECK: paddw +; CHECK-NOT: paddw +; CHECK-NOT: mov + +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s -check-prefix=WIN64 +; WIN64: {{^test1:}} +; WIN64: movdqa (%rcx), %xmm0 +; WIN64-NEXT: paddw (%rdx), %xmm0 +; WIN64: {{^test2:}} +; WIN64: movdqa (%rdx), %xmm0 +; WIN64-NEXT: paddw (%rcx), %xmm0 +; WIN64: {{^test3:}} +; WIN64: movdqa (%rcx), %xmm1 +; WIN64-NEXT: pshufd $27, %xmm1, %xmm0 +; WIN64-NEXT: addps %xmm1, %xmm0 ; The 2-addr pass should ensure that identical code is produced for these functions ; no extra copy should be generated. diff --git a/test/CodeGen/X86/codegen-prepare-extload.ll b/test/CodeGen/X86/codegen-prepare-extload.ll index 9f57d53..14df815 100644 --- a/test/CodeGen/X86/codegen-prepare-extload.ll +++ b/test/CodeGen/X86/codegen-prepare-extload.ll @@ -1,10 +1,11 @@ -; RUN: llc < %s -march=x86-64 | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-win64 | FileCheck %s ; rdar://7304838 ; CodeGenPrepare should move the zext into the block with the load ; so that SelectionDAG can select it with the load. -; CHECK: movzbl (%rdi), %eax +; CHECK: movzbl ({{%rdi|%rcx}}), %eax define void @foo(i8* %p, i32* %q) { entry: diff --git a/test/CodeGen/X86/constant-pool-remat-0.ll b/test/CodeGen/X86/constant-pool-remat-0.ll index 2a44463..e181237 100644 --- a/test/CodeGen/X86/constant-pool-remat-0.ll +++ b/test/CodeGen/X86/constant-pool-remat-0.ll @@ -1,7 +1,34 @@ -; RUN: llc < %s -march=x86-64 | grep LCPI | count 3 -; RUN: llc < %s -march=x86-64 -o /dev/null -stats -info-output-file - | grep asm-printer | grep 6 -; RUN: llc < %s -march=x86 -mattr=+sse2 | grep LCPI | count 3 -; RUN: llc < %s -march=x86 -mattr=+sse2 -o /dev/null -stats -info-output-file - | grep asm-printer | grep 12 +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s -check-prefix=X64 +; X64: LCPI +; X64: LCPI +; X64: LCPI +; X64-NOT: LCPI + +; RUN: llc < %s -mtriple=x86_64-linux -o /dev/null -stats -info-output-file - | FileCheck %s -check-prefix=X64stat +; X64stat: 6 asm-printer + +; It seems rematerialization would not be needed on win64. +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s -check-prefix=W64 +; W64: .LCPI0_0: +; W64: array: +; W64: subq $56, %rsp +; W64-NEXT: movaps %xmm6, 32(%rsp) +; W64-NEXT: movss .LCPI0_0(%rip), %xmm6 +; W64-NEXT: mulss %xmm6, %xmm0 +; W64-NEXT: callq qux +; W64-NEXT: mulss %xmm6, %xmm0 +; W64-NEXT: movaps 32(%rsp), %xmm6 +; W64-NEXT: addq $56, %rsp +; W64-NEXT: ret + +; RUN: llc < %s -march=x86 -mattr=+sse2 | FileCheck %s -check-prefix=X32 +; X32: LCPI +; X32: LCPI +; X32: LCPI +; X32-NOT: LCPI + +; RUN: llc < %s -march=x86 -mattr=+sse2 -o /dev/null -stats -info-output-file - | FileCheck %s -check-prefix=X32stat +; X32stat: 12 asm-printer declare float @qux(float %y) diff --git a/test/CodeGen/X86/constant-pool-sharing.ll b/test/CodeGen/X86/constant-pool-sharing.ll index 33de576..f979945 100644 --- a/test/CodeGen/X86/constant-pool-sharing.ll +++ b/test/CodeGen/X86/constant-pool-sharing.ll @@ -1,11 +1,12 @@ -; RUN: llc < %s -march=x86-64 | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s ; llc should share constant pool entries between this integer vector ; and this floating-point vector since they have the same encoding. ; CHECK: LCPI0_0(%rip), %xmm0 -; CHECK: movaps %xmm0, (%rdi) -; CHECK: movaps %xmm0, (%rsi) +; CHECK: movaps %xmm0, ({{%rdi|%rcx}}) +; CHECK: movaps %xmm0, ({{%rsi|%rdx}}) define void @foo(<4 x i32>* %p, <4 x float>* %q, i1 %t) nounwind { entry: diff --git a/test/CodeGen/X86/convert-2-addr-3-addr-inc64.ll b/test/CodeGen/X86/convert-2-addr-3-addr-inc64.ll index 17cb2b3..7739909 100644 --- a/test/CodeGen/X86/convert-2-addr-3-addr-inc64.ll +++ b/test/CodeGen/X86/convert-2-addr-3-addr-inc64.ll @@ -1,6 +1,12 @@ -; RUN: llc < %s -march=x86-64 -o %t -stats -info-output-file - | \ -; RUN: grep {asm-printer} | grep {Number of machine instrs printed} | grep 9 -; RUN: grep {leal 1(\%rsi),} %t +; RUN: llc < %s -mtriple=x86_64-linux -o /dev/null -stats |& FileCheck %s -check-prefix=X64stat +; X64stat: 9 asm-printer +; RUN: llc < %s -mtriple=x86_64-win32 -o /dev/null -stats |& FileCheck %s -check-prefix=W64stat +; W64stat: 9 asm-printer + +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s -check-prefix=X64 +; X64: leal 1(%rsi), +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s -check-prefix=W64 +; W64: leal 1(%rdx), define fastcc zeroext i8 @fullGtU(i32 %i1, i32 %i2, i8* %ptr) nounwind optsize { entry: diff --git a/test/CodeGen/X86/ctpop-combine.ll b/test/CodeGen/X86/ctpop-combine.ll index c957d38..6406cc7 100644 --- a/test/CodeGen/X86/ctpop-combine.ll +++ b/test/CodeGen/X86/ctpop-combine.ll @@ -9,7 +9,7 @@ define i32 @test1(i64 %x) nounwind readnone { %conv = zext i1 %cmp to i32 ret i32 %conv ; CHECK: test1: -; CHECK: leaq -1(%rdi) +; CHECK: leaq -1([[A0:%rdi|%rcx]]) ; CHECK-NEXT: testq ; CHECK-NEXT: setne ; CHECK: ret @@ -22,7 +22,7 @@ define i32 @test2(i64 %x) nounwind readnone { %conv = zext i1 %cmp to i32 ret i32 %conv ; CHECK: test2: -; CHECK: leaq -1(%rdi) +; CHECK: leaq -1([[A0]]) ; CHECK-NEXT: testq ; CHECK-NEXT: sete ; CHECK: ret diff --git a/test/CodeGen/X86/fast-isel-cmp-branch.ll b/test/CodeGen/X86/fast-isel-cmp-branch.ll index 4ab1bc6..12312e8 100644 --- a/test/CodeGen/X86/fast-isel-cmp-branch.ll +++ b/test/CodeGen/X86/fast-isel-cmp-branch.ll @@ -1,13 +1,14 @@ -; RUN: llc -O0 -march=x86-64 -asm-verbose=false < %s | FileCheck %s +; RUN: llc -O0 -mtriple=x86_64-linux -asm-verbose=false < %s | FileCheck %s +; RUN: llc -O0 -mtriple=x86_64-win32 -asm-verbose=false < %s | FileCheck %s ; rdar://8337108 ; Fast-isel shouldn't try to look through the compare because it's in a ; different basic block, so its operands aren't necessarily exported ; for cross-block usage. -; CHECK: movb %al, 7(%rsp) +; CHECK: movb %al, [[OFS:[0-9]*]](%rsp) ; CHECK: callq {{_?}}bar -; CHECK: movb 7(%rsp), %al +; CHECK: movb [[OFS]](%rsp), %al declare void @bar() diff --git a/test/CodeGen/X86/fast-isel-gep.ll b/test/CodeGen/X86/fast-isel-gep.ll index 622a1ff..fbe0243 100644 --- a/test/CodeGen/X86/fast-isel-gep.ll +++ b/test/CodeGen/X86/fast-isel-gep.ll @@ -1,4 +1,5 @@ -; RUN: llc < %s -march=x86-64 -O0 | FileCheck %s --check-prefix=X64 +; RUN: llc < %s -mtriple=x86_64-linux -O0 | FileCheck %s --check-prefix=X64 +; RUN: llc < %s -mtriple=x86_64-win32 -O0 | FileCheck %s --check-prefix=X64 ; RUN: llc < %s -march=x86 -O0 | FileCheck %s --check-prefix=X32 ; GEP indices are interpreted as signed integers, so they @@ -13,8 +14,8 @@ define i32 @test1(i32 %t3, i32* %t1) nounwind { ; X32: ret ; X64: test1: -; X64: movslq %edi, %rax -; X64: movl (%rsi,%rax,4), %eax +; X64: movslq %e[[A0:di|cx]], %rax +; X64: movl (%r[[A1:si|dx]],%rax,4), %eax ; X64: ret } @@ -27,7 +28,7 @@ define i32 @test2(i64 %t3, i32* %t1) nounwind { ; X32: ret ; X64: test2: -; X64: movl (%rsi,%rdi,4), %eax +; X64: movl (%r[[A1]],%r[[A0]],4), %eax ; X64: ret } @@ -47,7 +48,7 @@ entry: ; X32: ret ; X64: test3: -; X64: movb -2(%rdi), %al +; X64: movb -2(%r[[A0]]), %al ; X64: ret } @@ -80,9 +81,9 @@ define i64 @test5(i8* %A, i32 %I, i64 %B) nounwind { %v11 = add i64 %B, %v10 ret i64 %v11 ; X64: test5: -; X64: movslq %esi, %rax -; X64-NEXT: movq (%rdi,%rax), %rax -; X64-NEXT: addq %rdx, %rax +; X64: movslq %e[[A1]], %rax +; X64-NEXT: movq (%r[[A0]],%rax), %rax +; X64-NEXT: addq %{{rdx|r8}}, %rax ; X64-NEXT: ret } diff --git a/test/CodeGen/X86/fold-mul-lohi.ll b/test/CodeGen/X86/fold-mul-lohi.ll index 0351eca..5614c80 100644 --- a/test/CodeGen/X86/fold-mul-lohi.ll +++ b/test/CodeGen/X86/fold-mul-lohi.ll @@ -1,5 +1,6 @@ -; RUN: llc < %s -march=x86 | not grep lea -; RUN: llc < %s -march=x86-64 | not grep lea +; RUN: llc < %s -march=x86 | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; CHECK-NOT: lea @B = external global [1000 x i8], align 32 @A = external global [1000 x i8], align 32 diff --git a/test/CodeGen/X86/gather-addresses.ll b/test/CodeGen/X86/gather-addresses.ll index 134ee28..4a6927f 100644 --- a/test/CodeGen/X86/gather-addresses.ll +++ b/test/CodeGen/X86/gather-addresses.ll @@ -1,20 +1,21 @@ -; RUN: llc -march=x86-64 < %s | FileCheck %s +; RUN: llc -mtriple=x86_64-linux < %s | FileCheck %s +; RUN: llc -mtriple=x86_64-win32 < %s | FileCheck %s ; rdar://7398554 ; When doing vector gather-scatter index calculation with 32-bit indices, ; bounce the vector off of cache rather than shuffling each individual ; element out of the index vector. -; CHECK: andps (%rdx), %xmm0 -; CHECK: movaps %xmm0, -24(%rsp) -; CHECK: movslq -24(%rsp), %rax -; CHECK: movsd (%rdi,%rax,8), %xmm0 -; CHECK: movslq -20(%rsp), %rax -; CHECK: movhpd (%rdi,%rax,8), %xmm0 -; CHECK: movslq -16(%rsp), %rax -; CHECK: movsd (%rdi,%rax,8), %xmm1 -; CHECK: movslq -12(%rsp), %rax -; CHECK: movhpd (%rdi,%rax,8), %xmm1 +; CHECK: andps ([[H:%rdx|%r8]]), %xmm0 +; CHECK: movaps %xmm0, {{(-24)?}}(%rsp) +; CHECK: movslq {{(-24)?}}(%rsp), %rax +; CHECK: movsd ([[P:%rdi|%rcx]],%rax,8), %xmm0 +; CHECK: movslq {{-20|4}}(%rsp), %rax +; CHECK: movhpd ([[P]],%rax,8), %xmm0 +; CHECK: movslq {{-16|8}}(%rsp), %rax +; CHECK: movsd ([[P]],%rax,8), %xmm1 +; CHECK: movslq {{-12|12}}(%rsp), %rax +; CHECK: movhpd ([[P]],%rax,8), %xmm1 define <4 x double> @foo(double* %p, <4 x i32>* %i, <4 x i32>* %h) nounwind { %a = load <4 x i32>* %i diff --git a/test/CodeGen/X86/h-register-store.ll b/test/CodeGen/X86/h-register-store.ll index d30e6b3..0adb2b1 100644 --- a/test/CodeGen/X86/h-register-store.ll +++ b/test/CodeGen/X86/h-register-store.ll @@ -1,9 +1,29 @@ -; RUN: llc < %s -march=x86-64 > %t -; RUN: grep mov %t | count 6 -; RUN: grep {movb %ah, (%rsi)} %t | count 3 -; RUN: llc < %s -march=x86 > %t -; RUN: grep mov %t | count 3 -; RUN: grep {movb %ah, (%e} %t | count 3 +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s -check-prefix=X64 +; X64: mov +; X64-NEXT: movb %ah, (%rsi) +; X64: mov +; X64-NEXT: movb %ah, (%rsi) +; X64: mov +; X64-NEXT: movb %ah, (%rsi) +; X64-NOT: mov + +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s -check-prefix=W64 +; W64-NOT: mov +; W64: movb %ch, (%rdx) +; W64-NOT: mov +; W64: movb %ch, (%rdx) +; W64-NOT: mov +; W64: movb %ch, (%rdx) +; W64-NOT: mov + +; RUN: llc < %s -march=x86 | FileCheck %s -check-prefix=X32 +; X32-NOT: mov +; X32: movb %ah, (%e +; X32-NOT: mov +; X32: movb %ah, (%e +; X32-NOT: mov +; X32: movb %ah, (%e +; X32-NOT: mov ; Use h-register extract and store. diff --git a/test/CodeGen/X86/h-registers-0.ll b/test/CodeGen/X86/h-registers-0.ll index e84bb9a..4354d26 100644 --- a/test/CodeGen/X86/h-registers-0.ll +++ b/test/CodeGen/X86/h-registers-0.ll @@ -1,4 +1,5 @@ -; RUN: llc < %s -march=x86-64 | FileCheck %s -check-prefix=X86-64 +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s -check-prefix=X86-64 +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s -check-prefix=WIN64 ; RUN: llc < %s -march=x86 | FileCheck %s -check-prefix=X86-32 ; Use h registers. On x86-64, codegen doesn't support general allocation @@ -9,6 +10,10 @@ define void @bar64(i64 inreg %x, i8* inreg %p) nounwind { ; X86-64: shrq $8, %rdi ; X86-64: incb %dil +; WIN64: bar64: +; WIN64: shrq $8, %rcx +; WIN64: incb %cl + ; X86-32: bar64: ; X86-32: incb %ah %t0 = lshr i64 %x, 8 @@ -23,6 +28,10 @@ define void @bar32(i32 inreg %x, i8* inreg %p) nounwind { ; X86-64: shrl $8, %edi ; X86-64: incb %dil +; WIN64: bar32: +; WIN64: shrl $8, %ecx +; WIN64: incb %cl + ; X86-32: bar32: ; X86-32: incb %ah %t0 = lshr i32 %x, 8 @@ -37,6 +46,10 @@ define void @bar16(i16 inreg %x, i8* inreg %p) nounwind { ; X86-64: shrl $8, %edi ; X86-64: incb %dil +; WIN64: bar16: +; WIN64: shrl $8, %ecx +; WIN64: incb %cl + ; X86-32: bar16: ; X86-32: incb %ah %t0 = lshr i16 %x, 8 @@ -51,6 +64,9 @@ define i64 @qux64(i64 inreg %x) nounwind { ; X86-64: movq %rdi, %rax ; X86-64: movzbl %ah, %eax +; WIN64: qux64: +; WIN64: movzbl %ch, %eax + ; X86-32: qux64: ; X86-32: movzbl %ah, %eax %t0 = lshr i64 %x, 8 @@ -63,6 +79,9 @@ define i32 @qux32(i32 inreg %x) nounwind { ; X86-64: movl %edi, %eax ; X86-64: movzbl %ah, %eax +; WIN64: qux32: +; WIN64: movzbl %ch, %eax + ; X86-32: qux32: ; X86-32: movzbl %ah, %eax %t0 = lshr i32 %x, 8 @@ -75,6 +94,9 @@ define i16 @qux16(i16 inreg %x) nounwind { ; X86-64: movl %edi, %eax ; X86-64: movzbl %ah, %eax +; WIN64: qux16: +; WIN64: movzbl %ch, %eax + ; X86-32: qux16: ; X86-32: movzbl %ah, %eax %t0 = lshr i16 %x, 8 diff --git a/test/CodeGen/X86/i128-ret.ll b/test/CodeGen/X86/i128-ret.ll index 277f428..264f07c 100644 --- a/test/CodeGen/X86/i128-ret.ll +++ b/test/CodeGen/X86/i128-ret.ll @@ -1,5 +1,7 @@ -; RUN: llc < %s -march=x86-64 | grep {movq 8(%rdi), %rdx} -; RUN: llc < %s -march=x86-64 | grep {movq (%rdi), %rax} +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s +; CHECK: movq ([[A0:%rdi|%rcx]]), %rax +; CHECK: movq 8([[A0]]), %rdx define i128 @test(i128 *%P) { %A = load i128* %P diff --git a/test/CodeGen/X86/i64-mem-copy.ll b/test/CodeGen/X86/i64-mem-copy.ll index 847e209..dce12ae 100644 --- a/test/CodeGen/X86/i64-mem-copy.ll +++ b/test/CodeGen/X86/i64-mem-copy.ll @@ -1,5 +1,9 @@ -; RUN: llc < %s -march=x86-64 | grep {movq.*(%rsi), %rax} -; RUN: llc < %s -march=x86 -mattr=+sse2 | grep {movsd.*(%eax),} +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s -check-prefix=X64 +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s -check-prefix=X64 +; X64: movq ({{%rsi|%rdx}}), %r + +; RUN: llc < %s -march=x86 -mattr=+sse2 | FileCheck %s -check-prefix=X32 +; X32: movsd (%eax), %xmm ; Uses movsd to load / store i64 values if sse2 is available. diff --git a/test/CodeGen/X86/lea-3.ll b/test/CodeGen/X86/lea-3.ll index 44413d6..040c5c2 100644 --- a/test/CodeGen/X86/lea-3.ll +++ b/test/CodeGen/X86/lea-3.ll @@ -1,16 +1,19 @@ -; RUN: llc < %s -march=x86-64 | grep {leal (%rdi,%rdi,2), %eax} -define i32 @test(i32 %a) { - %tmp2 = mul i32 %a, 3 ; [#uses=1] - ret i32 %tmp2 -} +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s -; RUN: llc < %s -march=x86-64 | grep {leaq (,%rdi,4), %rax} +; CHECK: leaq (,[[A0:%rdi|%rcx]],4), %rax define i64 @test2(i64 %a) { %tmp2 = shl i64 %a, 2 %tmp3 = or i64 %tmp2, %a ret i64 %tmp3 } +; CHECK: leal ([[A0]],[[A0]],2), %eax +define i32 @test(i32 %a) { + %tmp2 = mul i32 %a, 3 ; [#uses=1] + ret i32 %tmp2 +} + ;; TODO! LEA instead of shift + copy. define i64 @test3(i64 %a) { %tmp2 = shl i64 %a, 3 diff --git a/test/CodeGen/X86/lea.ll b/test/CodeGen/X86/lea.ll index 22a9644..5421355 100644 --- a/test/CodeGen/X86/lea.ll +++ b/test/CodeGen/X86/lea.ll @@ -1,11 +1,12 @@ -; RUN: llc < %s -march=x86-64 | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s define i32 @test1(i32 %x) nounwind { %tmp1 = shl i32 %x, 3 %tmp2 = add i32 %tmp1, 7 ret i32 %tmp2 ; CHECK: test1: -; CHECK: leal 7(,%rdi,8), %eax +; CHECK: leal 7(,[[A0:%rdi|%rcx]],8), %eax } @@ -27,8 +28,8 @@ bb.nph: bb2: ret i32 %x_offs ; CHECK: test2: -; CHECK: leal -5(%rdi), %eax +; CHECK: leal -5([[A0]]), %eax ; CHECK: andl $-4, %eax ; CHECK: negl %eax -; CHECK: leal -4(%rdi,%rax), %eax +; CHECK: leal -4([[A0]],%rax), %eax } diff --git a/test/CodeGen/X86/lsr-overflow.ll b/test/CodeGen/X86/lsr-overflow.ll index 0b0214c..5bc4f7e 100644 --- a/test/CodeGen/X86/lsr-overflow.ll +++ b/test/CodeGen/X86/lsr-overflow.ll @@ -1,10 +1,11 @@ -; RUN: llc < %s -march=x86-64 | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s ; The comparison uses the pre-inc value, which could lead LSR to ; try to compute -INT64_MIN. ; CHECK: movabsq $-9223372036854775808, %rax -; CHECK: cmpq %rax, %rbx +; CHECK: cmpq %rax, ; CHECK: sete %al declare i64 @bar() diff --git a/test/CodeGen/X86/lsr-reuse-trunc.ll b/test/CodeGen/X86/lsr-reuse-trunc.ll index d1d7144..29f03d6 100644 --- a/test/CodeGen/X86/lsr-reuse-trunc.ll +++ b/test/CodeGen/X86/lsr-reuse-trunc.ll @@ -1,12 +1,13 @@ -; RUN: llc < %s -march=x86-64 | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s ; Full strength reduction wouldn't reduce register pressure, so LSR should ; stick with indexing here. -; CHECK: movaps (%rsi,%rax,4), %xmm3 -; CHECK: movaps %xmm3, (%rdi,%rax,4) +; CHECK: movaps (%{{rsi|rdx}},%rax,4), %xmm3 +; CHECK: movaps %xmm3, (%{{rdi|rcx}},%rax,4) ; CHECK: addq $4, %rax -; CHECK: cmpl %eax, (%rdx) +; CHECK: cmpl %eax, (%{{rdx|r8}}) ; CHECK-NEXT: jg define void @vvfloorf(float* nocapture %y, float* nocapture %x, i32* nocapture %n) nounwind { diff --git a/test/CodeGen/X86/masked-iv-safe.ll b/test/CodeGen/X86/masked-iv-safe.ll index 0b4d73a..5f968b5 100644 --- a/test/CodeGen/X86/masked-iv-safe.ll +++ b/test/CodeGen/X86/masked-iv-safe.ll @@ -1,12 +1,37 @@ -; RUN: llc < %s -march=x86-64 > %t -; RUN: not grep and %t -; RUN: not grep movz %t -; RUN: not grep sar %t -; RUN: not grep shl %t -; RUN: grep add %t | count 2 -; RUN: grep inc %t | count 4 -; RUN: grep dec %t | count 2 -; RUN: grep lea %t | count 2 +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s +; CHECK-NOT: {{(inc|dec|lea)}} +; CHECK-NOT: {{(and|movz|sar|shl)}} +; CHECK: inc +; CHECK-NOT: {{(inc|dec|lea)}} +; CHECK-NOT: {{(and|movz|sar|shl)}} +; CHECK: dec +; CHECK-NOT: {{(inc|dec|lea)}} +; CHECK-NOT: {{(and|movz|sar|shl)}} +; CHECK: inc +; CHECK-NOT: {{(inc|dec|lea)}} +; CHECK-NOT: {{(and|movz|sar|shl)}} +; CHECK: dec +; CHECK-NOT: {{(inc|dec|lea)}} +; CHECK-NOT: {{(and|movz|sar|shl)}} +; CHECK: inc +; CHECK-NOT: {{(inc|dec|lea)}} +; CHECK-NOT: {{(and|movz|sar|shl)}} +; CHECK: addq $255, %r +; CHECK-NOT: {{(inc|dec|lea)}} +; CHECK-NOT: {{(and|movz|sar|shl)}} +; CHECK: addq $16777215, %r +; CHECK-NOT: {{(inc|dec|lea)}} +; CHECK-NOT: {{(and|movz|sar|shl)}} +; CHECK: lea +; CHECK-NOT: {{(inc|dec|lea)}} +; CHECK-NOT: {{(and|movz|sar|shl)}} +; CHECK: inc +; CHECK-NOT: {{(inc|dec|lea)}} +; CHECK-NOT: {{(and|movz|sar|shl)}} +; CHECK: lea +; CHECK-NOT: {{(inc|dec|lea)}} +; CHECK-NOT: {{(and|movz|sar|shl)}} ; Optimize away zext-inreg and sext-inreg on the loop induction ; variable using trip-count information. diff --git a/test/CodeGen/X86/memcmp.ll b/test/CodeGen/X86/memcmp.ll index 36be1f3..f4bc1bb 100644 --- a/test/CodeGen/X86/memcmp.ll +++ b/test/CodeGen/X86/memcmp.ll @@ -1,4 +1,5 @@ -; RUN: llc %s -o - -march=x86-64 | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s ; This tests codegen time inlining/optimization of memcmp ; rdar://6480398 @@ -20,8 +21,8 @@ bb: ; preds = %entry return: ; preds = %entry ret void ; CHECK: memcmp2: -; CHECK: movw (%rdi), %ax -; CHECK: cmpw (%rsi), %ax +; CHECK: movw ([[A0:%rdi|%rcx]]), %ax +; CHECK: cmpw ([[A1:%rsi|%rdx]]), %ax } define void @memcmp2a(i8* %X, i32* nocapture %P) nounwind { @@ -37,7 +38,7 @@ bb: ; preds = %entry return: ; preds = %entry ret void ; CHECK: memcmp2a: -; CHECK: cmpw $28527, (%rdi) +; CHECK: cmpw $28527, ([[A0]]) } @@ -54,8 +55,8 @@ bb: ; preds = %entry return: ; preds = %entry ret void ; CHECK: memcmp4: -; CHECK: movl (%rdi), %eax -; CHECK: cmpl (%rsi), %eax +; CHECK: movl ([[A0]]), %eax +; CHECK: cmpl ([[A1]]), %eax } define void @memcmp4a(i8* %X, i32* nocapture %P) nounwind { @@ -71,7 +72,7 @@ bb: ; preds = %entry return: ; preds = %entry ret void ; CHECK: memcmp4a: -; CHECK: cmpl $1869573999, (%rdi) +; CHECK: cmpl $1869573999, ([[A0]]) } define void @memcmp8(i8* %X, i8* %Y, i32* nocapture %P) nounwind { @@ -87,8 +88,8 @@ bb: ; preds = %entry return: ; preds = %entry ret void ; CHECK: memcmp8: -; CHECK: movq (%rdi), %rax -; CHECK: cmpq (%rsi), %rax +; CHECK: movq ([[A0]]), %rax +; CHECK: cmpq ([[A1]]), %rax } define void @memcmp8a(i8* %X, i32* nocapture %P) nounwind { @@ -105,6 +106,6 @@ return: ; preds = %entry ret void ; CHECK: memcmp8a: ; CHECK: movabsq $8029759185026510694, %rax -; CHECK: cmpq %rax, (%rdi) +; CHECK: cmpq %rax, ([[A0]]) } diff --git a/test/CodeGen/X86/mmx-copy-gprs.ll b/test/CodeGen/X86/mmx-copy-gprs.ll index 3607043..6cb21ca 100644 --- a/test/CodeGen/X86/mmx-copy-gprs.ll +++ b/test/CodeGen/X86/mmx-copy-gprs.ll @@ -1,6 +1,10 @@ -; RUN: llc < %s -march=x86-64 | grep {movq.*(%rsi), %rax} -; RUN: llc < %s -march=x86 -mattr=-sse2 | grep {movl.*4(%eax),} -; RUN: llc < %s -march=x86 -mattr=+sse2 | grep {movsd.(%eax),} +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s -check-prefix=X64 +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s -check-prefix=X64 +; X64: movq ({{%rsi|%rdx}}), %rax +; RUN: llc < %s -march=x86 -mattr=-sse2 | FileCheck %s -check-prefix=X32 +; X32: movl 4(%eax), +; RUN: llc < %s -march=x86 -mattr=+sse2 | FileCheck %s -check-prefix=XMM +; XMM: movsd (%eax), ; This test should use GPRs to copy the mmx value, not MMX regs. Using mmx regs, ; increases the places that need to use emms. diff --git a/test/CodeGen/X86/movgs.ll b/test/CodeGen/X86/movgs.ll index 00190e8..97b7fe7 100644 --- a/test/CodeGen/X86/movgs.ll +++ b/test/CodeGen/X86/movgs.ll @@ -1,5 +1,6 @@ ; RUN: llc < %s -march=x86 -mattr=sse41 | FileCheck %s --check-prefix=X32 -; RUN: llc < %s -march=x86-64 -mattr=sse41 | FileCheck %s --check-prefix=X64 +; RUN: llc < %s -mtriple=x86_64-linux -mattr=sse41 | FileCheck %s --check-prefix=X64 +; RUN: llc < %s -mtriple=x86_64-win32 -mattr=sse41 | FileCheck %s --check-prefix=X64 define i32 @test1() nounwind readonly { entry: @@ -30,7 +31,7 @@ entry: ; X32: calll *%gs:(%eax) ; X64: test2: -; X64: callq *%gs:(%rdi) +; X64: callq *%gs:([[A0:%rdi|%rcx]]) @@ -50,7 +51,7 @@ entry: ; X32: ret ; X64: pmovsxwd_1: -; X64: pmovsxwd %gs:(%rdi), %xmm0 +; X64: pmovsxwd %gs:([[A0]]), %xmm0 ; X64: ret } diff --git a/test/CodeGen/X86/optimize-max-3.ll b/test/CodeGen/X86/optimize-max-3.ll index f1e3c27..b90413d 100644 --- a/test/CodeGen/X86/optimize-max-3.ll +++ b/test/CodeGen/X86/optimize-max-3.ll @@ -1,4 +1,5 @@ -; RUN: llc < %s -march=x86-64 -asm-verbose=false | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-linux -asm-verbose=false | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-win32 -asm-verbose=false | FileCheck %s ; LSR's OptimizeMax should eliminate the select (max). @@ -40,13 +41,13 @@ for.end: ; preds = %for.body, %entry ; CHECK: jle ; CHECK-NOT: cmov -; CHECK: xorl %edi, %edi +; CHECK: xorl {{%edi, %edi|%ecx, %ecx}} ; CHECK-NEXT: align ; CHECK-NEXT: BB1_2: ; CHECK-NEXT: callq -; CHECK-NEXT: incl %ebx -; CHECK-NEXT: cmpl %r14d, %ebx -; CHECK-NEXT: movq %rax, %rdi +; CHECK-NEXT: incl [[BX:%ebx|%esi]] +; CHECK-NEXT: cmpl [[R14:%r14d|%edi]], [[BX]] +; CHECK-NEXT: movq %rax, %r{{di|cx}} ; CHECK-NEXT: jl define void @_Z18GenerateStatusPagei(i32 %jobs_to_display) nounwind { diff --git a/test/CodeGen/X86/peep-vector-extract-concat.ll b/test/CodeGen/X86/peep-vector-extract-concat.ll index e4ab2b5..1eed317 100644 --- a/test/CodeGen/X86/peep-vector-extract-concat.ll +++ b/test/CodeGen/X86/peep-vector-extract-concat.ll @@ -1,4 +1,8 @@ -; RUN: llc < %s -march=x86-64 -mattr=+sse2,-sse41 | grep {pshufd \$3, %xmm0, %xmm0} +; RUN: llc < %s -mtriple=x86_64-linux -mattr=+sse2,-sse41 | FileCheck %s +; CHECK: pshufd $3, %xmm0, %xmm0 + +; RUN: llc < %s -mtriple=x86_64-win32 -mattr=+sse2,-sse41 | FileCheck %s -check-prefix=WIN64 +; WIN64: movss 12(%rcx), %xmm0 define float @foo(<8 x float> %a) nounwind { %c = extractelement <8 x float> %a, i32 3 diff --git a/test/CodeGen/X86/pmulld.ll b/test/CodeGen/X86/pmulld.ll index 3ef5941..fc8791a 100644 --- a/test/CodeGen/X86/pmulld.ll +++ b/test/CodeGen/X86/pmulld.ll @@ -1,8 +1,13 @@ -; RUN: llc < %s -march=x86-64 -mattr=+sse41 -asm-verbose=0 | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-linux -mattr=+sse41 -asm-verbose=0 | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-win32 -mattr=+sse41 -asm-verbose=0 | FileCheck %s -check-prefix=WIN64 define <4 x i32> @test1(<4 x i32> %A, <4 x i32> %B) nounwind { ; CHECK: test1: ; CHECK-NEXT: pmulld + +; WIN64: test1: +; WIN64: movdqa (%rcx), %xmm0 +; WIN64-NEXT: pmulld (%rdx), %xmm0 %C = mul <4 x i32> %A, %B ret <4 x i32> %C } @@ -10,6 +15,11 @@ define <4 x i32> @test1(<4 x i32> %A, <4 x i32> %B) nounwind { define <4 x i32> @test1a(<4 x i32> %A, <4 x i32> *%Bp) nounwind { ; CHECK: test1a: ; CHECK-NEXT: pmulld + +; WIN64: test1a: +; WIN64: movdqa (%rcx), %xmm0 +; WIN64-NEXT: pmulld (%rdx), %xmm0 + %B = load <4 x i32>* %Bp %C = mul <4 x i32> %A, %B ret <4 x i32> %C diff --git a/test/CodeGen/X86/pr9127.ll b/test/CodeGen/X86/pr9127.ll index 45b0c6c..d61e165 100644 --- a/test/CodeGen/X86/pr9127.ll +++ b/test/CodeGen/X86/pr9127.ll @@ -9,4 +9,4 @@ entry: } ; test that the load is folded. -; CHECK: ucomisd (%rdi), %xmm0 +; CHECK: ucomisd (%{{rdi|rdx}}), %xmm0 diff --git a/test/CodeGen/X86/red-zone.ll b/test/CodeGen/X86/red-zone.ll index 1ffb4e3..d936971 100644 --- a/test/CodeGen/X86/red-zone.ll +++ b/test/CodeGen/X86/red-zone.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=x86-64 | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s ; First without noredzone. ; CHECK: f0: diff --git a/test/CodeGen/X86/remat-mov-0.ll b/test/CodeGen/X86/remat-mov-0.ll index 5fb445c..f89cd33 100644 --- a/test/CodeGen/X86/remat-mov-0.ll +++ b/test/CodeGen/X86/remat-mov-0.ll @@ -1,12 +1,13 @@ -; RUN: llc < %s -march=x86-64 | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s ; CodeGen should remat the zero instead of spilling it. declare void @foo(i64 %p) ; CHECK: bar: -; CHECK: xorl %edi, %edi -; CHECK: xorl %edi, %edi +; CHECK: xorl %e[[A0:di|cx]], %e +; CHECK: xorl %e[[A0]], %e[[A0]] define void @bar() nounwind { call void @foo(i64 0) call void @foo(i64 0) @@ -14,8 +15,8 @@ define void @bar() nounwind { } ; CHECK: bat: -; CHECK: movq $-1, %rdi -; CHECK: movq $-1, %rdi +; CHECK: movq $-1, %r[[A0]] +; CHECK: movq $-1, %r[[A0]] define void @bat() nounwind { call void @foo(i64 -1) call void @foo(i64 -1) @@ -23,8 +24,8 @@ define void @bat() nounwind { } ; CHECK: bau: -; CHECK: movl $1, %edi -; CHECK: movl $1, %edi +; CHECK: movl $1, %e[[A0]] +; CHECK: movl $1, %e[[A0]] define void @bau() nounwind { call void @foo(i64 1) call void @foo(i64 1) diff --git a/test/CodeGen/X86/scalar-min-max-fill-operand.ll b/test/CodeGen/X86/scalar-min-max-fill-operand.ll index fe40758..cf0ebbf 100644 --- a/test/CodeGen/X86/scalar-min-max-fill-operand.ll +++ b/test/CodeGen/X86/scalar-min-max-fill-operand.ll @@ -1,6 +1,34 @@ -; RUN: llc < %s -march=x86-64 | grep min | count 1 -; RUN: llc < %s -march=x86-64 | grep max | count 1 -; RUN: llc < %s -march=x86-64 | grep mov | count 2 +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; CHECK-NOT: {{(min|max|mov)}} +; CHECK: mov +; CHECK-NOT: {{(min|max|mov)}} +; CHECK: min +; CHECK-NOT: {{(min|max|mov)}} +; CHECK: mov +; CHECK-NOT: {{(min|max|mov)}} +; CHECK: max +; CHECK-NOT: {{(min|max|mov)}} + +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s -check-prefix=WIN64 +; WIN64: {{^foo:}} +; WIN64: subq $56, %rsp +; WIN64-NEXT: movaps %xmm6, 32(%rsp) +; WIN64-NEXT: movaps %xmm0, %xmm6 +; WIN64-NEXT: callq bar +; WIN64-NEXT: minss %xmm6, %xmm0 +; WIN64-NEXT: movaps 32(%rsp), %xmm6 +; WIN64-NEXT: addq $56, %rsp +; WIN64-NEXT: ret + +; WIN64: {{^hem:}} +; WIN64: subq $56, %rsp +; WIN64-NEXT: movaps %xmm6, 32(%rsp) +; WIN64-NEXT: movaps %xmm0, %xmm6 +; WIN64-NEXT: callq bar +; WIN64-NEXT: maxss %xmm6, %xmm0 +; WIN64-NEXT: movaps 32(%rsp), %xmm6 +; WIN64-NEXT: addq $56, %rsp +; WIN64-NEXT: ret declare float @bar() diff --git a/test/CodeGen/X86/sse-align-0.ll b/test/CodeGen/X86/sse-align-0.ll index b12a87d..50fdd76 100644 --- a/test/CodeGen/X86/sse-align-0.ll +++ b/test/CodeGen/X86/sse-align-0.ll @@ -1,12 +1,26 @@ -; RUN: llc < %s -march=x86-64 | not grep mov +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; CHECK-NOT: mov + +; RUN: llc < %s -mtriple=x86_64-win32 -asm-verbose=false | FileCheck %s -check-prefix=WIN64 define <4 x float> @foo(<4 x float>* %p, <4 x float> %x) nounwind { %t = load <4 x float>* %p %z = fmul <4 x float> %t, %x ret <4 x float> %z } + +; WIN64: foo: +; WIN64-NEXT: movaps (%rcx), %xmm0 +; WIN64-NEXT: mulps (%rdx), %xmm0 +; WIN64-NEXT: ret + define <2 x double> @bar(<2 x double>* %p, <2 x double> %x) nounwind { %t = load <2 x double>* %p %z = fmul <2 x double> %t, %x ret <2 x double> %z } + +; WIN64: bar: +; WIN64-NEXT: movapd (%rcx), %xmm0 +; WIN64-NEXT: mulpd (%rdx), %xmm0 +; WIN64-NEXT: ret diff --git a/test/CodeGen/X86/sse-align-3.ll b/test/CodeGen/X86/sse-align-3.ll index c42f7f0..03b0a29 100644 --- a/test/CodeGen/X86/sse-align-3.ll +++ b/test/CodeGen/X86/sse-align-3.ll @@ -1,10 +1,28 @@ -; RUN: llc < %s -march=x86-64 | grep movap | count 2 +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; CHECK-NOT: movapd +; CHECK: movaps +; CHECK-NOT: movaps +; CHECK: movapd +; CHECK-NOT: movap + +; RUN: llc < %s -mtriple=x86_64-win32 -asm-verbose=false | FileCheck %s -check-prefix=WIN64 define void @foo(<4 x float>* %p, <4 x float> %x) nounwind { store <4 x float> %x, <4 x float>* %p ret void } + +; WIN64: foo: +; WIN64-NEXT: movaps (%rdx), %xmm0 +; WIN64-NEXT: movaps %xmm0, (%rcx) +; WIN64-NEXT: ret + define void @bar(<2 x double>* %p, <2 x double> %x) nounwind { store <2 x double> %x, <2 x double>* %p ret void } + +; WIN64: bar: +; WIN64-NEXT: movapd (%rdx), %xmm0 +; WIN64-NEXT: movapd %xmm0, (%rcx) +; WIN64-NEXT: ret diff --git a/test/CodeGen/X86/sse-align-7.ll b/test/CodeGen/X86/sse-align-7.ll index 5784481..5479ca2 100644 --- a/test/CodeGen/X86/sse-align-7.ll +++ b/test/CodeGen/X86/sse-align-7.ll @@ -1,4 +1,10 @@ -; RUN: llc < %s -march=x86-64 | grep movaps | count 1 +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; CHECK: movaps +; CHECK-NOT: movaps + +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s -check-prefix=WIN64 +; WIN64: movaps (%rdx), [[XMM:%xmm[0-7]+]] +; WIN64: movaps [[XMM]], (%rcx) define void @bar(<2 x i64>* %p, <2 x i64> %x) nounwind { store <2 x i64> %x, <2 x i64>* %p diff --git a/test/CodeGen/X86/sse-commute.ll b/test/CodeGen/X86/sse-commute.ll index 38ed644..1a3390a 100644 --- a/test/CodeGen/X86/sse-commute.ll +++ b/test/CodeGen/X86/sse-commute.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=x86-64 < %s | FileCheck %s +; RUN: llc -mtriple=x86_64-linux < %s | FileCheck %s ; Commute the comparison to avoid a move. ; PR7500. @@ -17,4 +17,10 @@ entry: ret <2 x double> %tmp8 } - +; RUN: llc -mtriple=x86_64-win32 -asm-verbose=false < %s | FileCheck %s -check-prefix=WIN64 +; WIN64: a: +; WIN64-NEXT: movdqa (%rdx), %xmm0 +; WIN64-NEXT: movdqa (%rcx), %xmm1 +; WIN64-NEXT: pcmpeqd %xmm1, %xmm0 +; WIN64-NEXT: pand %xmm1, %xmm0 +; WIN64-NEXT: ret diff --git a/test/CodeGen/X86/sse_reload_fold.ll b/test/CodeGen/X86/sse_reload_fold.ll index dc3d6fe..02399c4 100644 --- a/test/CodeGen/X86/sse_reload_fold.ll +++ b/test/CodeGen/X86/sse_reload_fold.ll @@ -1,5 +1,6 @@ -; RUN: llc < %s -march=x86-64 -mattr=+64bit,+sse3 -print-failed-fuse-candidates |& \ -; RUN: grep fail | count 1 +; RUN: llc < %s -mtriple=x86_64-linux -mattr=+64bit,+sse3 -print-failed-fuse-candidates |& FileCheck %s +; CHECK: fail +; CHECK-NOT: fail declare float @test_f(float %f) declare double @test_d(double %f) diff --git a/test/CodeGen/X86/stdarg.ll b/test/CodeGen/X86/stdarg.ll index 9778fa1..29d91e8 100644 --- a/test/CodeGen/X86/stdarg.ll +++ b/test/CodeGen/X86/stdarg.ll @@ -1,4 +1,18 @@ -; RUN: llc < %s -march=x86-64 | grep {testb \[%\]al, \[%\]al} +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; CHECK: testb %al, %al + +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s -check-prefix=WIN64 +; WIN64: {{^foo:}} +; WIN64: subq $56, %rsp +; WIN64-NEXT: movq %r9, 88(%rsp) +; WIN64-NEXT: movq %r8, 80(%rsp) +; WIN64-NEXT: movq %rdx, 72(%rsp) +; WIN64-NEXT: leaq 72(%rsp), %rax +; WIN64-NEXT: movq %rax, 32(%rsp) +; WIN64-NEXT: leaq 32(%rsp), %rcx +; WIN64-NEXT: callq bar +; WIN64-NEXT: addq $56, %rsp +; WIN64-NEXT: ret %struct.__va_list_tag = type { i32, i32, i8*, i8* } diff --git a/test/CodeGen/X86/stride-nine-with-base-reg.ll b/test/CodeGen/X86/stride-nine-with-base-reg.ll index f4847a3..59fa8b8 100644 --- a/test/CodeGen/X86/stride-nine-with-base-reg.ll +++ b/test/CodeGen/X86/stride-nine-with-base-reg.ll @@ -1,5 +1,6 @@ -; RUN: llc < %s -march=x86 -relocation-model=static | not grep lea -; RUN: llc < %s -march=x86-64 | not grep lea +; RUN: llc < %s -march=x86 -relocation-model=static | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; CHECK-NOT: lea ; P should be sunk into the loop and folded into the address mode. There ; shouldn't be any lea instructions inside the loop. @@ -35,3 +36,32 @@ return: ret void } +; RUN: llc < %s -mtriple=x86_64-win32 -asm-verbose=false | FileCheck %s -check-prefix=WIN64 +; WIN64: foo: +; WIN64: subq $16, %rsp +; WIN64-NEXT: movq %rsi, (%rsp) +; WIN64-NEXT: movq %rdi, 8(%rsp) +; WIN64-NEXT: testl %ecx, %ecx +; WIN64-NEXT: jle .LBB0_3 +; WIN64-NEXT: xorl %eax, %eax +; WIN64-NEXT: leaq B(%rip), %rsi +; WIN64-NEXT: leaq A(%rip), %rdi +; WIN64-NEXT: leaq P(%rip), %r8 +; WIN64-NEXT: leaq Q(%rip), %r9 +; WIN64: .LBB0_2: +; WIN64-NEXT: movslq %eax, %rax +; WIN64-NEXT: movb (%rax,%rsi), %r10b +; WIN64-NEXT: addb %r10b, %r10b +; WIN64-NEXT: movb %r10b, (%rax,%rdi) +; WIN64-NEXT: movslq %edx, %rdx +; WIN64-NEXT: movb $17, (%rdx,%r8) +; WIN64-NEXT: movb $19, (%rdx,%r9) +; WIN64-NEXT: addl $9, %edx +; WIN64-NEXT: incl %eax +; WIN64-NEXT: cmpl %eax, %ecx +; WIN64-NEXT: jne .LBB0_2 +; WIN64-NEXT: LBB0_3: +; WIN64-NEXT: movq 8(%rsp), %rdi +; WIN64-NEXT: movq (%rsp), %rsi +; WIN64-NEXT: addq $16, %rsp +; WIN64-NEXT: ret diff --git a/test/CodeGen/X86/stride-reuse.ll b/test/CodeGen/X86/stride-reuse.ll index 5cbd895..55251d9 100644 --- a/test/CodeGen/X86/stride-reuse.ll +++ b/test/CodeGen/X86/stride-reuse.ll @@ -1,5 +1,6 @@ -; RUN: llc < %s -march=x86 | not grep lea -; RUN: llc < %s -march=x86-64 | not grep lea +; RUN: llc < %s -march=x86 | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; CHECK-NOT: lea @B = external global [1000 x float], align 32 @A = external global [1000 x float], align 32 @@ -28,3 +29,31 @@ bb: return: ret void } + +; RUN: llc < %s -mtriple=x86_64-win32 -asm-verbose=false | FileCheck %s -check-prefix=WIN64 +; WIN64: foo: +; WIN64: subq $16, %rsp +; WIN64-NEXT: movq %rsi, (%rsp) +; WIN64-NEXT: movq %rdi, 8(%rsp) +; WIN64-NEXT: testl %ecx, %ecx +; WIN64-NEXT: jle .LBB0_3 +; WIN64-NEXT: xorl %eax, %eax +; WIN64-NEXT: movl $64, %edx +; WIN64-NEXT: leaq B(%rip), %rsi +; WIN64-NEXT: leaq A(%rip), %rdi +; WIN64-NEXT: leaq P(%rip), %r8 +; WIN64: .LBB0_2: +; WIN64-NEXT: movslq %eax, %rax +; WIN64-NEXT: movss (%rsi,%rax,4), %xmm0 +; WIN64-NEXT: addss %xmm0, %xmm0 +; WIN64-NEXT: movss %xmm0, (%rdi,%rax,4) +; WIN64-NEXT: movl %edx, (%r8,%rax,4) +; WIN64-NEXT: addl $2, %edx +; WIN64-NEXT: incl %eax +; WIN64-NEXT: cmpl %eax, %ecx +; WIN64-NEXT: jne .LBB0_2 +; WIN64-NEXT: .LBB0_3: +; WIN64-NEXT: movq 8(%rsp), %rdi +; WIN64-NEXT: movq (%rsp), %rsi +; WIN64-NEXT: addq $16, %rsp +; WIN64-NEXT: ret diff --git a/test/CodeGen/X86/tailcallbyval64.ll b/test/CodeGen/X86/tailcallbyval64.ll index 7c685b8..1b1efe7 100644 --- a/test/CodeGen/X86/tailcallbyval64.ll +++ b/test/CodeGen/X86/tailcallbyval64.ll @@ -1,15 +1,30 @@ -; RUN: llc < %s -march=x86-64 -tailcallopt | grep TAILCALL +; RUN: llc < %s -mtriple=x86_64-linux -tailcallopt | FileCheck %s + +; FIXME: Win64 does not support byval. + +; Expect the entry point. +; CHECK: tailcaller: + ; Expect 2 rep;movs because of tail call byval lowering. -; RUN: llc < %s -march=x86-64 -tailcallopt | grep rep | wc -l | grep 2 +; CHECK: rep; +; CHECK: rep; + ; A sequence of copyto/copyfrom virtual registers is used to deal with byval ; lowering appearing after moving arguments to registers. The following two ; checks verify that the register allocator changes those sequences to direct ; moves to argument register where it can (for registers that are not used in ; byval lowering - not rsi, not rdi, not rcx). ; Expect argument 4 to be moved directly to register edx. -; RUN: llc < %s -march=x86-64 -tailcallopt | grep movl | grep {7} | grep edx +; CHECK: movl $7, %edx + ; Expect argument 6 to be moved directly to register r8. -; RUN: llc < %s -march=x86-64 -tailcallopt | grep movl | grep {17} | grep r8 +; CHECK: movl $17, %r8d + +; Expect not call but jmp to @tailcallee. +; CHECK: jmp tailcallee + +; Expect the trailer. +; CHECK: .size tailcaller %struct.s = type { i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, @@ -25,5 +40,3 @@ entry: %tmp4 = tail call fastcc i64 @tailcallee(%struct.s* %a byval, i64 %tmp3, i64 %b, i64 7, i64 13, i64 17) ret i64 %tmp4 } - - diff --git a/test/CodeGen/X86/test-shrink.ll b/test/CodeGen/X86/test-shrink.ll index 1d63693..5bc28ec 100644 --- a/test/CodeGen/X86/test-shrink.ll +++ b/test/CodeGen/X86/test-shrink.ll @@ -1,8 +1,9 @@ -; RUN: llc < %s -march=x86-64 | FileCheck %s --check-prefix=CHECK-64 +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s --check-prefix=CHECK-64 +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s --check-prefix=CHECK-64 ; RUN: llc < %s -march=x86 | FileCheck %s --check-prefix=CHECK-32 ; CHECK-64: g64xh: -; CHECK-64: testb $8, %ah +; CHECK-64: testb $8, {{%ah|%ch}} ; CHECK-64: ret ; CHECK-32: g64xh: ; CHECK-32: testb $8, %ah @@ -19,7 +20,7 @@ no: ret void } ; CHECK-64: g64xl: -; CHECK-64: testb $8, %dil +; CHECK-64: testb $8, [[A0L:%dil|%cl]] ; CHECK-64: ret ; CHECK-32: g64xl: ; CHECK-32: testb $8, %al @@ -36,7 +37,7 @@ no: ret void } ; CHECK-64: g32xh: -; CHECK-64: testb $8, %ah +; CHECK-64: testb $8, {{%ah|%ch}} ; CHECK-64: ret ; CHECK-32: g32xh: ; CHECK-32: testb $8, %ah @@ -53,7 +54,7 @@ no: ret void } ; CHECK-64: g32xl: -; CHECK-64: testb $8, %dil +; CHECK-64: testb $8, [[A0L]] ; CHECK-64: ret ; CHECK-32: g32xl: ; CHECK-32: testb $8, %al @@ -70,7 +71,7 @@ no: ret void } ; CHECK-64: g16xh: -; CHECK-64: testb $8, %ah +; CHECK-64: testb $8, {{%ah|%ch}} ; CHECK-64: ret ; CHECK-32: g16xh: ; CHECK-32: testb $8, %ah @@ -87,7 +88,7 @@ no: ret void } ; CHECK-64: g16xl: -; CHECK-64: testb $8, %dil +; CHECK-64: testb $8, [[A0L]] ; CHECK-64: ret ; CHECK-32: g16xl: ; CHECK-32: testb $8, %al @@ -104,7 +105,7 @@ no: ret void } ; CHECK-64: g64x16: -; CHECK-64: testw $-32640, %di +; CHECK-64: testw $-32640, %[[A0W:di|cx]] ; CHECK-64: ret ; CHECK-32: g64x16: ; CHECK-32: testw $-32640, %ax @@ -121,7 +122,7 @@ no: ret void } ; CHECK-64: g32x16: -; CHECK-64: testw $-32640, %di +; CHECK-64: testw $-32640, %[[A0W]] ; CHECK-64: ret ; CHECK-32: g32x16: ; CHECK-32: testw $-32640, %ax @@ -138,7 +139,7 @@ no: ret void } ; CHECK-64: g64x32: -; CHECK-64: testl $268468352, %edi +; CHECK-64: testl $268468352, %e[[A0W]] ; CHECK-64: ret ; CHECK-32: g64x32: ; CHECK-32: testl $268468352, %eax diff --git a/test/CodeGen/X86/use-add-flags.ll b/test/CodeGen/X86/use-add-flags.ll index c2f0c23..4aed7f0 100644 --- a/test/CodeGen/X86/use-add-flags.ll +++ b/test/CodeGen/X86/use-add-flags.ll @@ -1,4 +1,5 @@ -; RUN: llc < %s -march=x86-64 -o - | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-linux -o - | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-win32 -o - | FileCheck %s ; Reuse the flags value from the add instructions instead of emitting separate ; testl instructions. @@ -6,10 +7,10 @@ ; Use the flags on the add. ; CHECK: test1: -; CHECK: addl (%rdi), %esi -; CHECK-NEXT: movl %edx, %eax -; CHECK-NEXT: cmovnsl %ecx, %eax -; CHECK-NEXT: ret +; CHECK: addl {{$%rdi$, %esi|$%rcx$, %edx}} +; CHECK-NEXT: movl {{%edx|%r8d}}, %eax +; CHECK-NEXT: cmovnsl {{%ecx|%r9d}}, %eax +; CHECK: ret define i32 @test1(i32* %x, i32 %y, i32 %a, i32 %b) nounwind { %tmp2 = load i32* %x, align 4 ; [#uses=1] @@ -25,7 +26,7 @@ declare void @foo(i32) ; other use. A simple test is better. ; CHECK: test2: -; CHECK: testb $16, %dil +; CHECK: testb $16, {{%dil|%cl}} define void @test2(i32 %x) nounwind { %y = and i32 %x, 16 @@ -41,7 +42,7 @@ false: ; Do use the flags result of the and here, since the and has another use. ; CHECK: test3: -; CHECK: andl $16, %edi +; CHECK: andl $16, {{%edi|%ecx}} ; CHECK-NEXT: jne define void @test3(i32 %x) nounwind { diff --git a/test/CodeGen/X86/v2f32.ll b/test/CodeGen/X86/v2f32.ll index 76c3fdf..6d14099 100644 --- a/test/CodeGen/X86/v2f32.ll +++ b/test/CodeGen/X86/v2f32.ll @@ -1,4 +1,5 @@ -; RUN: llc < %s -march=x86-64 -mcpu=penryn -asm-verbose=0 -o - | FileCheck %s -check-prefix=X64 +; RUN: llc < %s -mtriple=x86_64-linux -mcpu=penryn -asm-verbose=0 -o - | FileCheck %s -check-prefix=X64 +; RUN: llc < %s -mtriple=x86_64-win32 -mcpu=penryn -asm-verbose=0 -o - | FileCheck %s -check-prefix=W64 ; RUN: llc < %s -mcpu=yonah -march=x86 -asm-verbose=0 -o - | FileCheck %s -check-prefix=X32 ; PR7518 @@ -15,6 +16,13 @@ define void @test1(<2 x float> %Q, float *%P2) nounwind { ; X64-NEXT: movss %xmm1, (%rdi) ; X64-NEXT: ret +; W64: test1: +; W64-NEXT: movdqa (%rcx), %xmm0 +; W64-NEXT: pshufd $1, %xmm0, %xmm1 +; W64-NEXT: addss %xmm0, %xmm1 +; W64-NEXT: movss %xmm1, (%rdx) +; W64-NEXT: ret + ; X32: test1: ; X32-NEXT: pshufd $1, %xmm0, %xmm1 ; X32-NEXT: addss %xmm0, %xmm1 @@ -31,6 +39,14 @@ define <2 x float> @test2(<2 x float> %Q, <2 x float> %R, <2 x float> *%P) nounw ; X64: test2: ; X64-NEXT: addps %xmm1, %xmm0 ; X64-NEXT: ret + +; W64: test2: +; W64-NEXT: movaps (%rcx), %xmm0 +; W64-NEXT: addps (%rdx), %xmm0 +; W64-NEXT: ret + +; X32: test2: +; X32: addps %xmm1, %xmm0 } @@ -38,17 +54,35 @@ define <2 x float> @test3(<4 x float> %A) nounwind { %B = shufflevector <4 x float> %A, <4 x float> undef, <2 x i32> %C = fadd <2 x float> %B, %B ret <2 x float> %C -; CHECK: test3: -; CHECK-NEXT: addps %xmm0, %xmm0 -; CHECK-NEXT: ret +; X64: test3: +; X64-NEXT: addps %xmm0, %xmm0 +; X64-NEXT: ret + +; W64: test3: +; W64-NEXT: movaps (%rcx), %xmm0 +; W64-NEXT: addps %xmm0, %xmm0 +; W64-NEXT: ret + +; X32: test3: +; X32-NEXT: addps %xmm0, %xmm0 +; X32-NEXT: ret } define <2 x float> @test4(<2 x float> %A) nounwind { %C = fadd <2 x float> %A, %A ret <2 x float> %C -; CHECK: test4: -; CHECK-NEXT: addps %xmm0, %xmm0 -; CHECK-NEXT: ret +; X64: test4: +; X64-NEXT: addps %xmm0, %xmm0 +; X64-NEXT: ret + +; W64: test4: +; W64-NEXT: movaps (%rcx), %xmm0 +; W64-NEXT: addps %xmm0, %xmm0 +; W64-NEXT: ret + +; X32: test4: +; X32-NEXT: addps %xmm0, %xmm0 +; X32-NEXT: ret } define <4 x float> @test5(<4 x float> %A) nounwind { @@ -61,10 +95,21 @@ BB: %E = shufflevector <2 x float> %D, <2 x float> undef, <4 x i32> ret <4 x float> %E -; CHECK: _test5: -; CHECK-NEXT: addps %xmm0, %xmm0 -; CHECK-NEXT: addps %xmm0, %xmm0 -; CHECK-NEXT: ret +; X64: test5: +; X64-NEXT: addps %xmm0, %xmm0 +; X64-NEXT: addps %xmm0, %xmm0 +; X64-NEXT: ret + +; W64: test5: +; W64-NEXT: movaps (%rcx), %xmm0 +; W64-NEXT: addps %xmm0, %xmm0 +; W64-NEXT: addps %xmm0, %xmm0 +; W64-NEXT: ret + +; X32: test5: +; X32-NEXT: addps %xmm0, %xmm0 +; X32-NEXT: addps %xmm0, %xmm0 +; X32-NEXT: ret } diff --git a/test/CodeGen/X86/vec_cast.ll b/test/CodeGen/X86/vec_cast.ll index 95289c9..6263d58 100644 --- a/test/CodeGen/X86/vec_cast.ll +++ b/test/CodeGen/X86/vec_cast.ll @@ -1,5 +1,6 @@ ; RUN: llc < %s -march=x86-64 -mcpu=core2 - +; PR8311 +; XFAIL: mingw,win32 define <8 x i32> @a(<8 x i16> %a) nounwind { %c = sext <8 x i16> %a to <8 x i32> diff --git a/test/CodeGen/X86/vec_set-8.ll b/test/CodeGen/X86/vec_set-8.ll index 9697f11..66056d0 100644 --- a/test/CodeGen/X86/vec_set-8.ll +++ b/test/CodeGen/X86/vec_set-8.ll @@ -1,5 +1,8 @@ -; RUN: llc < %s -march=x86-64 | not grep movsd -; RUN: llc < %s -march=x86-64 | grep {movd.*%rdi,.*%xmm0} +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s +; CHECK-NOT: movsd +; CHECK: movd {{%rdi|%rcx}}, %xmm0 +; CHECK-NOT: movsd define <2 x i64> @test(i64 %i) nounwind { entry: diff --git a/test/CodeGen/X86/vec_shuffle-17.ll b/test/CodeGen/X86/vec_shuffle-17.ll index 9c33abb..ebc8c5b 100644 --- a/test/CodeGen/X86/vec_shuffle-17.ll +++ b/test/CodeGen/X86/vec_shuffle-17.ll @@ -1,5 +1,8 @@ -; RUN: llc < %s -march=x86-64 | grep {movd.*%rdi, %xmm0} -; RUN: llc < %s -march=x86-64 | not grep xor +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s +; CHECK-NOT: xor +; CHECK: movd {{%rdi|%rcx}}, %xmm0 +; CHECK-NOT: xor ; PR2108 define <2 x i64> @doload64(i64 %x) nounwind { diff --git a/test/CodeGen/X86/vec_shuffle-37.ll b/test/CodeGen/X86/vec_shuffle-37.ll index b090930..2efdb14 100644 --- a/test/CodeGen/X86/vec_shuffle-37.ll +++ b/test/CodeGen/X86/vec_shuffle-37.ll @@ -1,9 +1,10 @@ -; RUN: llc < %s -march=x86-64 | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s ; RUN: llc -O0 < %s -march=x86 -mcpu=core2 | FileCheck %s --check-prefix=CHECK_O0 define <4 x i32> @t00(<4 x i32>* %a0) nounwind ssp { entry: -; CHECK: movaps (%rdi), %xmm0 +; CHECK: movaps ({{%rdi|%rcx}}), %xmm0 ; CHECK-NEXT: movaps %xmm0, %xmm1 ; CHECK-NEXT: movlps (%rax), %xmm1 ; CHECK-NEXT: shufps $36, %xmm1, %xmm0 diff --git a/test/CodeGen/X86/widen_load-0.ll b/test/CodeGen/X86/widen_load-0.ll index f6c4af0..82c8252 100644 --- a/test/CodeGen/X86/widen_load-0.ll +++ b/test/CodeGen/X86/widen_load-0.ll @@ -1,4 +1,5 @@ -; RUN: llc < %s -o - -march=x86-64 | FileCheck %s +; RUN: llc < %s -o - -mtriple=x86_64-linux | FileCheck %s +; RUN: llc < %s -o - -mtriple=x86_64-win32 | FileCheck %s -check-prefix=WIN64 ; PR4891 ; Both loads should happen before either store. @@ -8,6 +9,11 @@ ; CHECK: movl %ecx, (%rdi) ; CHECK: movl %eax, (%rsi) +; WIN64: movl (%rcx), %eax +; WIN64: movl (%rdx), %esi +; WIN64: movl %esi, (%rcx) +; WIN64: movl %eax, (%rdx) + define void @short2_int_swap(<2 x i16>* nocapture %b, i32* nocapture %c) nounwind { entry: %0 = load <2 x i16>* %b, align 2 ; <<2 x i16>> [#uses=1] diff --git a/test/CodeGen/X86/x86-64-malloc.ll b/test/CodeGen/X86/x86-64-malloc.ll index b4f1fa6..4aa0ec3 100644 --- a/test/CodeGen/X86/x86-64-malloc.ll +++ b/test/CodeGen/X86/x86-64-malloc.ll @@ -1,4 +1,6 @@ -; RUN: llc < %s -march=x86-64 | grep {shll.*3, %edi} +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s +; CHECK: shll $3, {{%edi|%ecx}} ; PR3829 ; The generated code should multiply by 3 (sizeof i8*) as an i32, ; not as an i64! diff --git a/test/CodeGen/X86/xor.ll b/test/CodeGen/X86/xor.ll index 6c623cb..b90d81a 100644 --- a/test/CodeGen/X86/xor.ll +++ b/test/CodeGen/X86/xor.ll @@ -1,5 +1,6 @@ ; RUN: llc < %s -march=x86 -mattr=+sse2 | FileCheck %s -check-prefix=X32 -; RUN: llc < %s -march=x86-64 | FileCheck %s -check-prefix=X64 +; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s -check-prefix=X64 +; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s -check-prefix=X64 ; Though it is undefined, we want xor undef,undef to produce zero. define <4 x i32> @test1() nounwind { @@ -28,9 +29,9 @@ entry: ret i32 %tmp4 ; X64: test3: -; X64: notl %esi -; X64: andl %edi, %esi -; X64: movl %esi, %eax +; X64: notl [[A1:%esi|%edx]] +; X64: andl [[A0:%edi|%ecx]], [[A1]] +; X64: movl [[A1]], %eax ; X64: shrl %eax ; X64: ret From baldrick at free.fr Thu Feb 17 02:16:06 2011 From: baldrick at free.fr (Duncan Sands) Date: Thu, 17 Feb 2011 09:16:06 +0100 Subject: [llvm-commits] [llvm] r125393 - in /llvm/trunk: lib/VMCore/ConstantFold.cpp test/Transforms/InstCombine/bitcast-vec-uniform.ll test/Transforms/InstCombine/fold-vector-select.ll In-Reply-To: <6594DDFF12B03D4E89690887C2486994027105D780@hasmsx504.ger.corp.intel.com> References: <20110211193756.00C782A6C12C@llvm.org> <33543FF9-1ACE-4D44-8E7F-6D73B5F52D06@googlemail.com> <6594DDFF12B03D4E89690887C24869940270CCB0D6@hasmsx504.ger.corp.intel.com> <4D580EB3.2070701@free.fr> <4D5855BE.5080307@mxc.ca> <6594DDFF12B03D4E89690887C24869940270FC96E7@hasmsx504.ger.corp.intel.com> <6594DDFF12B03D4E89690887C2486994027105D780@hasmsx504.ger.corp.intel.com> Message-ID: <4D5CD946.6040800@free.fr> Hi Nadav, > I attached a revised patch which supports getAllOnesValue on FP values. I added minor changes to APFloat as well as new tests. > --- include/llvm/ADT/APFloat.h (revision 125681) > +++ include/llvm/ADT/APFloat.h (working copy) > @@ -246,6 +246,13 @@ > static APFloat getSmallestNormalized(const fltSemantics &Sem, > bool Negative = false); > > + /// getAllOnesValue - Returns a float which is bitcasted from > + /// an all one value int I don't think you should mention bitcasting here. How about: Returns a float with every bit set to one. > --- lib/VMCore/Constants.cpp (revision 125681) > +++ lib/VMCore/Constants.cpp (working copy) > @@ -93,7 +93,26 @@ > if (const IntegerType *ITy = dyn_cast(Ty)) > return ConstantInt::get(Ty->getContext(), > APInt::getAllOnesValue(ITy->getBitWidth())); > - > + > + if (Ty->isFloatingPointTy()) { > + APFloat FL(0.0f); > + switch (Ty->getTypeID()) { You can get the bitwidth using Ty->getPrimitiveSizeInBits(). Thus you only have to worry about setting the IEEE flag right. So the switch etc can be turned into something like this: APFloat FL = APFloat::getAllOnesValue(Ty->getPrimitiveSizeInBits(), Ty->isPPC_FP128Ty()); Ciao, Duncan. From baldrick at free.fr Thu Feb 17 02:16:56 2011 From: baldrick at free.fr (Duncan Sands) Date: Thu, 17 Feb 2011 08:16:56 -0000 Subject: [llvm-commits] [llvm] r125738 - /llvm/trunk/lib/Target/README.txt Message-ID: <20110217081656.E3C642A6C12C@llvm.org> Author: baldrick Date: Thu Feb 17 02:16:56 2011 New Revision: 125738 URL: http://llvm.org/viewvc/llvm-project?rev=125738&view=rev Log: This has been implemented. Modified: llvm/trunk/lib/Target/README.txt Modified: llvm/trunk/lib/Target/README.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/README.txt?rev=125738&r1=125737&r2=125738&view=diff ============================================================================== --- llvm/trunk/lib/Target/README.txt (original) +++ llvm/trunk/lib/Target/README.txt Thu Feb 17 02:16:56 2011 @@ -2225,16 +2225,6 @@ //===---------------------------------------------------------------------===// -We should fold compares like this: - - %1266 = add nsw i32 %.84.i.i.i, 1 - %560 = add nsw i32 %556, 1 - %1267 = icmp slt i32 %1266, %560 - -to a single 'icmp slt' when the add's have a single use, since they are NSW. - -//===---------------------------------------------------------------------===// - We don't fold (icmp (add) (add)) unless the two adds only have a single use. There are a lot of cases that we're refusing to fold in (e.g.) 256.bzip2, for example: From baldrick at free.fr Thu Feb 17 02:35:15 2011 From: baldrick at free.fr (Duncan Sands) Date: Thu, 17 Feb 2011 09:35:15 +0100 Subject: [llvm-commits] [PATCH][llvm][clang] Use Triple::MinGW32 instead of Triple::MinGW64 In-Reply-To: References: Message-ID: <4D5CDDC3.5040009@free.fr> Hi Takumi, > I have reworked Triple patches. > > - Use Triple::MinGW32. (I got rid of Triple::MinGW) > - *-mingw64 is no longer recognized. Use *-mingw32. > > Please take a look into them, thank you. they look fine to me, though I'm not competent to comment on the last one (clang header search paths). Ciao, Duncan. From fvbommel at gmail.com Thu Feb 17 03:41:19 2011 From: fvbommel at gmail.com (Frits van Bommel) Date: Thu, 17 Feb 2011 10:41:19 +0100 Subject: [llvm-commits] [llvm] r125393 - in /llvm/trunk: lib/VMCore/ConstantFold.cpp test/Transforms/InstCombine/bitcast-vec-uniform.ll test/Transforms/InstCombine/fold-vector-select.ll In-Reply-To: <4D5CD946.6040800@free.fr> References: <20110211193756.00C782A6C12C@llvm.org> <33543FF9-1ACE-4D44-8E7F-6D73B5F52D06@googlemail.com> <6594DDFF12B03D4E89690887C24869940270CCB0D6@hasmsx504.ger.corp.intel.com> <4D580EB3.2070701@free.fr> <4D5855BE.5080307@mxc.ca> <6594DDFF12B03D4E89690887C24869940270FC96E7@hasmsx504.ger.corp.intel.com> <6594DDFF12B03D4E89690887C2486994027105D780@hasmsx504.ger.corp.intel.com> <4D5CD946.6040800@free.fr> Message-ID: On Thu, Feb 17, 2011 at 9:16 AM, Duncan Sands wrote: >> + ?if (Ty->isFloatingPointTy()) { >> + ? ?APFloat FL(0.0f); >> + ? ?switch (Ty->getTypeID()) { > > You can get the bitwidth using Ty->getPrimitiveSizeInBits(). ?Thus you only > have to worry about setting the IEEE flag right. ?So the switch etc can be > turned into something like this: > ?APFloat FL = APFloat::getAllOnesValue(Ty->getPrimitiveSizeInBits(), > Ty->isPPC_FP128Ty()); I think you meant '!Ty->isPPC_FP128Ty()' there. Nadav's patch got this wrong too. From baldrick at free.fr Thu Feb 17 03:52:32 2011 From: baldrick at free.fr (Duncan Sands) Date: Thu, 17 Feb 2011 10:52:32 +0100 Subject: [llvm-commits] [llvm] r125393 - in /llvm/trunk: lib/VMCore/ConstantFold.cpp test/Transforms/InstCombine/bitcast-vec-uniform.ll test/Transforms/InstCombine/fold-vector-select.ll In-Reply-To: References: <20110211193756.00C782A6C12C@llvm.org> <33543FF9-1ACE-4D44-8E7F-6D73B5F52D06@googlemail.com> <6594DDFF12B03D4E89690887C24869940270CCB0D6@hasmsx504.ger.corp.intel.com> <4D580EB3.2070701@free.fr> <4D5855BE.5080307@mxc.ca> <6594DDFF12B03D4E89690887C24869940270FC96E7@hasmsx504.ger.corp.intel.com> <6594DDFF12B03D4E89690887C2486994027105D780@hasmsx504.ger.corp.intel.com> <4D5CD946.6040800@free.fr> Message-ID: <4D5CEFE0.5070801@free.fr> Hi Frits, >> You can get the bitwidth using Ty->getPrimitiveSizeInBits(). Thus you only >> have to worry about setting the IEEE flag right. So the switch etc can be >> turned into something like this: >> APFloat FL = APFloat::getAllOnesValue(Ty->getPrimitiveSizeInBits(), >> Ty->isPPC_FP128Ty()); > > I think you meant '!Ty->isPPC_FP128Ty()' there. Nadav's patch got this > wrong too. yup. Ciao, Duncan. From geek4civic at gmail.com Thu Feb 17 06:23:50 2011 From: geek4civic at gmail.com (NAKAMURA Takumi) Date: Thu, 17 Feb 2011 12:23:50 -0000 Subject: [llvm-commits] [llvm] r125746 - in /llvm/trunk/lib/Target/X86: X86Subtarget.h X86TargetMachine.cpp Message-ID: <20110217122350.E40C42A6C12C@llvm.org> Author: chapuni Date: Thu Feb 17 06:23:50 2011 New Revision: 125746 URL: http://llvm.org/viewvc/llvm-project?rev=125746&view=rev Log: Fix whitespace. Modified: llvm/trunk/lib/Target/X86/X86Subtarget.h llvm/trunk/lib/Target/X86/X86TargetMachine.cpp Modified: llvm/trunk/lib/Target/X86/X86Subtarget.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86Subtarget.h?rev=125746&r1=125745&r2=125746&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86Subtarget.h (original) +++ llvm/trunk/lib/Target/X86/X86Subtarget.h Thu Feb 17 06:23:50 2011 @@ -103,7 +103,7 @@ /// Max. memset / memcpy size that is turned into rep/movs, rep/stos ops. /// unsigned MaxInlineSizeThreshold; - + /// TargetTriple - What processor and OS we're targeting. Triple TargetTriple; @@ -166,23 +166,23 @@ bool hasVectorUAMem() const { return HasVectorUAMem; } bool isTargetDarwin() const { return TargetTriple.getOS() == Triple::Darwin; } - + // ELF is a reasonably sane default and the only other X86 targets we // support are Darwin and Windows. Just use "not those". - bool isTargetELF() const { + bool isTargetELF() const { return !isTargetDarwin() && !isTargetWindows() && !isTargetCygMing(); } bool isTargetLinux() const { return TargetTriple.getOS() == Triple::Linux; } bool isTargetWindows() const { return TargetTriple.getOS() == Triple::Win32; } - bool isTargetMingw() const { + bool isTargetMingw() const { return TargetTriple.getOS() == Triple::MinGW32 || TargetTriple.getOS() == Triple::MinGW64; } bool isTargetCygwin() const { return TargetTriple.getOS() == Triple::Cygwin; } bool isTargetCygMing() const { return isTargetMingw() || isTargetCygwin(); } - + /// isTargetCOFF - Return true if this is any COFF/Windows target variant. bool isTargetCOFF() const { return isTargetMingw() || isTargetCygwin() || isTargetWindows(); Modified: llvm/trunk/lib/Target/X86/X86TargetMachine.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetMachine.cpp?rev=125746&r1=125745&r2=125746&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86TargetMachine.cpp (original) +++ llvm/trunk/lib/Target/X86/X86TargetMachine.cpp Thu Feb 17 06:23:50 2011 @@ -65,7 +65,7 @@ } } -extern "C" void LLVMInitializeX86Target() { +extern "C" void LLVMInitializeX86Target() { // Register the target. RegisterTargetMachine X(TheX86_32Target); RegisterTargetMachine Y(TheX86_64Target); @@ -122,7 +122,7 @@ /// X86TargetMachine ctor - Create an X86 target. /// -X86TargetMachine::X86TargetMachine(const Target &T, const std::string &TT, +X86TargetMachine::X86TargetMachine(const Target &T, const std::string &TT, const std::string &FS, bool is64Bit) : LLVMTargetMachine(T, TT), Subtarget(TT, FS, is64Bit), @@ -234,12 +234,12 @@ JITCodeEmitter &JCE) { // FIXME: Move this to TargetJITInfo! // On Darwin, do not override 64-bit setting made in X86TargetMachine(). - if (DefRelocModel == Reloc::Default && + if (DefRelocModel == Reloc::Default && (!Subtarget.isTargetDarwin() || !Subtarget.is64Bit())) { setRelocationModel(Reloc::Static); Subtarget.setPICStyle(PICStyles::None); } - + PM.add(createX86JITCodeEmitterPass(*this, JCE)); From geek4civic at gmail.com Thu Feb 17 06:24:17 2011 From: geek4civic at gmail.com (NAKAMURA Takumi) Date: Thu, 17 Feb 2011 12:24:17 -0000 Subject: [llvm-commits] [llvm] r125747 - in /llvm/trunk: include/llvm/ADT/Triple.h lib/Support/Triple.cpp lib/Target/ARM/ARMTargetMachine.cpp lib/Target/MBlaze/MBlazeTargetMachine.cpp lib/Target/X86/X86AsmBackend.cpp lib/Target/X86/X86Subtarget.h lib/Target/X86/X86TargetMachine.cpp test/CodeGen/X86/2009-06-03-Win64DisableRedZone.ll test/CodeGen/X86/2009-06-03-Win64SpillXMM.ll Message-ID: <20110217122417.9F4992A6C12C@llvm.org> Author: chapuni Date: Thu Feb 17 06:24:17 2011 New Revision: 125747 URL: http://llvm.org/viewvc/llvm-project?rev=125747&view=rev Log: Triple::MinGW64 is deprecated and removed. We can use Triple::MinGW32 generally. No one uses *-mingw64. mingw-w64 is represented as {i686|x86_64}-w64-mingw32. In llvm side, i686 and x64 can be treated as similar way. Modified: llvm/trunk/include/llvm/ADT/Triple.h llvm/trunk/lib/Support/Triple.cpp llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp llvm/trunk/lib/Target/MBlaze/MBlazeTargetMachine.cpp llvm/trunk/lib/Target/X86/X86AsmBackend.cpp llvm/trunk/lib/Target/X86/X86Subtarget.h llvm/trunk/lib/Target/X86/X86TargetMachine.cpp llvm/trunk/test/CodeGen/X86/2009-06-03-Win64DisableRedZone.ll llvm/trunk/test/CodeGen/X86/2009-06-03-Win64SpillXMM.ll Modified: llvm/trunk/include/llvm/ADT/Triple.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/Triple.h?rev=125747&r1=125746&r2=125747&view=diff ============================================================================== --- llvm/trunk/include/llvm/ADT/Triple.h (original) +++ llvm/trunk/include/llvm/ADT/Triple.h Thu Feb 17 06:24:17 2011 @@ -84,8 +84,7 @@ FreeBSD, Linux, Lv2, // PS3 - MinGW32, - MinGW64, + MinGW32, // i*86-pc-mingw32, *-w64-mingw32 NetBSD, OpenBSD, Psp, Modified: llvm/trunk/lib/Support/Triple.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Triple.cpp?rev=125747&r1=125746&r2=125747&view=diff ============================================================================== --- llvm/trunk/lib/Support/Triple.cpp (original) +++ llvm/trunk/lib/Support/Triple.cpp Thu Feb 17 06:24:17 2011 @@ -101,7 +101,6 @@ case Linux: return "linux"; case Lv2: return "lv2"; case MinGW32: return "mingw32"; - case MinGW64: return "mingw64"; case NetBSD: return "netbsd"; case OpenBSD: return "openbsd"; case Psp: return "psp"; @@ -318,8 +317,6 @@ return Lv2; else if (OSName.startswith("mingw32")) return MinGW32; - else if (OSName.startswith("mingw64")) - return MinGW64; else if (OSName.startswith("netbsd")) return NetBSD; else if (OSName.startswith("openbsd")) Modified: llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp?rev=125747&r1=125746&r2=125747&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp (original) +++ llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp Thu Feb 17 06:24:17 2011 @@ -45,7 +45,6 @@ case Triple::Darwin: return createMachOStreamer(Ctx, TAB, OS, Emitter, RelaxAll); case Triple::MinGW32: - case Triple::MinGW64: case Triple::Cygwin: case Triple::Win32: llvm_unreachable("ARM does not support Windows COFF format"); Modified: llvm/trunk/lib/Target/MBlaze/MBlazeTargetMachine.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/MBlaze/MBlazeTargetMachine.cpp?rev=125747&r1=125746&r2=125747&view=diff ============================================================================== --- llvm/trunk/lib/Target/MBlaze/MBlazeTargetMachine.cpp (original) +++ llvm/trunk/lib/Target/MBlaze/MBlazeTargetMachine.cpp Thu Feb 17 06:24:17 2011 @@ -41,7 +41,6 @@ llvm_unreachable("MBlaze does not support Darwin MACH-O format"); return NULL; case Triple::MinGW32: - case Triple::MinGW64: case Triple::Cygwin: case Triple::Win32: llvm_unreachable("MBlaze does not support Windows COFF format"); Modified: llvm/trunk/lib/Target/X86/X86AsmBackend.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86AsmBackend.cpp?rev=125747&r1=125746&r2=125747&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86AsmBackend.cpp (original) +++ llvm/trunk/lib/Target/X86/X86AsmBackend.cpp Thu Feb 17 06:24:17 2011 @@ -428,7 +428,7 @@ switch (Triple(TT).getOS()) { case Triple::Darwin: return new DarwinX86_64AsmBackend(T); - case Triple::MinGW64: + case Triple::MinGW32: case Triple::Cygwin: case Triple::Win32: if (Triple(TT).getEnvironment() == Triple::MachO) Modified: llvm/trunk/lib/Target/X86/X86Subtarget.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86Subtarget.h?rev=125747&r1=125746&r2=125747&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86Subtarget.h (original) +++ llvm/trunk/lib/Target/X86/X86Subtarget.h Thu Feb 17 06:24:17 2011 @@ -175,9 +175,7 @@ bool isTargetLinux() const { return TargetTriple.getOS() == Triple::Linux; } bool isTargetWindows() const { return TargetTriple.getOS() == Triple::Win32; } - bool isTargetMingw() const { - return TargetTriple.getOS() == Triple::MinGW32 || - TargetTriple.getOS() == Triple::MinGW64; } + bool isTargetMingw() const { return TargetTriple.getOS() == Triple::MinGW32; } bool isTargetCygwin() const { return TargetTriple.getOS() == Triple::Cygwin; } bool isTargetCygMing() const { return isTargetMingw() || isTargetCygwin(); Modified: llvm/trunk/lib/Target/X86/X86TargetMachine.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetMachine.cpp?rev=125747&r1=125746&r2=125747&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86TargetMachine.cpp (original) +++ llvm/trunk/lib/Target/X86/X86TargetMachine.cpp Thu Feb 17 06:24:17 2011 @@ -30,7 +30,6 @@ case Triple::Darwin: return new X86MCAsmInfoDarwin(TheTriple); case Triple::MinGW32: - case Triple::MinGW64: case Triple::Cygwin: case Triple::Win32: if (TheTriple.getEnvironment() == Triple::MachO) @@ -53,7 +52,6 @@ case Triple::Darwin: return createMachOStreamer(Ctx, TAB, _OS, _Emitter, RelaxAll); case Triple::MinGW32: - case Triple::MinGW64: case Triple::Cygwin: case Triple::Win32: if (TheTriple.getEnvironment() == Triple::MachO) Modified: llvm/trunk/test/CodeGen/X86/2009-06-03-Win64DisableRedZone.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2009-06-03-Win64DisableRedZone.ll?rev=125747&r1=125746&r2=125747&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/2009-06-03-Win64DisableRedZone.ll (original) +++ llvm/trunk/test/CodeGen/X86/2009-06-03-Win64DisableRedZone.ll Thu Feb 17 06:24:17 2011 @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=x86_64-pc-mingw64 < %s | FileCheck %s +; RUN: llc -mtriple=x86_64-mingw32 < %s | FileCheck %s ; CHECK-NOT: -{{[1-9][0-9]*}}(%rsp) define x86_fp80 @a(i64 %x) nounwind readnone { Modified: llvm/trunk/test/CodeGen/X86/2009-06-03-Win64SpillXMM.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2009-06-03-Win64SpillXMM.ll?rev=125747&r1=125746&r2=125747&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/2009-06-03-Win64SpillXMM.ll (original) +++ llvm/trunk/test/CodeGen/X86/2009-06-03-Win64SpillXMM.ll Thu Feb 17 06:24:17 2011 @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=x86_64-pc-mingw64 < %s | FileCheck %s +; RUN: llc -mtriple=x86_64-mingw32 < %s | FileCheck %s ; CHECK: subq $40, %rsp ; CHECK: movaps %xmm8, (%rsp) ; CHECK: movaps %xmm7, 16(%rsp) From baldrick at free.fr Thu Feb 17 06:42:48 2011 From: baldrick at free.fr (Duncan Sands) Date: Thu, 17 Feb 2011 12:42:48 -0000 Subject: [llvm-commits] [llvm] r125748 - /llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Message-ID: <20110217124248.AC1F32A6C12C@llvm.org> Author: baldrick Date: Thu Feb 17 06:42:48 2011 New Revision: 125748 URL: http://llvm.org/viewvc/llvm-project?rev=125748&view=rev Log: Fix wrong logic in promotion of signed mul-with-overflow (I pointed this out at the time but presumably my email got lost). Examples where the previous logic got it wrong: (1) a signed i8 multiply of 64 by 2 overflows, but the high part is zero; (2) a signed i8 multiple of -128 by 2 overflows, but the high part is all ones. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp?rev=125748&r1=125747&r2=125748&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Thu Feb 17 06:42:48 2011 @@ -548,16 +548,15 @@ return Res; } - SDValue DAGTypeLegalizer::PromoteIntRes_XMULO(SDNode *N, unsigned ResNo) { // Promote the overflow bit trivially. if (ResNo == 1) return PromoteIntRes_Overflow(N); - + SDValue LHS = N->getOperand(0), RHS = N->getOperand(1); DebugLoc DL = N->getDebugLoc(); - unsigned SmallSize = LHS.getValueType().getSizeInBits(); - + EVT SmallVT = LHS.getValueType(); + // To determine if the result overflowed in a larger type, we extend the input // to the larger type, do the multiply, then check the high bits of the result // to see if the overflow happened. @@ -568,26 +567,22 @@ LHS = ZExtPromotedInteger(LHS); RHS = ZExtPromotedInteger(RHS); } - SDValue Mul = DAG.getNode(ISD::MUL, DL, LHS.getValueType(), LHS, RHS); - - - // For an unsigned overflow, we check to see if the high part is != 0; + + // Overflow occurred iff the high part of the result does not zero/sign-extend + // the low part. SDValue Overflow; if (N->getOpcode() == ISD::UMULO) { + // Unsigned overflow occurred iff the high part is non-zero. SDValue Hi = DAG.getNode(ISD::SRL, DL, Mul.getValueType(), Mul, - DAG.getIntPtrConstant(SmallSize)); - // Overflowed if and only if this is not equal to Res. + DAG.getIntPtrConstant(SmallVT.getSizeInBits())); Overflow = DAG.getSetCC(DL, N->getValueType(1), Hi, DAG.getConstant(0, Hi.getValueType()), ISD::SETNE); } else { - // Signed multiply overflowed if the high part is not 0 and not -1. - SDValue Hi = DAG.getNode(ISD::SRA, DL, Mul.getValueType(), Mul, - DAG.getIntPtrConstant(SmallSize)); - Hi = DAG.getNode(ISD::ADD, DL, Hi.getValueType(), Hi, - DAG.getConstant(1, Hi.getValueType())); - Overflow = DAG.getSetCC(DL, N->getValueType(1), Hi, - DAG.getConstant(1, Hi.getValueType()), ISD::SETUGT); + // Signed overflow occurred iff the high part does not sign extend the low. + SDValue SExt = DAG.getNode(ISD::SIGN_EXTEND_INREG, DL, Mul.getValueType(), + Mul, DAG.getValueType(SmallVT)); + Overflow = DAG.getSetCC(DL, N->getValueType(1), SExt, Mul, ISD::SETNE); } // Use the calculated overflow everywhere. @@ -595,7 +590,6 @@ return Mul; } - SDValue DAGTypeLegalizer::PromoteIntRes_UDIV(SDNode *N) { // Zero extend the input. SDValue LHS = ZExtPromotedInteger(N->getOperand(0)); From rafael.espindola at gmail.com Thu Feb 17 10:45:04 2011 From: rafael.espindola at gmail.com (Rafael Avila de Espindola) Date: Thu, 17 Feb 2011 11:45:04 -0500 Subject: [llvm-commits] [patch] Refactoring of the llvm mangler In-Reply-To: <4D55953A.2070809@gmail.com> References: <4D55953A.2070809@gmail.com> Message-ID: <4D5D5090.9070604@gmail.com> Ping. The fix for PR9177 ended up being a hack where clang knows some of the asm names. A simpler mangler could make it more general (and LTO faster). On 11-02-11 02:59 PM, Rafael Avila de Espindola wrote: > My first idea for fixing PR9177 involved having clang know all about > assembly names. Anton pointed me at how llvm-gcc does it and I think a > similar hack might be sufficient. > > In any case, I wrote a refactoring patch for the llvm mangler that might > be a good thing even if it is not needed for PR9177. > > The patch changes the mangler to use streams and explicitly separates > the add prefix, mangle the name proper and add suffix steps. This makes > it easier to identify (and maybe drop) some of its strange features. > > It also fixes the "FIXME: This logic seems unlikely to be right." :-) Cheers, Rafael From gohman at apple.com Thu Feb 17 12:50:20 2011 From: gohman at apple.com (Dan Gohman) Date: Thu, 17 Feb 2011 18:50:20 -0000 Subject: [llvm-commits] [llvm] r125759 - /llvm/trunk/lib/Target/X86/X86InstrCompiler.td Message-ID: <20110217185020.14CA02A6C12C@llvm.org> Author: djg Date: Thu Feb 17 12:50:19 2011 New Revision: 125759 URL: http://llvm.org/viewvc/llvm-project?rev=125759&view=rev Log: The labyrinthine X86 backend no longer appears to require these patterns. Modified: llvm/trunk/lib/Target/X86/X86InstrCompiler.td Modified: llvm/trunk/lib/Target/X86/X86InstrCompiler.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrCompiler.td?rev=125759&r1=125758&r2=125759&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86InstrCompiler.td (original) +++ llvm/trunk/lib/Target/X86/X86InstrCompiler.td Thu Feb 17 12:50:19 2011 @@ -890,43 +890,6 @@ def : Pat<(X86call (i32 imm:$dst)), (CALLpcrel32 imm:$dst)>, Requires<[CallImmAddr]>; -// X86 specific add which produces a flag. -def : Pat<(addc GR32:$src1, GR32:$src2), - (ADD32rr GR32:$src1, GR32:$src2)>; -def : Pat<(addc GR32:$src1, (load addr:$src2)), - (ADD32rm GR32:$src1, addr:$src2)>; -def : Pat<(addc GR32:$src1, imm:$src2), - (ADD32ri GR32:$src1, imm:$src2)>; -def : Pat<(addc GR32:$src1, i32immSExt8:$src2), - (ADD32ri8 GR32:$src1, i32immSExt8:$src2)>; - -def : Pat<(addc GR64:$src1, GR64:$src2), - (ADD64rr GR64:$src1, GR64:$src2)>; -def : Pat<(addc GR64:$src1, (load addr:$src2)), - (ADD64rm GR64:$src1, addr:$src2)>; -def : Pat<(addc GR64:$src1, i64immSExt8:$src2), - (ADD64ri8 GR64:$src1, i64immSExt8:$src2)>; -def : Pat<(addc GR64:$src1, i64immSExt32:$src2), - (ADD64ri32 GR64:$src1, imm:$src2)>; - -def : Pat<(subc GR32:$src1, GR32:$src2), - (SUB32rr GR32:$src1, GR32:$src2)>; -def : Pat<(subc GR32:$src1, (load addr:$src2)), - (SUB32rm GR32:$src1, addr:$src2)>; -def : Pat<(subc GR32:$src1, imm:$src2), - (SUB32ri GR32:$src1, imm:$src2)>; -def : Pat<(subc GR32:$src1, i32immSExt8:$src2), - (SUB32ri8 GR32:$src1, i32immSExt8:$src2)>; - -def : Pat<(subc GR64:$src1, GR64:$src2), - (SUB64rr GR64:$src1, GR64:$src2)>; -def : Pat<(subc GR64:$src1, (load addr:$src2)), - (SUB64rm GR64:$src1, addr:$src2)>; -def : Pat<(subc GR64:$src1, i64immSExt8:$src2), - (SUB64ri8 GR64:$src1, i64immSExt8:$src2)>; -def : Pat<(subc GR64:$src1, imm:$src2), - (SUB64ri32 GR64:$src1, i64immSExt32:$src2)>; - // Comparisons. // TEST R,R is smaller than CMP R,0 From isanbard at gmail.com Thu Feb 17 13:08:34 2011 From: isanbard at gmail.com (Bill Wendling) Date: Thu, 17 Feb 2011 19:08:34 -0000 Subject: [llvm-commits] [www] r125763 - /www/trunk/index.html Message-ID: <20110217190835.0927A2A6C12C@llvm.org> Author: void Date: Thu Feb 17 13:08:34 2011 New Revision: 125763 URL: http://llvm.org/viewvc/llvm-project?rev=125763&view=rev Log: Add schedule for LLVM 2.9 release. Modified: www/trunk/index.html Modified: www/trunk/index.html URL: http://llvm.org/viewvc/llvm-project/www/trunk/index.html?rev=125763&r1=125762&r2=125763&view=diff ============================================================================== --- www/trunk/index.html (original) +++ www/trunk/index.html Thu Feb 17 13:08:34 2011 @@ -131,7 +131,15 @@
~~Upcoming Releases~~

-
The LLVM 2.9 release schedule is TBD
+
LLVM 2.9 Tentative Release Schedule
+
+
March 6th — Branch for release.
+
March 7th-14th — Testing Phase 1
+
March 14th-21st — Preparation for Phase 2 (fixing bugs, merging patches)
+
March 21st-28th — Testing Phase 2
+
March 28th-April 3rd — Preparation for release
+
April 3rd — Release
+

From stoklund at 2pi.dk Thu Feb 17 13:13:53 2011 From: stoklund at 2pi.dk (Jakob Stoklund Olesen) Date: Thu, 17 Feb 2011 19:13:53 -0000 Subject: [llvm-commits] [llvm] r125764 - in /llvm/trunk/lib/CodeGen: RegAllocGreedy.cpp SplitKit.h Message-ID: <20110217191353.43B2A2A6C12C@llvm.org> Author: stoklund Date: Thu Feb 17 13:13:53 2011 New Revision: 125764 URL: http://llvm.org/viewvc/llvm-project?rev=125764&view=rev Log: Split local live ranges. A local live range is live in a single basic block. If such a range fails to allocate, try to find a sub-range that would get a larger spill weight than its interference. Modified: llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp llvm/trunk/lib/CodeGen/SplitKit.h Modified: llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp?rev=125764&r1=125763&r2=125764&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp (original) +++ llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp Thu Feb 17 13:13:53 2011 @@ -72,6 +72,10 @@ /// All basic blocks where the current register is live. SmallVector SpillConstraints; + /// For every instruction in SA->UseSlots, store the previous non-copy + /// instruction. + SmallVector PrevSlot; + public: RAGreedy(); @@ -106,11 +110,17 @@ float calcGlobalSplitCost(const BitVector&); void splitAroundRegion(LiveInterval&, unsigned, const BitVector&, SmallVectorImpl&); + void calcGapWeights(unsigned, SmallVectorImpl&); + SlotIndex getPrevMappedIndex(const MachineInstr*); + void calcPrevSlots(); + unsigned nextSplitPoint(unsigned); unsigned tryReassignOrEvict(LiveInterval&, AllocationOrder&, SmallVectorImpl&); unsigned tryRegionSplit(LiveInterval&, AllocationOrder&, SmallVectorImpl&); + unsigned tryLocalSplit(LiveInterval&, AllocationOrder&, + SmallVectorImpl&); unsigned trySplit(LiveInterval&, AllocationOrder&, SmallVectorImpl&); unsigned trySpillInterferences(LiveInterval&, AllocationOrder&, @@ -824,6 +834,271 @@ //===----------------------------------------------------------------------===// +// Local Splitting +//===----------------------------------------------------------------------===// + + +/// calcGapWeights - Compute the maximum spill weight that needs to be evicted +/// in order to use PhysReg between two entries in SA->UseSlots. +/// +/// GapWeight[i] represents the gap between UseSlots[i] and UseSlots[i+1]. +/// +void RAGreedy::calcGapWeights(unsigned PhysReg, + SmallVectorImpl &GapWeight) { + assert(SA->LiveBlocks.size() == 1 && "Not a local interval"); + const SplitAnalysis::BlockInfo &BI = SA->LiveBlocks.front(); + const SmallVectorImpl &Uses = SA->UseSlots; + const unsigned NumGaps = Uses.size()-1; + + // Start and end points for the interference check. + SlotIndex StartIdx = BI.LiveIn ? BI.FirstUse.getBaseIndex() : BI.FirstUse; + SlotIndex StopIdx = BI.LiveOut ? BI.LastUse.getBoundaryIndex() : BI.LastUse; + + GapWeight.assign(NumGaps, 0.0f); + + // Add interference from each overlapping register. + for (const unsigned *AI = TRI->getOverlaps(PhysReg); *AI; ++AI) { + if (!query(const_cast(SA->getParent()), *AI) + .checkInterference()) + continue; + + // We know that VirtReg is a continuous interval from FirstUse to LastUse, + // so we don't need InterferenceQuery. + // + // Interference that overlaps an instruction is counted in both gaps + // surrounding the instruction. The exception is interference before + // StartIdx and after StopIdx. + // + LiveIntervalUnion::SegmentIter IntI = PhysReg2LiveUnion[*AI].find(StartIdx); + for (unsigned Gap = 0; IntI.valid() && IntI.start() < StopIdx; ++IntI) { + // Skip the gaps before IntI. + while (Uses[Gap+1].getBoundaryIndex() < IntI.start()) + if (++Gap == NumGaps) + break; + if (Gap == NumGaps) + break; + + // Update the gaps covered by IntI. + const float weight = IntI.value()->weight; + for (; Gap != NumGaps; ++Gap) { + GapWeight[Gap] = std::max(GapWeight[Gap], weight); + if (Uses[Gap+1].getBaseIndex() >= IntI.stop()) + break; + } + if (Gap == NumGaps) + break; + } + } +} + +/// getPrevMappedIndex - Return the slot index of the last non-copy instruction +/// before MI that has a slot index. If MI is the first mapped instruction in +/// its block, return the block start index instead. +/// +SlotIndex RAGreedy::getPrevMappedIndex(const MachineInstr *MI) { + assert(MI && "Missing MachineInstr"); + const MachineBasicBlock *MBB = MI->getParent(); + MachineBasicBlock::const_iterator B = MBB->begin(), I = MI; + while (I != B) + if (!(--I)->isDebugValue() && !I->isCopy()) + return Indexes->getInstructionIndex(I); + return Indexes->getMBBStartIdx(MBB); +} + +/// calcPrevSlots - Fill in the PrevSlot array with the index of the previous +/// real non-copy instruction for each instruction in SA->UseSlots. +/// +void RAGreedy::calcPrevSlots() { + const SmallVectorImpl &Uses = SA->UseSlots; + PrevSlot.clear(); + PrevSlot.reserve(Uses.size()); + for (unsigned i = 0, e = Uses.size(); i != e; ++i) { + const MachineInstr *MI = Indexes->getInstructionFromIndex(Uses[i]); + PrevSlot.push_back(getPrevMappedIndex(MI).getDefIndex()); + } +} + +/// nextSplitPoint - Find the next index into SA->UseSlots > i such that it may +/// be beneficial to split before UseSlots[i]. +/// +/// 0 is always a valid split point +unsigned RAGreedy::nextSplitPoint(unsigned i) { + const SmallVectorImpl &Uses = SA->UseSlots; + const unsigned Size = Uses.size(); + assert(i != Size && "No split points after the end"); + // Allow split before i when Uses[i] is not adjacent to the previous use. + while (++i != Size && PrevSlot[i].getBaseIndex() <= Uses[i-1].getBaseIndex()) + ; + return i; +} + +/// tryLocalSplit - Try to split VirtReg into smaller intervals inside its only +/// basic block. +/// +unsigned RAGreedy::tryLocalSplit(LiveInterval &VirtReg, AllocationOrder &Order, + SmallVectorImpl &NewVRegs) { + assert(SA->LiveBlocks.size() == 1 && "Not a local interval"); + const SplitAnalysis::BlockInfo &BI = SA->LiveBlocks.front(); + + // Note that it is possible to have an interval that is live-in or live-out + // while only covering a single block - A phi-def can use undef values from + // predecessors, and the block could be a single-block loop. + // We don't bother doing anything clever about such a case, we simply assume + // that the interval is continuous from FirstUse to LastUse. We should make + // sure that we don't do anything illegal to such an interval, though. + + const SmallVectorImpl &Uses = SA->UseSlots; + if (Uses.size() <= 2) + return 0; + const unsigned NumGaps = Uses.size()-1; + + DEBUG({ + dbgs() << "tryLocalSplit: "; + for (unsigned i = 0, e = Uses.size(); i != e; ++i) + dbgs() << ' ' << SA->UseSlots[i]; + dbgs() << '\n'; + }); + + // For every use, find the previous mapped non-copy instruction. + // We use this to detect valid split points, and to estimate new interval + // sizes. + calcPrevSlots(); + + unsigned BestBefore = NumGaps; + unsigned BestAfter = 0; + float BestDiff = 0; + + const float blockFreq = SpillPlacer->getBlockFrequency(BI.MBB); + SmallVector GapWeight; + + Order.rewind(); + while (unsigned PhysReg = Order.next()) { + // Keep track of the largest spill weight that would need to be evicted in + // order to make use of PhysReg between UseSlots[i] and UseSlots[i+1]. + calcGapWeights(PhysReg, GapWeight); + + // Try to find the best sequence of gaps to close. + // The new spill weight must be larger than any gap interference. + + // We will split before Uses[SplitBefore] and after Uses[SplitAfter]. + unsigned SplitBefore = 0, SplitAfter = nextSplitPoint(1) - 1; + + // MaxGap should always be max(GapWeight[SplitBefore..SplitAfter-1]). + // It is the spill weight that needs to be evicted. + float MaxGap = GapWeight[0]; + for (unsigned i = 1; i != SplitAfter; ++i) + MaxGap = std::max(MaxGap, GapWeight[i]); + + for (;;) { + // Live before/after split? + const bool LiveBefore = SplitBefore != 0 || BI.LiveIn; + const bool LiveAfter = SplitAfter != NumGaps || BI.LiveOut; + + DEBUG(dbgs() << PrintReg(PhysReg, TRI) << ' ' + << Uses[SplitBefore] << '-' << Uses[SplitAfter] + << " i=" << MaxGap); + + // Stop before the interval gets so big we wouldn't be making progress. + if (!LiveBefore && !LiveAfter) { + DEBUG(dbgs() << " all\n"); + break; + } + // Should the interval be extended or shrunk? + bool Shrink = true; + if (MaxGap < HUGE_VALF) { + // Estimate the new spill weight. + // + // Each instruction reads and writes the register, except the first + // instr doesn't read when !FirstLive, and the last instr doesn't write + // when !LastLive. + // + // We will be inserting copies before and after, so the total number of + // reads and writes is 2 * EstUses. + // + const unsigned EstUses = 2*(SplitAfter - SplitBefore) + + 2*(LiveBefore + LiveAfter); + + // Try to guess the size of the new interval. This should be trivial, + // but the slot index of an inserted copy can be a lot smaller than the + // instruction it is inserted before if there are many dead indexes + // between them. + // + // We measure the distance from the instruction before SplitBefore to + // get a conservative estimate. + // + // The final distance can still be different if inserting copies + // triggers a slot index renumbering. + // + const float EstWeight = normalizeSpillWeight(blockFreq * EstUses, + PrevSlot[SplitBefore].distance(Uses[SplitAfter])); + // Would this split be possible to allocate? + // Never allocate all gaps, we wouldn't be making progress. + float Diff = EstWeight - MaxGap; + DEBUG(dbgs() << " w=" << EstWeight << " d=" << Diff); + if (Diff > 0) { + Shrink = false; + if (Diff > BestDiff) { + DEBUG(dbgs() << " (best)"); + BestDiff = Diff; + BestBefore = SplitBefore; + BestAfter = SplitAfter; + } + } + } + + // Try to shrink. + if (Shrink) { + SplitBefore = nextSplitPoint(SplitBefore); + if (SplitBefore < SplitAfter) { + DEBUG(dbgs() << " shrink\n"); + // Recompute the max when necessary. + if (GapWeight[SplitBefore - 1] >= MaxGap) { + MaxGap = GapWeight[SplitBefore]; + for (unsigned i = SplitBefore + 1; i != SplitAfter; ++i) + MaxGap = std::max(MaxGap, GapWeight[i]); + } + continue; + } + MaxGap = 0; + } + + // Try to extend the interval. + if (SplitAfter >= NumGaps) { + DEBUG(dbgs() << " end\n"); + break; + } + + DEBUG(dbgs() << " extend\n"); + for (unsigned e = nextSplitPoint(SplitAfter + 1) - 1; + SplitAfter != e; ++SplitAfter) + MaxGap = std::max(MaxGap, GapWeight[SplitAfter]); + continue; + } + } + + // Didn't find any candidates? + if (BestBefore == NumGaps) + return 0; + + DEBUG(dbgs() << "Best local split range: " << Uses[BestBefore] + << '-' << Uses[BestAfter] << ", " << BestDiff + << ", " << (BestAfter - BestBefore + 1) << " instrs\n"); + + SmallVector SpillRegs; + LiveRangeEdit LREdit(VirtReg, NewVRegs, SpillRegs); + SplitEditor SE(*SA, *LIS, *VRM, *DomTree, LREdit); + + SE.openIntv(); + SlotIndex SegStart = SE.enterIntvBefore(Uses[BestBefore]); + SlotIndex SegStop = SE.leaveIntvAfter(Uses[BestAfter]); + SE.useIntv(SegStart, SegStop); + SE.closeIntv(); + SE.finish(); + + return 0; +} + +//===----------------------------------------------------------------------===// // Live Range Splitting //===----------------------------------------------------------------------===// @@ -835,9 +1110,9 @@ NamedRegionTimer T("Splitter", TimerGroupName, TimePassesIsEnabled); SA->analyze(&VirtReg); - // Don't attempt splitting on local intervals for now. TBD. + // Local intervals are handled separately. if (LIS->intervalIsInOneMBB(VirtReg)) - return 0; + return tryLocalSplit(VirtReg, Order, NewVRegs); // First try to split around a region spanning multiple blocks. unsigned PhysReg = tryRegionSplit(VirtReg, Order, NewVRegs); Modified: llvm/trunk/lib/CodeGen/SplitKit.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SplitKit.h?rev=125764&r1=125763&r2=125764&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SplitKit.h (original) +++ llvm/trunk/lib/CodeGen/SplitKit.h Thu Feb 17 13:13:53 2011 @@ -116,6 +116,9 @@ /// new interval. void clear(); + /// getParent - Return the last analyzed interval. + const LiveInterval &getParent() const { return *CurLI; } + /// hasUses - Return true if MBB has any uses of CurLI. bool hasUses(const MachineBasicBlock *MBB) const { return UsingBlocks.lookup(MBB); From greened at obbligato.org Thu Feb 17 13:18:59 2011 From: greened at obbligato.org (David Greene) Date: Thu, 17 Feb 2011 19:18:59 -0000 Subject: [llvm-commits] [llvm] r125765 - in /llvm/trunk/lib/Target/X86: InstPrinter/X86InstComments.cpp Makefile Utils/ Utils/CMakeLists.txt Utils/Makefile Utils/X86ShuffleDecode.cpp Utils/X86ShuffleDecode.h X86ISelLowering.cpp X86ShuffleDecode.h Message-ID: <20110217191859.719462A6C12C@llvm.org> Author: greened Date: Thu Feb 17 13:18:59 2011 New Revision: 125765 URL: http://llvm.org/viewvc/llvm-project?rev=125765&view=rev Log: [AVX] Recorganize X86ShuffleDecode into its own library (LLVMX86Utils.a) to break cyclic library dependencies between LLVMX86CodeGen.a and LLVMX86AsmParser.a. Previously this code was in a header file and marked static but AVX requires some additional functionality here that won't be used by all clients. Since including unused static functions causes a gcc compiler warning, keeping it as a header would break builds that use -Werror. Putting this in its own library solves both problems at once. Added: llvm/trunk/lib/Target/X86/Utils/ llvm/trunk/lib/Target/X86/Utils/CMakeLists.txt llvm/trunk/lib/Target/X86/Utils/Makefile llvm/trunk/lib/Target/X86/Utils/X86ShuffleDecode.cpp llvm/trunk/lib/Target/X86/Utils/X86ShuffleDecode.h Removed: llvm/trunk/lib/Target/X86/X86ShuffleDecode.h Modified: llvm/trunk/lib/Target/X86/InstPrinter/X86InstComments.cpp llvm/trunk/lib/Target/X86/Makefile llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Modified: llvm/trunk/lib/Target/X86/InstPrinter/X86InstComments.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/InstPrinter/X86InstComments.cpp?rev=125765&r1=125764&r2=125765&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/InstPrinter/X86InstComments.cpp (original) +++ llvm/trunk/lib/Target/X86/InstPrinter/X86InstComments.cpp Thu Feb 17 13:18:59 2011 @@ -16,7 +16,7 @@ #include "X86GenInstrNames.inc" #include "llvm/MC/MCInst.h" #include "llvm/Support/raw_ostream.h" -#include "../X86ShuffleDecode.h" +#include "../Utils/X86ShuffleDecode.h" using namespace llvm; //===----------------------------------------------------------------------===// Modified: llvm/trunk/lib/Target/X86/Makefile URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/Makefile?rev=125765&r1=125764&r2=125765&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/Makefile (original) +++ llvm/trunk/lib/Target/X86/Makefile Thu Feb 17 13:18:59 2011 @@ -20,6 +20,6 @@ X86GenCallingConv.inc X86GenSubtarget.inc \ X86GenEDInfo.inc -DIRS = InstPrinter AsmParser Disassembler TargetInfo +DIRS = InstPrinter AsmParser Disassembler TargetInfo Utils include $(LEVEL)/Makefile.common Added: llvm/trunk/lib/Target/X86/Utils/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/Utils/CMakeLists.txt?rev=125765&view=auto ============================================================================== --- llvm/trunk/lib/Target/X86/Utils/CMakeLists.txt (added) +++ llvm/trunk/lib/Target/X86/Utils/CMakeLists.txt Thu Feb 17 13:18:59 2011 @@ -0,0 +1,6 @@ +include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. ) + +add_llvm_library(LLVMX86Utils + X86ShuffleDecode.cpp + ) +add_dependencies(LLVMX86Utils X86CodeGenTable_gen) Added: llvm/trunk/lib/Target/X86/Utils/Makefile URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/Utils/Makefile?rev=125765&view=auto ============================================================================== --- llvm/trunk/lib/Target/X86/Utils/Makefile (added) +++ llvm/trunk/lib/Target/X86/Utils/Makefile Thu Feb 17 13:18:59 2011 @@ -0,0 +1,15 @@ +##===- lib/Target/X86/Utils/Makefile -----------------------*- Makefile -*-===## +# +# The LLVM Compiler Infrastructure +# +# This file is distributed under the University of Illinois Open Source +# License. See LICENSE.TXT for details. +# +##===----------------------------------------------------------------------===## +LEVEL = ../../../.. +LIBRARYNAME = LLVMX86Utils + +# Hack: we need to include 'main' x86 target directory to grab private headers +CPP.Flags += -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/.. + +include $(LEVEL)/Makefile.common Added: llvm/trunk/lib/Target/X86/Utils/X86ShuffleDecode.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/Utils/X86ShuffleDecode.cpp?rev=125765&view=auto ============================================================================== --- llvm/trunk/lib/Target/X86/Utils/X86ShuffleDecode.cpp (added) +++ llvm/trunk/lib/Target/X86/Utils/X86ShuffleDecode.cpp Thu Feb 17 13:18:59 2011 @@ -0,0 +1,148 @@ +//===-- X86ShuffleDecode.h - X86 shuffle decode logic ---------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// Define several functions to decode x86 specific shuffle semantics into a +// generic vector mask. +// +//===----------------------------------------------------------------------===// + +#include "X86ShuffleDecode.h" + +//===----------------------------------------------------------------------===// +// Vector Mask Decoding +//===----------------------------------------------------------------------===// + +namespace llvm { + +void DecodeINSERTPSMask(unsigned Imm, SmallVectorImpl &ShuffleMask) { + // Defaults the copying the dest value. + ShuffleMask.push_back(0); + ShuffleMask.push_back(1); + ShuffleMask.push_back(2); + ShuffleMask.push_back(3); + + // Decode the immediate. + unsigned ZMask = Imm & 15; + unsigned CountD = (Imm >> 4) & 3; + unsigned CountS = (Imm >> 6) & 3; + + // CountS selects which input element to use. + unsigned InVal = 4+CountS; + // CountD specifies which element of destination to update. + ShuffleMask[CountD] = InVal; + // ZMask zaps values, potentially overriding the CountD elt. + if (ZMask & 1) ShuffleMask[0] = SM_SentinelZero; + if (ZMask & 2) ShuffleMask[1] = SM_SentinelZero; + if (ZMask & 4) ShuffleMask[2] = SM_SentinelZero; + if (ZMask & 8) ShuffleMask[3] = SM_SentinelZero; +} + +// <3,1> or <6,7,2,3> +void DecodeMOVHLPSMask(unsigned NElts, + SmallVectorImpl &ShuffleMask) { + for (unsigned i = NElts/2; i != NElts; ++i) + ShuffleMask.push_back(NElts+i); + + for (unsigned i = NElts/2; i != NElts; ++i) + ShuffleMask.push_back(i); +} + +// <0,2> or <0,1,4,5> +void DecodeMOVLHPSMask(unsigned NElts, + SmallVectorImpl &ShuffleMask) { + for (unsigned i = 0; i != NElts/2; ++i) + ShuffleMask.push_back(i); + + for (unsigned i = 0; i != NElts/2; ++i) + ShuffleMask.push_back(NElts+i); +} + +void DecodePSHUFMask(unsigned NElts, unsigned Imm, + SmallVectorImpl &ShuffleMask) { + for (unsigned i = 0; i != NElts; ++i) { + ShuffleMask.push_back(Imm % NElts); + Imm /= NElts; + } +} + +void DecodePSHUFHWMask(unsigned Imm, + SmallVectorImpl &ShuffleMask) { + ShuffleMask.push_back(0); + ShuffleMask.push_back(1); + ShuffleMask.push_back(2); + ShuffleMask.push_back(3); + for (unsigned i = 0; i != 4; ++i) { + ShuffleMask.push_back(4+(Imm & 3)); + Imm >>= 2; + } +} + +void DecodePSHUFLWMask(unsigned Imm, + SmallVectorImpl &ShuffleMask) { + for (unsigned i = 0; i != 4; ++i) { + ShuffleMask.push_back((Imm & 3)); + Imm >>= 2; + } + ShuffleMask.push_back(4); + ShuffleMask.push_back(5); + ShuffleMask.push_back(6); + ShuffleMask.push_back(7); +} + +void DecodePUNPCKLMask(unsigned NElts, + SmallVectorImpl &ShuffleMask) { + for (unsigned i = 0; i != NElts/2; ++i) { + ShuffleMask.push_back(i); + ShuffleMask.push_back(i+NElts); + } +} + +void DecodePUNPCKHMask(unsigned NElts, + SmallVectorImpl &ShuffleMask) { + for (unsigned i = 0; i != NElts/2; ++i) { + ShuffleMask.push_back(i+NElts/2); + ShuffleMask.push_back(i+NElts+NElts/2); + } +} + +void DecodeSHUFPSMask(unsigned NElts, unsigned Imm, + SmallVectorImpl &ShuffleMask) { + // Part that reads from dest. + for (unsigned i = 0; i != NElts/2; ++i) { + ShuffleMask.push_back(Imm % NElts); + Imm /= NElts; + } + // Part that reads from src. + for (unsigned i = 0; i != NElts/2; ++i) { + ShuffleMask.push_back(Imm % NElts + NElts); + Imm /= NElts; + } +} + +void DecodeUNPCKHPMask(unsigned NElts, + SmallVectorImpl &ShuffleMask) { + for (unsigned i = 0; i != NElts/2; ++i) { + ShuffleMask.push_back(i+NElts/2); // Reads from dest + ShuffleMask.push_back(i+NElts+NElts/2); // Reads from src + } +} + + +/// DecodeUNPCKLPMask - This decodes the shuffle masks for unpcklps/unpcklpd +/// etc. NElts indicates the number of elements in the vector allowing it to +/// handle different datatypes and vector widths. +void DecodeUNPCKLPMask(unsigned NElts, + SmallVectorImpl &ShuffleMask) { + for (unsigned i = 0; i != NElts/2; ++i) { + ShuffleMask.push_back(i); // Reads from dest + ShuffleMask.push_back(i+NElts); // Reads from src + } +} + +} // llvm namespace Added: llvm/trunk/lib/Target/X86/Utils/X86ShuffleDecode.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/Utils/X86ShuffleDecode.h?rev=125765&view=auto ============================================================================== --- llvm/trunk/lib/Target/X86/Utils/X86ShuffleDecode.h (added) +++ llvm/trunk/lib/Target/X86/Utils/X86ShuffleDecode.h Thu Feb 17 13:18:59 2011 @@ -0,0 +1,69 @@ +//===-- X86ShuffleDecode.h - X86 shuffle decode logic -----------*-C++-*---===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// Define several functions to decode x86 specific shuffle semantics into a +// generic vector mask. +// +//===----------------------------------------------------------------------===// + +#ifndef X86_SHUFFLE_DECODE_H +#define X86_SHUFFLE_DECODE_H + +#include "llvm/ADT/SmallVector.h" + +//===----------------------------------------------------------------------===// +// Vector Mask Decoding +//===----------------------------------------------------------------------===// + +namespace llvm { +enum { + SM_SentinelZero = ~0U +}; + +void DecodeINSERTPSMask(unsigned Imm, SmallVectorImpl &ShuffleMask); + +// <3,1> or <6,7,2,3> +void DecodeMOVHLPSMask(unsigned NElts, + SmallVectorImpl &ShuffleMask); + +// <0,2> or <0,1,4,5> +void DecodeMOVLHPSMask(unsigned NElts, + SmallVectorImpl &ShuffleMask); + +void DecodePSHUFMask(unsigned NElts, unsigned Imm, + SmallVectorImpl &ShuffleMask); + +void DecodePSHUFHWMask(unsigned Imm, + SmallVectorImpl &ShuffleMask); + +void DecodePSHUFLWMask(unsigned Imm, + SmallVectorImpl &ShuffleMask); + +void DecodePUNPCKLMask(unsigned NElts, + SmallVectorImpl &ShuffleMask); + +void DecodePUNPCKHMask(unsigned NElts, + SmallVectorImpl &ShuffleMask); + +void DecodeSHUFPSMask(unsigned NElts, unsigned Imm, + SmallVectorImpl &ShuffleMask); + +void DecodeUNPCKHPMask(unsigned NElts, + SmallVectorImpl &ShuffleMask); + + +/// DecodeUNPCKLPMask - This decodes the shuffle masks for unpcklps/unpcklpd +/// etc. NElts indicates the number of elements in the vector allowing it to +/// handle different datatypes and vector widths. +void DecodeUNPCKLPMask(unsigned NElts, + SmallVectorImpl &ShuffleMask); + +} // llvm namespace + +#endif Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=125765&r1=125764&r2=125765&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Thu Feb 17 13:18:59 2011 @@ -16,9 +16,9 @@ #include "X86.h" #include "X86InstrBuilder.h" #include "X86ISelLowering.h" -#include "X86ShuffleDecode.h" #include "X86TargetMachine.h" #include "X86TargetObjectFile.h" +#include "Utils/X86ShuffleDecode.h" #include "llvm/CallingConv.h" #include "llvm/Constants.h" #include "llvm/DerivedTypes.h" Removed: llvm/trunk/lib/Target/X86/X86ShuffleDecode.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ShuffleDecode.h?rev=125764&view=auto ============================================================================== --- llvm/trunk/lib/Target/X86/X86ShuffleDecode.h (original) +++ llvm/trunk/lib/Target/X86/X86ShuffleDecode.h (removed) @@ -1,155 +0,0 @@ -//===-- X86ShuffleDecode.h - X86 shuffle decode logic ---------------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// Define several functions to decode x86 specific shuffle semantics into a -// generic vector mask. -// -//===----------------------------------------------------------------------===// - -#ifndef X86_SHUFFLE_DECODE_H -#define X86_SHUFFLE_DECODE_H - -#include "llvm/ADT/SmallVector.h" -using namespace llvm; - -//===----------------------------------------------------------------------===// -// Vector Mask Decoding -//===----------------------------------------------------------------------===// - -enum { - SM_SentinelZero = ~0U -}; - -static inline -void DecodeINSERTPSMask(unsigned Imm, SmallVectorImpl &ShuffleMask) { - // Defaults the copying the dest value. - ShuffleMask.push_back(0); - ShuffleMask.push_back(1); - ShuffleMask.push_back(2); - ShuffleMask.push_back(3); - - // Decode the immediate. - unsigned ZMask = Imm & 15; - unsigned CountD = (Imm >> 4) & 3; - unsigned CountS = (Imm >> 6) & 3; - - // CountS selects which input element to use. - unsigned InVal = 4+CountS; - // CountD specifies which element of destination to update. - ShuffleMask[CountD] = InVal; - // ZMask zaps values, potentially overriding the CountD elt. - if (ZMask & 1) ShuffleMask[0] = SM_SentinelZero; - if (ZMask & 2) ShuffleMask[1] = SM_SentinelZero; - if (ZMask & 4) ShuffleMask[2] = SM_SentinelZero; - if (ZMask & 8) ShuffleMask[3] = SM_SentinelZero; -} - -// <3,1> or <6,7,2,3> -static void DecodeMOVHLPSMask(unsigned NElts, - SmallVectorImpl &ShuffleMask) { - for (unsigned i = NElts/2; i != NElts; ++i) - ShuffleMask.push_back(NElts+i); - - for (unsigned i = NElts/2; i != NElts; ++i) - ShuffleMask.push_back(i); -} - -// <0,2> or <0,1,4,5> -static void DecodeMOVLHPSMask(unsigned NElts, - SmallVectorImpl &ShuffleMask) { - for (unsigned i = 0; i != NElts/2; ++i) - ShuffleMask.push_back(i); - - for (unsigned i = 0; i != NElts/2; ++i) - ShuffleMask.push_back(NElts+i); -} - -static void DecodePSHUFMask(unsigned NElts, unsigned Imm, - SmallVectorImpl &ShuffleMask) { - for (unsigned i = 0; i != NElts; ++i) { - ShuffleMask.push_back(Imm % NElts); - Imm /= NElts; - } -} - -static void DecodePSHUFHWMask(unsigned Imm, - SmallVectorImpl &ShuffleMask) { - ShuffleMask.push_back(0); - ShuffleMask.push_back(1); - ShuffleMask.push_back(2); - ShuffleMask.push_back(3); - for (unsigned i = 0; i != 4; ++i) { - ShuffleMask.push_back(4+(Imm & 3)); - Imm >>= 2; - } -} - -static void DecodePSHUFLWMask(unsigned Imm, - SmallVectorImpl &ShuffleMask) { - for (unsigned i = 0; i != 4; ++i) { - ShuffleMask.push_back((Imm & 3)); - Imm >>= 2; - } - ShuffleMask.push_back(4); - ShuffleMask.push_back(5); - ShuffleMask.push_back(6); - ShuffleMask.push_back(7); -} - -static void DecodePUNPCKLMask(unsigned NElts, - SmallVectorImpl &ShuffleMask) { - for (unsigned i = 0; i != NElts/2; ++i) { - ShuffleMask.push_back(i); - ShuffleMask.push_back(i+NElts); - } -} - -static void DecodePUNPCKHMask(unsigned NElts, - SmallVectorImpl &ShuffleMask) { - for (unsigned i = 0; i != NElts/2; ++i) { - ShuffleMask.push_back(i+NElts/2); - ShuffleMask.push_back(i+NElts+NElts/2); - } -} - -static void DecodeSHUFPSMask(unsigned NElts, unsigned Imm, - SmallVectorImpl &ShuffleMask) { - // Part that reads from dest. - for (unsigned i = 0; i != NElts/2; ++i) { - ShuffleMask.push_back(Imm % NElts); - Imm /= NElts; - } - // Part that reads from src. - for (unsigned i = 0; i != NElts/2; ++i) { - ShuffleMask.push_back(Imm % NElts + NElts); - Imm /= NElts; - } -} - -static void DecodeUNPCKHPMask(unsigned NElts, - SmallVectorImpl &ShuffleMask) { - for (unsigned i = 0; i != NElts/2; ++i) { - ShuffleMask.push_back(i+NElts/2); // Reads from dest - ShuffleMask.push_back(i+NElts+NElts/2); // Reads from src - } -} - - -/// DecodeUNPCKLPMask - This decodes the shuffle masks for unpcklps/unpcklpd -/// etc. NElts indicates the number of elements in the vector allowing it to -/// handle different datatypes and vector widths. -static void DecodeUNPCKLPMask(unsigned NElts, - SmallVectorImpl &ShuffleMask) { - for (unsigned i = 0; i != NElts/2; ++i) { - ShuffleMask.push_back(i); // Reads from dest - ShuffleMask.push_back(i+NElts); // Reads from src - } -} - -#endif From viridia at gmail.com Thu Feb 17 13:22:45 2011 From: viridia at gmail.com (Talin) Date: Thu, 17 Feb 2011 11:22:45 -0800 Subject: [llvm-commits] PATCH: Additional convenience methods for ConstantStruct, ConstantArray, and ConstantVector. In-Reply-To: References: Message-ID: Ping...can someone please review this? On Thu, Feb 10, 2011 at 1:40 PM, Talin wrote: > This patch adds a new "get" method to ConstantStruct, ConstantArray and > ConstantVector. The new method accepts a pair of RandomAccessIterators, > similar to other LLVM method signatures. This allows constants to be build > using a small vector or other sequential container type more easily. > > In addition, I've also added an END_WITH_NULL variant for > ConstantStruct::get(). I only added it to ConstantStruct because I figured > that it would be an uncommon use case for arrays and vectors, whereas the > creation of small constant structs of predetermined length is fairly common. > > -- > -- Talin > -- -- Talin -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110217/ac244c0f/attachment.html From chandlerc at google.com Thu Feb 17 14:57:49 2011 From: chandlerc at google.com (Chandler Carruth) Date: Thu, 17 Feb 2011 12:57:49 -0800 Subject: [llvm-commits] [llvm] r125765 - in /llvm/trunk/lib/Target/X86: InstPrinter/X86InstComments.cpp Makefile Utils/ Utils/CMakeLists.txt Utils/Makefile Utils/X86ShuffleDecode.cpp Utils/X86ShuffleDecode.h X86ISelLowering.cpp X86ShuffleDecode.h In-Reply-To: <20110217191859.719462A6C12C@llvm.org> References: <20110217191859.719462A6C12C@llvm.org> Message-ID: On Thu, Feb 17, 2011 at 11:18 AM, David Greene wrote: > Author: greened > Date: Thu Feb 17 13:18:59 2011 > New Revision: 125765 > > URL: http://llvm.org/viewvc/llvm-project?rev=125765&view=rev > Log: > > [AVX] Recorganize X86ShuffleDecode into its own library > (LLVMX86Utils.a) to break cyclic library dependencies between > LLVMX86CodeGen.a and LLVMX86AsmParser.a. Previously this code was in > a header file and marked static but AVX requires some additional > functionality here that won't be used by all clients. Since including > unused static functions causes a gcc compiler warning, keeping it as a > header would break builds that use -Werror. Putting this in its own > library solves both problems at once. > > Added: > llvm/trunk/lib/Target/X86/Utils/ > llvm/trunk/lib/Target/X86/Utils/CMakeLists.txt > While you added the CMake target for this, you didn't update the dependencies of the X86 targets that use this... I now get link failures on my builds. =/ -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110217/afc662bb/attachment.html From sabre at nondot.org Thu Feb 17 14:55:29 2011 From: sabre at nondot.org (Chris Lattner) Date: Thu, 17 Feb 2011 20:55:29 -0000 Subject: [llvm-commits] [llvm] r125774 - /llvm/trunk/lib/Transforms/InstCombine/InstCombineAddSub.cpp Message-ID: <20110217205529.5D63F2A6C12C@llvm.org> Author: lattner Date: Thu Feb 17 14:55:29 2011 New Revision: 125774 URL: http://llvm.org/viewvc/llvm-project?rev=125774&view=rev Log: add is always integer, thanks to Frits for noticing this. Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineAddSub.cpp Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineAddSub.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineAddSub.cpp?rev=125774&r1=125773&r2=125774&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/InstCombine/InstCombineAddSub.cpp (original) +++ llvm/trunk/lib/Transforms/InstCombine/InstCombineAddSub.cpp Thu Feb 17 14:55:29 2011 @@ -147,7 +147,7 @@ return BinaryOperator::CreateXor(LHS, RHS); // X + X --> X << 1 - if (LHS == RHS && I.getType()->isIntegerTy()) { + if (LHS == RHS) { BinaryOperator *New = BinaryOperator::CreateShl(LHS, ConstantInt::get(I.getType(), 1)); New->setHasNoSignedWrap(I.hasNoSignedWrap()); From nadav.rotem at intel.com Thu Feb 17 15:22:27 2011 From: nadav.rotem at intel.com (Nadav Rotem) Date: Thu, 17 Feb 2011 21:22:27 -0000 Subject: [llvm-commits] [llvm] r125776 - in /llvm/trunk: include/llvm/ADT/APFloat.h lib/Support/APFloat.cpp lib/VMCore/ConstantFold.cpp lib/VMCore/Constants.cpp test/Transforms/InstCombine/bitcast-vec-uniform.ll Message-ID: <20110217212227.7E7F22A6C12C@llvm.org> Author: nadav Date: Thu Feb 17 15:22:27 2011 New Revision: 125776 URL: http://llvm.org/viewvc/llvm-project?rev=125776&view=rev Log: Enhance constant folding of bitcast operations on vectors of floats. Add getAllOnesValue of FP numbers to Constants and APFloat. Add more tests. Modified: llvm/trunk/include/llvm/ADT/APFloat.h llvm/trunk/lib/Support/APFloat.cpp llvm/trunk/lib/VMCore/ConstantFold.cpp llvm/trunk/lib/VMCore/Constants.cpp llvm/trunk/test/Transforms/InstCombine/bitcast-vec-uniform.ll Modified: llvm/trunk/include/llvm/ADT/APFloat.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/APFloat.h?rev=125776&r1=125775&r2=125776&view=diff ============================================================================== --- llvm/trunk/include/llvm/ADT/APFloat.h (original) +++ llvm/trunk/include/llvm/ADT/APFloat.h Thu Feb 17 15:22:27 2011 @@ -246,6 +246,13 @@ static APFloat getSmallestNormalized(const fltSemantics &Sem, bool Negative = false); + /// getAllOnesValue - Returns a float which is bitcasted from + /// an all one value int. + /// + /// \param BitWidth - Select float type + /// \param isIEEE - If 128 bit number, select between PPC and IEEE + static APFloat getAllOnesValue(unsigned BitWidth, bool isIEEE = false); + /// Profile - Used to insert APFloat objects, or objects that contain /// APFloat objects, into FoldingSets. void Profile(FoldingSetNodeID& NID) const; Modified: llvm/trunk/lib/Support/APFloat.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/APFloat.cpp?rev=125776&r1=125775&r2=125776&view=diff ============================================================================== --- llvm/trunk/lib/Support/APFloat.cpp (original) +++ llvm/trunk/lib/Support/APFloat.cpp Thu Feb 17 15:22:27 2011 @@ -3197,6 +3197,12 @@ llvm_unreachable(0); } +APFloat +APFloat::getAllOnesValue(unsigned BitWidth, bool isIEEE) +{ + return APFloat(APInt::getAllOnesValue(BitWidth), isIEEE); +} + APFloat APFloat::getLargest(const fltSemantics &Sem, bool Negative) { APFloat Val(Sem, fcNormal, Negative); Modified: llvm/trunk/lib/VMCore/ConstantFold.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/ConstantFold.cpp?rev=125776&r1=125775&r2=125776&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/ConstantFold.cpp (original) +++ llvm/trunk/lib/VMCore/ConstantFold.cpp Thu Feb 17 15:22:27 2011 @@ -43,8 +43,7 @@ static Constant *BitCastConstantVector(ConstantVector *CV, const VectorType *DstTy) { - if (CV->isAllOnesValue() && DstTy->getElementType()->isIntegerTy()) - return Constant::getAllOnesValue(DstTy); + if (CV->isAllOnesValue()) return Constant::getAllOnesValue(DstTy); if (CV->isNullValue()) return Constant::getNullValue(DstTy); // If this cast changes element count then we can't handle it here: Modified: llvm/trunk/lib/VMCore/Constants.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Constants.cpp?rev=125776&r1=125775&r2=125776&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/Constants.cpp (original) +++ llvm/trunk/lib/VMCore/Constants.cpp Thu Feb 17 15:22:27 2011 @@ -93,7 +93,13 @@ if (const IntegerType *ITy = dyn_cast(Ty)) return ConstantInt::get(Ty->getContext(), APInt::getAllOnesValue(ITy->getBitWidth())); - + + if (Ty->isFloatingPointTy()) { + APFloat FL = APFloat::getAllOnesValue(Ty->getPrimitiveSizeInBits(), + !Ty->isPPC_FP128Ty()); + return ConstantFP::get(Ty->getContext(), FL); + } + SmallVector Elts; const VectorType *VTy = cast(Ty); Elts.resize(VTy->getNumElements(), getAllOnesValue(VTy->getElementType())); Modified: llvm/trunk/test/Transforms/InstCombine/bitcast-vec-uniform.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/bitcast-vec-uniform.ll?rev=125776&r1=125775&r2=125776&view=diff ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/bitcast-vec-uniform.ll (original) +++ llvm/trunk/test/Transforms/InstCombine/bitcast-vec-uniform.ll Thu Feb 17 15:22:27 2011 @@ -18,7 +18,8 @@ } ; CHECK: @foo -; CHECK: bitcast +; CHECK-NOT: bitcast +; CHECK: ret ; from MultiSource/Benchmarks/Bullet define <2 x float> @foo() { @@ -27,4 +28,43 @@ } +; CHECK: @foo2 +; CHECK-NOT: bitcast +; CHECK: ret +define <2 x double> @foo2() { + %cast = bitcast i128 -1 to <2 x double> + ret <2 x double> %cast +} + +; CHECK: @foo3 +; CHECK-NOT: bitcast +; CHECK: ret +define <1 x float> @foo3() { + %cast = bitcast i32 -1 to <1 x float> + ret <1 x float> %cast +} + +; CHECK: @foo4 +; CHECK-NOT: bitcast +; CHECK: ret +define float @foo4() { + %cast = bitcast <1 x i32 > to float + ret float %cast +} +; CHECK: @foo5 +; CHECK-NOT: bitcast +; CHECK: ret +define double @foo5() { + %cast = bitcast <2 x i32 > to double + ret double %cast +} + + +; CHECK: @foo6 +; CHECK-NOT: bitcast +; CHECK: ret +define <2 x double> @foo6() { + %cast = bitcast <4 x i32> to <2 x double> + ret <2 x double> %cast +} From clattner at apple.com Thu Feb 17 16:08:57 2011 From: clattner at apple.com (Chris Lattner) Date: Thu, 17 Feb 2011 14:08:57 -0800 Subject: [llvm-commits] [patch] Refactoring of the llvm mangler In-Reply-To: <4D55953A.2070809@gmail.com> References: <4D55953A.2070809@gmail.com> Message-ID: <83B15ACB-E9B7-489A-8A13-61A66C159D6B@apple.com> On Feb 11, 2011, at 11:59 AM, Rafael Avila de Espindola wrote: > My first idea for fixing PR9177 involved having clang know all about assembly names. Anton pointed me at how llvm-gcc does it and I think a similar hack might be sufficient. > > In any case, I wrote a refactoring patch for the llvm mangler that might be a good thing even if it is not needed for PR9177. > > The patch changes the mangler to use streams and explicitly separates the add prefix, mangle the name proper and add suffix steps. This makes it easier to identify (and maybe drop) some of its strange features. > > It also fixes the "FIXME: This logic seems unlikely to be right." :-) Hi Rafael, Here are some first thoughts: + void GetPrefix(raw_ostream &Out, ManglerPrefixTy PrefixTy, StringRef Name); Please follow the naming convention for new code, these should be "getPrefix". + Out.flush(); return OutContext.GetOrCreateSymbol(NameStr.str()); You can just use Out.str(), which does a flush before returning the string. How does this make LTO faster? It seems that the major change here is to change the SmallString to a raw_ostream, which seems ok, but but also does seem to require adding raw_svector_ostream's around now. Almost all the clients actually do want to fill in a SmallString after all :) -Chris From greened at obbligato.org Thu Feb 17 16:15:42 2011 From: greened at obbligato.org (David A. Greene) Date: Thu, 17 Feb 2011 16:15:42 -0600 Subject: [llvm-commits] [llvm] r125765 - in /llvm/trunk/lib/Target/X86: InstPrinter/X86InstComments.cpp Makefile Utils/ Utils/CMakeLists.txt Utils/Makefile Utils/X86ShuffleDecode.cpp Utils/X86ShuffleDecode.h X86ISelLowering.cpp X86ShuffleDecode.h In-Reply-To: (Chandler Carruth's message of "Thu, 17 Feb 2011 12:57:49 -0800") References: <20110217191859.719462A6C12C@llvm.org> Message-ID: Chandler Carruth writes: > Added: > ? ?llvm/trunk/lib/Target/X86/Utils/ > ? ?llvm/trunk/lib/Target/X86/Utils/CMakeLists.txt > > While you added the CMake target for this, you didn't update the dependencies of the X86 targets that use this... I now get link failures on my builds. > =/ So what needs to be done? I never use CMake so I don't know the first thing about it. I made my best guess at what would be needed. -Dave From sabre at nondot.org Thu Feb 17 16:21:26 2011 From: sabre at nondot.org (Chris Lattner) Date: Thu, 17 Feb 2011 22:21:26 -0000 Subject: [llvm-commits] [llvm] r125785 - in /llvm/trunk: lib/Transforms/InstCombine/InstCombinePHI.cpp test/Transforms/InstCombine/phi.ll Message-ID: <20110217222127.010612A6C12C@llvm.org> Author: lattner Date: Thu Feb 17 16:21:26 2011 New Revision: 125785 URL: http://llvm.org/viewvc/llvm-project?rev=125785&view=rev Log: fix instcombine merging GEPs through a PHI to only make the result inbounds if all of the inputs are inbounds. Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombinePHI.cpp llvm/trunk/test/Transforms/InstCombine/phi.ll Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombinePHI.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombinePHI.cpp?rev=125785&r1=125784&r2=125785&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/InstCombine/InstCombinePHI.cpp (original) +++ llvm/trunk/lib/Transforms/InstCombine/InstCombinePHI.cpp Thu Feb 17 16:21:26 2011 @@ -118,6 +118,8 @@ // especially bad when the PHIs are in the header of a loop. bool NeededPhi = false; + bool AllInBounds = true; + // Scan to see if all operands are the same opcode, and all have one use. for (unsigned i = 1; i != PN.getNumIncomingValues(); ++i) { GetElementPtrInst *GEP= dyn_cast(PN.getIncomingValue(i)); @@ -125,6 +127,8 @@ GEP->getNumOperands() != FirstInst->getNumOperands()) return 0; + AllInBounds &= GEP->isInBounds(); + // Keep track of whether or not all GEPs are of alloca pointers. if (AllBasePointersAreAllocas && (!isa(GEP->getOperand(0)) || @@ -202,11 +206,11 @@ } Value *Base = FixedOperands[0]; - return cast(FirstInst)->isInBounds() ? - GetElementPtrInst::CreateInBounds(Base, FixedOperands.begin()+1, - FixedOperands.end()) : + GetElementPtrInst *NewGEP = GetElementPtrInst::Create(Base, FixedOperands.begin()+1, FixedOperands.end()); + if (AllInBounds) NewGEP->setIsInbounds(); + return NewGEP; } Modified: llvm/trunk/test/Transforms/InstCombine/phi.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/phi.ll?rev=125785&r1=125784&r2=125785&view=diff ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/phi.ll (original) +++ llvm/trunk/test/Transforms/InstCombine/phi.ll Thu Feb 17 16:21:26 2011 @@ -125,7 +125,7 @@ define i32* @test8({ i32, i32 } *%A, i1 %b) { BB0: - %X = getelementptr { i32, i32 } *%A, i32 0, i32 1 + %X = getelementptr inbounds { i32, i32 } *%A, i32 0, i32 1 br i1 %b, label %BB1, label %BB2 BB1: @@ -139,7 +139,7 @@ ; CHECK: @test8 ; CHECK-NOT: phi ; CHECK: BB2: -; CHECK-NEXT: %B = getelementptr +; CHECK-NEXT: %B = getelementptr %0 ; CHECK-NEXT: ret i32* %B } @@ -525,3 +525,4 @@ ; CHECK: Exit: ; CHECK-NEXT: ret i32 %B } + From ofv at wanadoo.es Thu Feb 17 16:25:15 2011 From: ofv at wanadoo.es (=?utf-8?Q?=C3=93scar_Fuentes?=) Date: Thu, 17 Feb 2011 23:25:15 +0100 Subject: [llvm-commits] [llvm] r125765 - in /llvm/trunk/lib/Target/X86: InstPrinter/X86InstComments.cpp Makefile Utils/ Utils/CMakeLists.txt Utils/Makefile Utils/X86ShuffleDecode.cpp Utils/X86ShuffleDecode.h X86ISelLowering.cpp X86ShuffleDecode.h References: <20110217191859.719462A6C12C@llvm.org> Message-ID: <877hcymh84.fsf@wanadoo.es> greened at obbligato.org (David A. Greene) writes: > Chandler Carruth writes: > >> Added: >> ? ?llvm/trunk/lib/Target/X86/Utils/ >> ? ?llvm/trunk/lib/Target/X86/Utils/CMakeLists.txt >> >> While you added the CMake target for this, you didn't update the >> dependencies of the X86 targets that use this... I now get link >> failures on my builds. >> =/ > > So what needs to be done? I never use CMake so I don't know the first > thing about it. I made my best guess at what would be needed. I'll fix it. From ofv at wanadoo.es Thu Feb 17 16:26:11 2011 From: ofv at wanadoo.es (Oscar Fuentes) Date: Thu, 17 Feb 2011 22:26:11 -0000 Subject: [llvm-commits] [llvm] r125786 - in /llvm/trunk: CMakeLists.txt cmake/modules/LLVMLibDeps.cmake Message-ID: <20110217222611.C95E72A6C12C@llvm.org> Author: ofv Date: Thu Feb 17 16:26:11 2011 New Revision: 125786 URL: http://llvm.org/viewvc/llvm-project?rev=125786&view=rev Log: New library: LLVMX86Utils. Modified: llvm/trunk/CMakeLists.txt llvm/trunk/cmake/modules/LLVMLibDeps.cmake Modified: llvm/trunk/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=125786&r1=125785&r2=125786&view=diff ============================================================================== --- llvm/trunk/CMakeLists.txt (original) +++ llvm/trunk/CMakeLists.txt Thu Feb 17 16:26:11 2011 @@ -266,6 +266,9 @@ set(LLVM_ENUM_DISASSEMBLERS "${LLVM_ENUM_DISASSEMBLERS}LLVM_DISASSEMBLER(${t})\n") endif() + if( EXISTS ${td}/Utils/CMakeLists.txt ) + add_subdirectory(${td}/Utils) + endif() set(CURRENT_LLVM_TARGET) endforeach(t) Modified: llvm/trunk/cmake/modules/LLVMLibDeps.cmake URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/LLVMLibDeps.cmake?rev=125786&r1=125785&r2=125786&view=diff ============================================================================== --- llvm/trunk/cmake/modules/LLVMLibDeps.cmake (original) +++ llvm/trunk/cmake/modules/LLVMLibDeps.cmake Thu Feb 17 16:26:11 2011 @@ -57,10 +57,11 @@ set(MSVC_LIB_DEPS_LLVMTarget LLVMCore LLVMMC LLVMSupport) set(MSVC_LIB_DEPS_LLVMTransformUtils LLVMAnalysis LLVMCore LLVMSupport LLVMTarget LLVMipa) set(MSVC_LIB_DEPS_LLVMX86AsmParser LLVMMC LLVMMCParser LLVMSupport LLVMTarget LLVMX86Info) -set(MSVC_LIB_DEPS_LLVMX86AsmPrinter LLVMMC LLVMSupport) -set(MSVC_LIB_DEPS_LLVMX86CodeGen LLVMAnalysis LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMTarget LLVMX86AsmPrinter LLVMX86Info) +set(MSVC_LIB_DEPS_LLVMX86AsmPrinter LLVMMC LLVMSupport LLVMX86Utils) +set(MSVC_LIB_DEPS_LLVMX86CodeGen LLVMAnalysis LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMTarget LLVMX86AsmPrinter LLVMX86Info LLVMX86Utils) set(MSVC_LIB_DEPS_LLVMX86Disassembler LLVMMC LLVMSupport LLVMX86Info) set(MSVC_LIB_DEPS_LLVMX86Info LLVMMC LLVMSupport) +set(MSVC_LIB_DEPS_LLVMX86Utils LLVMSupport) set(MSVC_LIB_DEPS_LLVMXCoreCodeGen LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMC LLVMSelectionDAG LLVMSupport LLVMTarget LLVMXCoreInfo) set(MSVC_LIB_DEPS_LLVMXCoreInfo LLVMMC LLVMSupport) set(MSVC_LIB_DEPS_LLVMipa LLVMAnalysis LLVMCore LLVMSupport) From sabre at nondot.org Thu Feb 17 16:32:54 2011 From: sabre at nondot.org (Chris Lattner) Date: Thu, 17 Feb 2011 22:32:54 -0000 Subject: [llvm-commits] [llvm] r125787 - /llvm/trunk/lib/Transforms/InstCombine/InstCombinePHI.cpp Message-ID: <20110217223254.E7D222A6C12C@llvm.org> Author: lattner Date: Thu Feb 17 16:32:54 2011 New Revision: 125787 URL: http://llvm.org/viewvc/llvm-project?rev=125787&view=rev Log: fix typo Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombinePHI.cpp Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombinePHI.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombinePHI.cpp?rev=125787&r1=125786&r2=125787&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/InstCombine/InstCombinePHI.cpp (original) +++ llvm/trunk/lib/Transforms/InstCombine/InstCombinePHI.cpp Thu Feb 17 16:32:54 2011 @@ -209,7 +209,7 @@ GetElementPtrInst *NewGEP = GetElementPtrInst::Create(Base, FixedOperands.begin()+1, FixedOperands.end()); - if (AllInBounds) NewGEP->setIsInbounds(); + if (AllInBounds) NewGEP->setIsInBounds(); return NewGEP; } From stoklund at 2pi.dk Thu Feb 17 16:53:48 2011 From: stoklund at 2pi.dk (Jakob Stoklund Olesen) Date: Thu, 17 Feb 2011 22:53:48 -0000 Subject: [llvm-commits] [llvm] r125789 - in /llvm/trunk/lib/CodeGen: RegAllocBasic.cpp RegAllocGreedy.cpp Message-ID: <20110217225348.BA70E2A6C12C@llvm.org> Author: stoklund Date: Thu Feb 17 16:53:48 2011 New Revision: 125789 URL: http://llvm.org/viewvc/llvm-project?rev=125789&view=rev Log: Add basic register allocator statistics. Modified: llvm/trunk/lib/CodeGen/RegAllocBasic.cpp llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp Modified: llvm/trunk/lib/CodeGen/RegAllocBasic.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocBasic.cpp?rev=125789&r1=125788&r2=125789&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/RegAllocBasic.cpp (original) +++ llvm/trunk/lib/CodeGen/RegAllocBasic.cpp Thu Feb 17 16:53:48 2011 @@ -20,6 +20,7 @@ #include "VirtRegMap.h" #include "VirtRegRewriter.h" #include "llvm/ADT/OwningPtr.h" +#include "llvm/ADT/Statistic.h" #include "llvm/Analysis/AliasAnalysis.h" #include "llvm/Function.h" #include "llvm/PassAnalysisSupport.h" @@ -48,6 +49,10 @@ using namespace llvm; +STATISTIC(NumAssigned , "Number of registers assigned"); +STATISTIC(NumUnassigned , "Number of registers unassigned"); +STATISTIC(NumNewQueued , "Number of new live ranges queued"); + static RegisterRegAlloc basicRegAlloc("basic", "basic register allocator", createBasicRegisterAllocator); @@ -242,12 +247,14 @@ assert(!VRM->hasPhys(VirtReg.reg) && "Duplicate VirtReg assignment"); VRM->assignVirt2Phys(VirtReg.reg, PhysReg); PhysReg2LiveUnion[PhysReg].unify(VirtReg); + ++NumAssigned; } void RegAllocBase::unassign(LiveInterval &VirtReg, unsigned PhysReg) { assert(VRM->getPhys(VirtReg.reg) == PhysReg && "Inconsistent unassign"); PhysReg2LiveUnion[PhysReg].extract(VirtReg); VRM->clearVirt(VirtReg.reg); + ++NumUnassigned; } // Top-level driver to manage the queue of unassigned VirtRegs and call the @@ -287,6 +294,7 @@ "expect split value in virtual register"); VirtRegQ.push(std::make_pair(getPriority(SplitVirtReg), SplitVirtReg->reg)); + ++NumNewQueued; } } } Modified: llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp?rev=125789&r1=125788&r2=125789&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp (original) +++ llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp Thu Feb 17 16:53:48 2011 @@ -22,6 +22,7 @@ #include "SplitKit.h" #include "VirtRegMap.h" #include "VirtRegRewriter.h" +#include "llvm/ADT/Statistic.h" #include "llvm/Analysis/AliasAnalysis.h" #include "llvm/Function.h" #include "llvm/PassAnalysisSupport.h" @@ -45,6 +46,11 @@ using namespace llvm; +STATISTIC(NumGlobalSplits, "Number of split global live ranges"); +STATISTIC(NumLocalSplits, "Number of split local live ranges"); +STATISTIC(NumReassigned, "Number of interferences reassigned"); +STATISTIC(NumEvicted, "Number of interferences evicted"); + static RegisterRegAlloc greedyRegAlloc("greedy", "greedy register allocator", createGreedyRegisterAllocator); @@ -265,6 +271,7 @@ TRI->getName(OldAssign) << " to " << TRI->getName(PhysReg) << '\n'); unassign(InterferingVReg, OldAssign); assign(InterferingVReg, PhysReg); + ++NumReassigned; return true; } return false; @@ -307,6 +314,7 @@ if (BestVirt) { DEBUG(dbgs() << "evicting lighter " << *BestVirt << '\n'); unassign(*BestVirt, VRM->getPhys(BestVirt->reg)); + ++NumEvicted; NewVRegs.push_back(BestVirt); return BestPhys; } @@ -782,6 +790,7 @@ // per-block segments? The current approach allows the stack region to // separate into connected components. Some components may be allocatable. SE.finish(); + ++NumGlobalSplits; if (VerifyEnabled) { MF->verify(this, "After splitting live range around region"); @@ -1094,6 +1103,7 @@ SE.useIntv(SegStart, SegStop); SE.closeIntv(); SE.finish(); + ++NumLocalSplits; return 0; } From sabre at nondot.org Thu Feb 17 17:01:49 2011 From: sabre at nondot.org (Chris Lattner) Date: Thu, 17 Feb 2011 23:01:49 -0000 Subject: [llvm-commits] [llvm] r125790 - in /llvm/trunk: lib/Transforms/InstCombine/InstCombinePHI.cpp test/Transforms/InstCombine/phi.ll Message-ID: <20110217230149.4D0C92A6C12C@llvm.org> Author: lattner Date: Thu Feb 17 17:01:49 2011 New Revision: 125790 URL: http://llvm.org/viewvc/llvm-project?rev=125790&view=rev Log: have instcombine preserve nsw/nuw/exact when sinking common operations through a phi. Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombinePHI.cpp llvm/trunk/test/Transforms/InstCombine/phi.ll Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombinePHI.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombinePHI.cpp?rev=125790&r1=125789&r2=125790&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/InstCombine/InstCombinePHI.cpp (original) +++ llvm/trunk/lib/Transforms/InstCombine/InstCombinePHI.cpp Thu Feb 17 17:01:49 2011 @@ -31,22 +31,37 @@ const Type *LHSType = LHSVal->getType(); const Type *RHSType = RHSVal->getType(); + bool isNUW = false, isNSW = false, isExact = false; + if (OverflowingBinaryOperator *BO = + dyn_cast(FirstInst)) { + isNUW = BO->hasNoUnsignedWrap(); + isNSW = BO->hasNoSignedWrap(); + } else if (PossiblyExactOperator *PEO = + dyn_cast(FirstInst)) + isExact = PEO->isExact(); + // Scan to see if all operands are the same opcode, and all have one use. for (unsigned i = 1; i != PN.getNumIncomingValues(); ++i) { Instruction *I = dyn_cast(PN.getIncomingValue(i)); if (!I || I->getOpcode() != Opc || !I->hasOneUse() || // Verify type of the LHS matches so we don't fold cmp's of different - // types or GEP's with different index types. + // types. I->getOperand(0)->getType() != LHSType || I->getOperand(1)->getType() != RHSType) return 0; // If they are CmpInst instructions, check their predicates - if (Opc == Instruction::ICmp || Opc == Instruction::FCmp) - if (cast(I)->getPredicate() != - cast(FirstInst)->getPredicate()) + if (CmpInst *CI = dyn_cast(I)) + if (CI->getPredicate() != cast(FirstInst)->getPredicate()) return 0; + if (isNUW) + isNUW = cast(I)->hasNoUnsignedWrap(); + if (isNSW) + isNSW = cast(I)->hasNoSignedWrap(); + if (isExact) + isExact = cast(I)->isExact(); + // Keep track of which operand needs a phi node. if (I->getOperand(0) != LHSVal) LHSVal = 0; if (I->getOperand(1) != RHSVal) RHSVal = 0; @@ -97,11 +112,17 @@ } } - if (BinaryOperator *BinOp = dyn_cast(FirstInst)) - return BinaryOperator::Create(BinOp->getOpcode(), LHSVal, RHSVal); - CmpInst *CIOp = cast(FirstInst); - return CmpInst::Create(CIOp->getOpcode(), CIOp->getPredicate(), - LHSVal, RHSVal); + if (CmpInst *CIOp = dyn_cast(FirstInst)) + return CmpInst::Create(CIOp->getOpcode(), CIOp->getPredicate(), + LHSVal, RHSVal); + + BinaryOperator *BinOp = cast(FirstInst); + BinaryOperator *NewBinOp = + BinaryOperator::Create(BinOp->getOpcode(), LHSVal, RHSVal); + if (isNUW) NewBinOp->setHasNoUnsignedWrap(); + if (isNSW) NewBinOp->setHasNoSignedWrap(); + if (isExact) NewBinOp->setIsExact(); + return NewBinOp; } Instruction *InstCombiner::FoldPHIArgGEPIntoPHI(PHINode &PN) { @@ -373,6 +394,7 @@ // code size and simplifying code. Constant *ConstantOp = 0; const Type *CastSrcTy = 0; + bool isNUW = false, isNSW = false, isExact = false; if (isa(FirstInst)) { CastSrcTy = FirstInst->getOperand(0)->getType(); @@ -389,6 +411,14 @@ ConstantOp = dyn_cast(FirstInst->getOperand(1)); if (ConstantOp == 0) return FoldPHIArgBinOpIntoPHI(PN); + + if (OverflowingBinaryOperator *BO = + dyn_cast(FirstInst)) { + isNUW = BO->hasNoUnsignedWrap(); + isNSW = BO->hasNoSignedWrap(); + } else if (PossiblyExactOperator *PEO = + dyn_cast(FirstInst)) + isExact = PEO->isExact(); } else { return 0; // Cannot fold this operation. } @@ -404,6 +434,13 @@ } else if (I->getOperand(1) != ConstantOp) { return 0; } + + if (isNUW) + isNUW = cast(I)->hasNoUnsignedWrap(); + if (isNSW) + isNSW = cast(I)->hasNoSignedWrap(); + if (isExact) + isExact = cast(I)->isExact(); } // Okay, they are all the same operation. Create a new PHI node of the @@ -438,8 +475,13 @@ if (CastInst *FirstCI = dyn_cast(FirstInst)) return CastInst::Create(FirstCI->getOpcode(), PhiVal, PN.getType()); - if (BinaryOperator *BinOp = dyn_cast(FirstInst)) - return BinaryOperator::Create(BinOp->getOpcode(), PhiVal, ConstantOp); + if (BinaryOperator *BinOp = dyn_cast(FirstInst)) { + BinOp = BinaryOperator::Create(BinOp->getOpcode(), PhiVal, ConstantOp); + if (isNUW) BinOp->setHasNoUnsignedWrap(); + if (isNSW) BinOp->setHasNoSignedWrap(); + if (isExact) BinOp->setIsExact(); + return BinOp; + } CmpInst *CIOp = cast(FirstInst); return CmpInst::Create(CIOp->getOpcode(), CIOp->getPredicate(), Modified: llvm/trunk/test/Transforms/InstCombine/phi.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/phi.ll?rev=125790&r1=125789&r2=125790&view=diff ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/phi.ll (original) +++ llvm/trunk/test/Transforms/InstCombine/phi.ll Thu Feb 17 17:01:49 2011 @@ -526,3 +526,21 @@ ; CHECK-NEXT: ret i32 %B } +define i32 @test24(i32 %A, i1 %cond) { +BB0: + %X = add nuw nsw i32 %A, 1 + br i1 %cond, label %BB1, label %BB2 + +BB1: + %Y = add nuw i32 %A, 1 + br label %BB2 + +BB2: + %C = phi i32 [ %X, %BB0 ], [ %Y, %BB1 ] + ret i32 %C +; CHECK: @test24 +; CHECK-NOT: phi +; CHECK: BB2: +; CHECK-NEXT: %C = add nuw i32 %A, 1 +; CHECK-NEXT: ret i32 %C +} From clattner at apple.com Thu Feb 17 17:10:18 2011 From: clattner at apple.com (Chris Lattner) Date: Thu, 17 Feb 2011 15:10:18 -0800 Subject: [llvm-commits] [Review request] Have Correlated Value Propagation handle instruction operands. In-Reply-To: <4D517367.9050105@free.fr> References: <4D517367.9050105@free.fr> Message-ID: On Feb 8, 2011, at 8:46 AM, Duncan Sands wrote: > Hi Frits, > >>> Do you done any measurements of the compile-time impact of this? >> >> No, sorry. Duncan Sands was worried about this too... > > it is very expensive. I ran some comparisons and it is very visible that with > your patch compilation is much slower. The obvious thing to do is to keep your > logic but only analyse a small set of instructions, for example the ones it used > to analyse (Select, PHI, I/FCmp, Load, Store) plus branch instructions. Sadly > the result is disappointing: it catches way less stuff than my pass. I then > tried with your original patch, i.e. analysing all instructions. It still > catches way less stuff than my pass if I judge by the number of lines of bitcode > removed. I don't understand this since indeed LVI knows lots of tricks, so it > is probably worth trying to understand why correlated value propagation/LVI is > not doing a better job. One way to speed this up is to only look at values that have multiple uses. If X only has a single use (which is a very common case for instructions) it is unlikely to be simplifyable. -Chris From clattner at apple.com Thu Feb 17 17:11:22 2011 From: clattner at apple.com (Chris Lattner) Date: Thu, 17 Feb 2011 15:11:22 -0800 Subject: [llvm-commits] [llvm] r125105 - /llvm/trunk/lib/Target/X86/X86ISelLowering.cpp In-Reply-To: <20110208190442.036ED2A6C12C@llvm.org> References: <20110208190442.036ED2A6C12C@llvm.org> Message-ID: <829B9D03-9FBC-4D64-B717-A75D868E885E@apple.com> On Feb 8, 2011, at 11:04 AM, David Greene wrote: > Author: greened > Date: Tue Feb 8 13:04:41 2011 > New Revision: 125105 > > URL: http://llvm.org/viewvc/llvm-project?rev=125105&view=rev > Log: > > [AVX] Implement BUILD_VECTOR lowering for 256-bit vectors. For > anything but the simplest of cases, lower a 256-bit BUILD_VECTOR by > splitting it into 128-bit parts and recombining. Hi David, Why add the "disable-256bit" command line option? Please remove it, -Chris From clattner at apple.com Thu Feb 17 17:15:23 2011 From: clattner at apple.com (Chris Lattner) Date: Thu, 17 Feb 2011 15:15:23 -0800 Subject: [llvm-commits] my 2nd attempt at now-infamous PR889 In-Reply-To: References: Message-ID: <221A2263-9E96-45D8-A085-D53C649B1FA3@apple.com> On Feb 16, 2011, at 9:13 PM, pawel kunio wrote: > Hello, > In a meantime of preparing 2 tests for PR9067, I came with my 2nd and hopefully now more > successful attempt at now-infamous PR889 devirtualize Value destructor. > > Please find patches for llvm and clang attached to this mail. As I can see from mingw build > environment, it will need moving PseudoSourceValue.cpp from lib/CodeGen to lib/VMCore > after applying patch (seems not to be required on vc build env, as order of libraries given > to linker is not meaningful there). > > Please note that destructors have been moved into protected part of interface as well as > empty destructors were implemented for all Value-derived classes to help in catching all > destructions. Hi Pawel, Thank you for working on this! Unfortunately, this patch is way too monolithic to review like this though, could you split it out into a series of obvious changes? Doug recently "devirtualized" the clang decl hierarchy by devirtualizing one method at a time, which worked really well. -Chris From clattner at apple.com Thu Feb 17 17:22:45 2011 From: clattner at apple.com (Chris Lattner) Date: Thu, 17 Feb 2011 15:22:45 -0800 Subject: [llvm-commits] [PATCH] Patch (WIP) to custom-lower 64-bit relational comparisons on x86-32 In-Reply-To: References: Message-ID: <9B03BD52-6B0C-4784-8FC1-02C6EAC9B57D@apple.com> On Feb 16, 2011, at 4:25 PM, Eli Friedman wrote: > I'm mainly looking for feedback as to whether this seems like > generally a good idea... I haven't seen any compiler use this > particular implementation of relational comparisons. This looks pretty spiffy to me. A couple of requests though: 1. Please make this work for i128 on x86-64. 2. Please change the if/else sequence to use a switch with a default case that explodes. 4. Please fit in 80 columns 8. I think you only need to do the setOperationAction when building for 32-bit. 16. Does the code handle weird conditions like "COND_P"? -Chris From clattner at apple.com Thu Feb 17 17:27:33 2011 From: clattner at apple.com (Chris Lattner) Date: Thu, 17 Feb 2011 15:27:33 -0800 Subject: [llvm-commits] patch: fix broken code generation with r125471 and newer when preferred alignment of some data type is is bigger than stack alignment In-Reply-To: <8E2B3382-17E2-4E2B-9507-D18D96BC5893@iki.fi> References: <8E2B3382-17E2-4E2B-9507-D18D96BC5893@iki.fi> Message-ID: On Feb 14, 2011, at 11:11 AM, Heikki Kultala wrote: > Hi Heikki, This patch isn't correct. If a stack slot claims to be (e.g.) 32-byte aligned, then InferPtrAlignment can return 32 bytes. It is up to the target to provide this guarantee (by doing dynamic stack realignment) otherwise other things will fail. You can see this at work on X86 (for example): $ cat t.c void foo() { int x __attribute__((aligned(128))); bar(&x); } $ clang t.c -S -o - -m32 -O3 _foo: ## @foo ## BB#0: ## %entry pushl %ebp movl %esp, %ebp andl $-128, %esp subl $256, %esp ## imm = 0x100 leal 128(%esp), %eax movl %eax, (%esp) calll _bar movl %ebp, %esp popl %ebp ret If your target isn't aligning things properly, then attribute(aligned) is broken. -Chris From joerg at bec.de Thu Feb 17 17:22:19 2011 From: joerg at bec.de (Joerg Sonnenberger) Date: Thu, 17 Feb 2011 23:22:19 -0000 Subject: [llvm-commits] [llvm] r125792 - /llvm/trunk/utils/TableGen/AsmMatcherEmitter.cpp Message-ID: <20110217232219.858842A6C12C@llvm.org> Author: joerg Date: Thu Feb 17 17:22:19 2011 New Revision: 125792 URL: http://llvm.org/viewvc/llvm-project?rev=125792&view=rev Log: Check that MnemonicAlias doesn't map back to the same string. Modified: llvm/trunk/utils/TableGen/AsmMatcherEmitter.cpp Modified: llvm/trunk/utils/TableGen/AsmMatcherEmitter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/AsmMatcherEmitter.cpp?rev=125792&r1=125791&r2=125792&view=diff ============================================================================== --- llvm/trunk/utils/TableGen/AsmMatcherEmitter.cpp (original) +++ llvm/trunk/utils/TableGen/AsmMatcherEmitter.cpp Thu Feb 17 17:22:19 2011 @@ -1881,6 +1881,8 @@ AliasWithNoPredicate = i; continue; } + if (R->getValueAsString("ToMnemonic") == I->first) + throw TGError(R->getLoc(), "MnemonicAlias to the same string"); if (!MatchCode.empty()) MatchCode += "else "; From greened at obbligato.org Thu Feb 17 17:34:06 2011 From: greened at obbligato.org (David A. Greene) Date: Thu, 17 Feb 2011 17:34:06 -0600 Subject: [llvm-commits] [llvm] r125105 - /llvm/trunk/lib/Target/X86/X86ISelLowering.cpp In-Reply-To: <829B9D03-9FBC-4D64-B717-A75D868E885E@apple.com> (Chris Lattner's message of "Thu, 17 Feb 2011 15:11:22 -0800") References: <20110208190442.036ED2A6C12C@llvm.org> <829B9D03-9FBC-4D64-B717-A75D868E885E@apple.com> Message-ID: Chris Lattner writes: > Why add the "disable-256bit" command line option? Please remove it, For debugging purposes. Should I add this as a target option instead? -David From dpatel at apple.com Thu Feb 17 17:33:27 2011 From: dpatel at apple.com (Devang Patel) Date: Thu, 17 Feb 2011 23:33:27 -0000 Subject: [llvm-commits] [llvm] r125794 - in /llvm/trunk: include/llvm/CodeGen/SelectionDAG.h lib/CodeGen/SelectionDAG/LegalizeDAG.cpp lib/CodeGen/SelectionDAG/SDNodeDbgValue.h lib/CodeGen/SelectionDAG/SelectionDAG.cpp lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp test/CodeGen/X86/dbg-value-inlined-parameter.ll Message-ID: <20110217233327.D53A82A6C12C@llvm.org> Author: dpatel Date: Thu Feb 17 17:33:27 2011 New Revision: 125794 URL: http://llvm.org/viewvc/llvm-project?rev=125794&view=rev Log: Do not lose debug info of an inlined function argument even if the argument is only used through GEPs. Added: llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAG.h llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAG.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAG.h?rev=125794&r1=125793&r2=125794&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/SelectionDAG.h (original) +++ llvm/trunk/include/llvm/CodeGen/SelectionDAG.h Thu Feb 17 17:33:27 2011 @@ -100,10 +100,6 @@ return DbgValMap[Node]; } - void removeSDDbgValues(const SDNode *Node) { - DbgValMap.erase(Node); - } - typedef SmallVector::iterator DbgIterator; DbgIterator DbgBegin() { return DbgValues.begin(); } DbgIterator DbgEnd() { return DbgValues.end(); } Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp?rev=125794&r1=125793&r2=125794&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Thu Feb 17 17:33:27 2011 @@ -87,6 +87,9 @@ // If someone requests legalization of the new node, return itself. if (From != To) LegalizedNodes.insert(std::make_pair(To, To)); + + // Transfer SDDbgValues. + DAG.TransferDbgValues(From, To); } public: Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h?rev=125794&r1=125793&r2=125794&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h Thu Feb 17 17:33:27 2011 @@ -83,14 +83,6 @@ // Returns the SDNode* for a register ref SDNode *getSDNode() { assert (kind==SDNODE); return u.s.Node; } - // setSDNode - If underlying SDNode is replaced by another node then - // SelectionDAG can use this to transfer DbgValue. - void setSDNode(SDNode *N, unsigned R) { - assert (kind==SDNODE); - u.s.Node = N; - u.s.ResNo = R; - } - // Returns the ResNo for a register ref unsigned getResNo() { assert (kind==SDNODE); return u.s.ResNo; } Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=125794&r1=125793&r2=125794&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Thu Feb 17 17:33:27 2011 @@ -5508,12 +5508,14 @@ SDNode *FromNode = From.getNode(); SDNode *ToNode = To.getNode(); SmallVector &DVs = GetDbgValues(FromNode); - DbgInfo->removeSDDbgValues(FromNode); for (SmallVector::iterator I = DVs.begin(), E = DVs.end(); I != E; ++I) { - if ((*I)->getKind() == SDDbgValue::SDNODE) { - AddDbgValue(*I, ToNode, false); - (*I)->setSDNode(ToNode, To.getResNo()); + SDDbgValue *Dbg = *I; + if (Dbg->getKind() == SDDbgValue::SDNODE) { + SDDbgValue *Clone = getDbgValue(Dbg->getMDPtr(), ToNode, To.getResNo(), + Dbg->getOffset(), Dbg->getDebugLoc(), + Dbg->getOrder()); + AddDbgValue(Clone, ToNode, false); } } } Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp?rev=125794&r1=125793&r2=125794&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Thu Feb 17 17:33:27 2011 @@ -4287,7 +4287,7 @@ N.getResNo(), Offset, dl, SDNodeOrder); DAG.AddDbgValue(SDV, N.getNode(), false); } - } else if (isa(V) && !V->use_empty() ) { + } else if (!V->use_empty() ) { // Do not call getValue(V) yet, as we don't want to generate code. // Remember it for later. DanglingDebugInfo DDI(&DI, dl, SDNodeOrder); Added: llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll?rev=125794&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll (added) +++ llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll Thu Feb 17 17:33:27 2011 @@ -0,0 +1,86 @@ +; RUN: llc -mtriple=x86_64-apple-darwin < %s | FileCheck %s + +;CHECK: DW_TAG_inlined_subroutine +;CHECK-NEXT: DW_AT_abstract_origin +;CHECK-NEXT: DW_AT_low_pc +;CHECK-NEXT: DW_AT_high_pc +;CHECK-NEXT: DW_AT_call_file +;CHECK-NEXT: DW_AT_call_line +;CHECK-NEXT: DW_TAG_formal_parameter +;CHECK-NEXT: .ascii "sp" ## DW_AT_name + +%struct.S1 = type { float*, i32 } + + at p = common global %struct.S1 zeroinitializer, align 8 + +define i32 @foo(%struct.S1* nocapture %sp, i32 %nums) nounwind optsize ssp { +entry: + tail call void @llvm.dbg.value(metadata !{%struct.S1* %sp}, i64 0, metadata !9), !dbg !20 + tail call void @llvm.dbg.value(metadata !{i32 %nums}, i64 0, metadata !18), !dbg !21 + %tmp2 = getelementptr inbounds %struct.S1* %sp, i64 0, i32 1, !dbg !22 + store i32 %nums, i32* %tmp2, align 4, !dbg !22, !tbaa !24 + %call = tail call float* @bar(i32 %nums) nounwind optsize, !dbg !27 + %tmp5 = getelementptr inbounds %struct.S1* %sp, i64 0, i32 0, !dbg !27 + store float* %call, float** %tmp5, align 8, !dbg !27, !tbaa !28 + %cmp = icmp ne float* %call, null, !dbg !29 + %cond = zext i1 %cmp to i32, !dbg !29 + ret i32 %cond, !dbg !29 +} + +declare float* @bar(i32) optsize + +define void @foobar() nounwind optsize ssp { +entry: + tail call void @llvm.dbg.value(metadata !30, i64 0, metadata !9) nounwind, !dbg !31 + tail call void @llvm.dbg.value(metadata !34, i64 0, metadata !18) nounwind, !dbg !35 + store i32 1, i32* getelementptr inbounds (%struct.S1* @p, i64 0, i32 1), align 8, !dbg !36, !tbaa !24 + %call.i = tail call float* @bar(i32 1) nounwind optsize, !dbg !37 + store float* %call.i, float** getelementptr inbounds (%struct.S1* @p, i64 0, i32 0), align 8, !dbg !37, !tbaa !28 + ret void, !dbg !38 +} + +declare void @llvm.dbg.value(metadata, i64, metadata) nounwind readnone + +!llvm.dbg.sp = !{!0, !6} +!llvm.dbg.lv.foo = !{!9, !18} +!llvm.dbg.gv = !{!19} + +!0 = metadata !{i32 589870, i32 0, metadata !1, metadata !"foo", metadata !"foo", metadata !"", metadata !1, i32 8, metadata !3, i1 false, i1 true, i32 0, i32 0, i32 0, i32 256, i1 true, i32 (%struct.S1*, i32)* @foo} ; [ DW_TAG_subprogram ] +!1 = metadata !{i32 589865, metadata !"nm2.c", metadata !"/private/tmp", metadata !2} ; [ DW_TAG_file_type ] +!2 = metadata !{i32 589841, i32 0, i32 12, metadata !"nm2.c", metadata !"/private/tmp", metadata !"clang version 2.9 (trunk 125693)", i1 true, i1 true, metadata !"", i32 0} ; [ DW_TAG_compile_unit ] +!3 = metadata !{i32 589845, metadata !1, metadata !"", metadata !1, i32 0, i64 0, i64 0, i32 0, i32 0, i32 0, metadata !4, i32 0, i32 0} ; [ DW_TAG_subroutine_type ] +!4 = metadata !{metadata !5} +!5 = metadata !{i32 589860, metadata !2, metadata !"int", null, i32 0, i64 32, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] +!6 = metadata !{i32 589870, i32 0, metadata !1, metadata !"foobar", metadata !"foobar", metadata !"", metadata !1, i32 15, metadata !7, i1 false, i1 true, i32 0, i32 0, i32 0, i32 0, i1 true, void ()* @foobar} ; [ DW_TAG_subprogram ] +!7 = metadata !{i32 589845, metadata !1, metadata !"", metadata !1, i32 0, i64 0, i64 0, i32 0, i32 0, i32 0, metadata !8, i32 0, i32 0} ; [ DW_TAG_subroutine_type ] +!8 = metadata !{null} +!9 = metadata !{i32 590081, metadata !0, metadata !"sp", metadata !1, i32 7, metadata !10, i32 0} ; [ DW_TAG_arg_variable ] +!10 = metadata !{i32 589839, metadata !2, metadata !"", null, i32 0, i64 64, i64 64, i64 0, i32 0, metadata !11} ; [ DW_TAG_pointer_type ] +!11 = metadata !{i32 589846, metadata !2, metadata !"S1", metadata !1, i32 4, i64 0, i64 0, i64 0, i32 0, metadata !12} ; [ DW_TAG_typedef ] +!12 = metadata !{i32 589843, metadata !2, metadata !"S1", metadata !1, i32 1, i64 128, i64 64, i32 0, i32 0, i32 0, metadata !13, i32 0, i32 0} ; [ DW_TAG_structure_type ] +!13 = metadata !{metadata !14, metadata !17} +!14 = metadata !{i32 589837, metadata !1, metadata !"m", metadata !1, i32 2, i64 64, i64 64, i64 0, i32 0, metadata !15} ; [ DW_TAG_member ] +!15 = metadata !{i32 589839, metadata !2, metadata !"", null, i32 0, i64 64, i64 64, i64 0, i32 0, metadata !16} ; [ DW_TAG_pointer_type ] +!16 = metadata !{i32 589860, metadata !2, metadata !"float", null, i32 0, i64 32, i64 32, i64 0, i32 0, i32 4} ; [ DW_TAG_base_type ] +!17 = metadata !{i32 589837, metadata !1, metadata !"nums", metadata !1, i32 3, i64 32, i64 32, i64 64, i32 0, metadata !5} ; [ DW_TAG_member ] +!18 = metadata !{i32 590081, metadata !0, metadata !"nums", metadata !1, i32 7, metadata !5, i32 0} ; [ DW_TAG_arg_variable ] +!19 = metadata !{i32 589876, i32 0, metadata !2, metadata !"p", metadata !"p", metadata !"", metadata !1, i32 14, metadata !11, i32 0, i32 1, %struct.S1* @p} ; [ DW_TAG_variable ] +!20 = metadata !{i32 7, i32 13, metadata !0, null} +!21 = metadata !{i32 7, i32 21, metadata !0, null} +!22 = metadata !{i32 9, i32 3, metadata !23, null} +!23 = metadata !{i32 589835, metadata !0, i32 8, i32 1, metadata !1, i32 0} ; [ DW_TAG_lexical_block ] +!24 = metadata !{metadata !"int", metadata !25} +!25 = metadata !{metadata !"omnipotent char", metadata !26} +!26 = metadata !{metadata !"Simple C/C++ TBAA", null} +!27 = metadata !{i32 10, i32 3, metadata !23, null} +!28 = metadata !{metadata !"any pointer", metadata !25} +!29 = metadata !{i32 11, i32 3, metadata !23, null} +!30 = metadata !{%struct.S1* @p} +!31 = metadata !{i32 7, i32 13, metadata !0, metadata !32} +!32 = metadata !{i32 16, i32 3, metadata !33, null} +!33 = metadata !{i32 589835, metadata !6, i32 15, i32 15, metadata !1, i32 1} ; [ DW_TAG_lexical_block ] +!34 = metadata !{i32 1} +!35 = metadata !{i32 7, i32 21, metadata !0, metadata !32} +!36 = metadata !{i32 9, i32 3, metadata !23, metadata !32} +!37 = metadata !{i32 10, i32 3, metadata !23, metadata !32} +!38 = metadata !{i32 17, i32 1, metadata !33, null} From joerg at bec.de Thu Feb 17 17:36:39 2011 From: joerg at bec.de (Joerg Sonnenberger) Date: Thu, 17 Feb 2011 23:36:39 -0000 Subject: [llvm-commits] [llvm] r125795 - in /llvm/trunk: lib/Target/X86/X86InstrInfo.td test/MC/X86/x86-32-coverage.s test/MC/X86/x86_64-encoding.s Message-ID: <20110217233639.97DD92A6C12C@llvm.org> Author: joerg Date: Thu Feb 17 17:36:39 2011 New Revision: 125795 URL: http://llvm.org/viewvc/llvm-project?rev=125795&view=rev Log: Recognize leavel and leaveq aliases for leave. Validate encoding of leave in 64bit mode. Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.td llvm/trunk/test/MC/X86/x86-32-coverage.s llvm/trunk/test/MC/X86/x86_64-encoding.s Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.td?rev=125795&r1=125794&r2=125795&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86InstrInfo.td (original) +++ llvm/trunk/lib/Target/X86/X86InstrInfo.td Thu Feb 17 17:36:39 2011 @@ -1293,6 +1293,9 @@ // lret maps to lretl, it is not ambiguous with lretq. def : MnemonicAlias<"lret", "lretl">; +def : MnemonicAlias<"leavel", "leave">, Requires<[In32BitMode]>; +def : MnemonicAlias<"leaveq", "leave">, Requires<[In64BitMode]>; + def : MnemonicAlias<"pop", "popl">, Requires<[In32BitMode]>; def : MnemonicAlias<"pop", "popq">, Requires<[In64BitMode]>; def : MnemonicAlias<"popf", "popfl">, Requires<[In32BitMode]>; Modified: llvm/trunk/test/MC/X86/x86-32-coverage.s URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/X86/x86-32-coverage.s?rev=125795&r1=125794&r2=125795&view=diff ============================================================================== --- llvm/trunk/test/MC/X86/x86-32-coverage.s (original) +++ llvm/trunk/test/MC/X86/x86-32-coverage.s Thu Feb 17 17:36:39 2011 @@ -267,6 +267,9 @@ // CHECK: leave leave +// CHECK: leave + leavel + // CHECK: seto %bl seto %bl @@ -3330,6 +3333,10 @@ // CHECK: encoding: [0xc9] leave +// CHECK: leave +// CHECK: encoding: [0xc9] + leavel + // CHECK: seto %bl // CHECK: encoding: [0x0f,0x90,0xc3] seto %bl Modified: llvm/trunk/test/MC/X86/x86_64-encoding.s URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/X86/x86_64-encoding.s?rev=125795&r1=125794&r2=125795&view=diff ============================================================================== --- llvm/trunk/test/MC/X86/x86_64-encoding.s (original) +++ llvm/trunk/test/MC/X86/x86_64-encoding.s Thu Feb 17 17:36:39 2011 @@ -148,3 +148,10 @@ // CHECK: encoding: [0x48,0x0f,0xae,0x08] fxrstorq (%rax) +// CHECK: leave +// CHECK: encoding: [0xc9] + leave + +// CHECK: leave +// CHECK: encoding: [0xc9] + leaveq From clattner at apple.com Thu Feb 17 17:52:25 2011 From: clattner at apple.com (Chris Lattner) Date: Thu, 17 Feb 2011 15:52:25 -0800 Subject: [llvm-commits] [llvm] r125105 - /llvm/trunk/lib/Target/X86/X86ISelLowering.cpp In-Reply-To: References: <20110208190442.036ED2A6C12C@llvm.org> <829B9D03-9FBC-4D64-B717-A75D868E885E@apple.com> Message-ID: On Feb 17, 2011, at 3:34 PM, David A. Greene wrote: > Chris Lattner writes: > > >> Why add the "disable-256bit" command line option? Please remove it, > > For debugging purposes. Should I add this as a target option instead? What is the use case? Is this a temporary hack that will be removed later or something you intend to keep around forever? -Chris From clattner at apple.com Thu Feb 17 17:55:08 2011 From: clattner at apple.com (Chris Lattner) Date: Thu, 17 Feb 2011 15:55:08 -0800 Subject: [llvm-commits] PATCH: Additional convenience methods for ConstantStruct, ConstantArray, and ConstantVector. In-Reply-To: References: Message-ID: <4870E518-6F19-4879-A5B6-5A0A5F6F5F90@apple.com> On Feb 10, 2011, at 1:40 PM, Talin wrote: > This patch adds a new "get" method to ConstantStruct, ConstantArray and ConstantVector. The new method accepts a pair of RandomAccessIterators, similar to other LLVM method signatures. This allows constants to be build using a small vector or other sequential container type more easily. Hi Talin, I don't think that this is the right way to go. Generic random access iterators are not guaranteed to be contiguous in memory (e.g. std::deque). Doesn't ArrayRef solve this need? > In addition, I've also added an END_WITH_NULL variant for ConstantStruct::get(). I only added it to ConstantStruct because I figured that it would be an uncommon use case for arrays and vectors, whereas the creation of small constant structs of predetermined length is fairly common. This part seems fine to me, -Chris From fvbommel at gmail.com Thu Feb 17 18:10:22 2011 From: fvbommel at gmail.com (Frits van Bommel) Date: Fri, 18 Feb 2011 01:10:22 +0100 Subject: [llvm-commits] [Review request] Have Correlated Value Propagation handle instruction operands. In-Reply-To: References: <4D517367.9050105@free.fr> Message-ID: On Fri, Feb 18, 2011 at 12:10 AM, Chris Lattner wrote: > One way to speed this up is to only look at values that have multiple uses. ?If X only has a single use (which is a very common case for instructions) it is unlikely to be simplifyable. That sounds plausible enough. Updated patch attached in case anyone wants to test this. It didn't break any tests, so that's good :). Of course, Duncan did say this simplifies away 'way less' code than his pass so all of this may be moot... -------------- next part -------------- A non-text attachment was scrubbed... Name: correlated-value-prop-operands-v2.patch Type: text/x-patch Size: 6760 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110218/4c38386b/attachment.bin From viridia at gmail.com Thu Feb 17 18:17:41 2011 From: viridia at gmail.com (Talin) Date: Thu, 17 Feb 2011 16:17:41 -0800 Subject: [llvm-commits] PATCH: Additional convenience methods for ConstantStruct, ConstantArray, and ConstantVector. In-Reply-To: <4870E518-6F19-4879-A5B6-5A0A5F6F5F90@apple.com> References: <4870E518-6F19-4879-A5B6-5A0A5F6F5F90@apple.com> Message-ID: On Thu, Feb 17, 2011 at 3:55 PM, Chris Lattner wrote: > > On Feb 10, 2011, at 1:40 PM, Talin wrote: > > > This patch adds a new "get" method to ConstantStruct, ConstantArray and > ConstantVector. The new method accepts a pair of RandomAccessIterators, > similar to other LLVM method signatures. This allows constants to be build > using a small vector or other sequential container type more easily. > > Hi Talin, > > I don't think that this is the right way to go. Generic random access > iterators are not guaranteed to be contiguous in memory (e.g. std::deque). > OK - I was just following the patterns that I saw used elsewhere in LLVM. > > Doesn't ArrayRef solve this need? > Yes, although you'll have to manually call the ArrayRef constructor in cases like this instead of having it be implicit, but that's not a huge deal for me. > > > In addition, I've also added an END_WITH_NULL variant for > ConstantStruct::get(). I only added it to ConstantStruct because I figured > that it would be an uncommon use case for arrays and vectors, whereas the > creation of small constant structs of predetermined length is fairly common. > > This part seems fine to me, > Good cause this is the part I really care about :) Should I wait until you've converted ConstantStruct and friends to use ArrayRef before sending you a new patch? (I'd do it myself, except as you've discovered there may be other projects broken by such changes and you're in a better position to detect and correct those.) -- -- Talin -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110217/012f0249/attachment.html From stoklund at 2pi.dk Thu Feb 17 18:32:47 2011 From: stoklund at 2pi.dk (Jakob Stoklund Olesen) Date: Fri, 18 Feb 2011 00:32:47 -0000 Subject: [llvm-commits] [llvm] r125802 - in /llvm/trunk/lib/CodeGen: RegAllocBasic.cpp SpillPlacement.cpp Message-ID: <20110218003247.320C62A6C12C@llvm.org> Author: stoklund Date: Thu Feb 17 18:32:47 2011 New Revision: 125802 URL: http://llvm.org/viewvc/llvm-project?rev=125802&view=rev Log: Trim debugging output. Modified: llvm/trunk/lib/CodeGen/RegAllocBasic.cpp llvm/trunk/lib/CodeGen/SpillPlacement.cpp Modified: llvm/trunk/lib/CodeGen/RegAllocBasic.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocBasic.cpp?rev=125802&r1=125801&r2=125802&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/RegAllocBasic.cpp (original) +++ llvm/trunk/lib/CodeGen/RegAllocBasic.cpp Thu Feb 17 18:32:47 2011 @@ -244,6 +244,8 @@ } void RegAllocBase::assign(LiveInterval &VirtReg, unsigned PhysReg) { + DEBUG(dbgs() << "assigning " << PrintReg(VirtReg.reg, TRI) + << " to " << PrintReg(PhysReg, TRI) << '\n'); assert(!VRM->hasPhys(VirtReg.reg) && "Duplicate VirtReg assignment"); VRM->assignVirt2Phys(VirtReg.reg, PhysReg); PhysReg2LiveUnion[PhysReg].unify(VirtReg); @@ -251,6 +253,8 @@ } void RegAllocBase::unassign(LiveInterval &VirtReg, unsigned PhysReg) { + DEBUG(dbgs() << "unassigning " << PrintReg(VirtReg.reg, TRI) + << " from " << PrintReg(PhysReg, TRI) << '\n'); assert(VRM->getPhys(VirtReg.reg) == PhysReg && "Inconsistent unassign"); PhysReg2LiveUnion[PhysReg].extract(VirtReg); VRM->clearVirt(VirtReg.reg); @@ -280,11 +284,9 @@ VirtRegVec SplitVRegs; unsigned AvailablePhysReg = selectOrSplit(VirtReg, SplitVRegs); - if (AvailablePhysReg) { - DEBUG(dbgs() << "allocating: " << TRI->getName(AvailablePhysReg) - << " for " << VirtReg << '\n'); + if (AvailablePhysReg) assign(VirtReg, AvailablePhysReg); - } + for (VirtRegVec::iterator I = SplitVRegs.begin(), E = SplitVRegs.end(); I != E; ++I) { LiveInterval* SplitVirtReg = *I; Modified: llvm/trunk/lib/CodeGen/SpillPlacement.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SpillPlacement.cpp?rev=125802&r1=125801&r2=125802&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SpillPlacement.cpp (original) +++ llvm/trunk/lib/CodeGen/SpillPlacement.cpp Thu Feb 17 18:32:47 2011 @@ -204,19 +204,15 @@ /// Set a bit in NodeMask for each active node. void SpillPlacement:: prepareNodes(const SmallVectorImpl &LiveBlocks) { - DEBUG(dbgs() << "Building Hopfield network from " << LiveBlocks.size() - << " constraint blocks:\n"); for (SmallVectorImpl::const_iterator I = LiveBlocks.begin(), E = LiveBlocks.end(); I != E; ++I) { MachineBasicBlock *MBB = MF->getBlockNumbered(I->Number); float Freq = getBlockFrequency(MBB); - DEBUG(dbgs() << " BB#" << I->Number << format(", Freq = %.1f", Freq)); // Is this a transparent block? Link ingoing and outgoing bundles. if (I->Entry == DontCare && I->Exit == DontCare) { unsigned ib = bundles->getBundle(I->Number, 0); unsigned ob = bundles->getBundle(I->Number, 1); - DEBUG(dbgs() << ", transparent EB#" << ib << " -> EB#" << ob << '\n'); // Ignore self-loops. if (ib == ob) @@ -241,7 +237,6 @@ unsigned ib = bundles->getBundle(I->Number, 0); activate(ib); nodes[ib].addBias(Freq * Bias[I->Entry], 1); - DEBUG(dbgs() << format(", entry EB#%u %+.1f", ib, Freq * Bias[I->Entry])); } // Live-out from block? @@ -249,10 +244,7 @@ unsigned ob = bundles->getBundle(I->Number, 1); activate(ob); nodes[ob].addBias(Freq * Bias[I->Exit], 0); - DEBUG(dbgs() << format(", exit EB#%u %+.1f", ob, Freq * Bias[I->Exit])); } - - DEBUG(dbgs() << '\n'); } } @@ -260,7 +252,6 @@ /// maximum number of iterations is reached. /// @param Linked - Numbers of linked nodes that need updating. void SpillPlacement::iterate(const SmallVectorImpl &Linked) { - DEBUG(dbgs() << "Iterating over " << Linked.size() << " linked nodes:\n"); if (Linked.empty()) return; @@ -278,8 +269,6 @@ unsigned n = *I; bool C = nodes[n].update(nodes); Changed |= C; - DEBUG(dbgs() << " \\EB#" << n << format(" = %+2.0f", nodes[n].Value) - << (C ? " *\n" : "\n")); } if (!Changed) return; @@ -291,8 +280,6 @@ unsigned n = *I; bool C = nodes[n].update(nodes); Changed |= C; - DEBUG(dbgs() << " /EB#" << n << format(" = %+2.0f", nodes[n].Value) - << (C ? " *\n" : "\n")); } if (!Changed) return; @@ -312,7 +299,6 @@ // Update all active nodes, and find the ones that are actually linked to // something so their value may change when iterating. - DEBUG(dbgs() << "Network has " << RegBundles.count() << " active nodes:\n"); SmallVector Linked; for (int n = RegBundles.find_first(); n>=0; n = RegBundles.find_next(n)) { nodes[n].update(nodes); @@ -320,17 +306,6 @@ // change its value ever again, so exclude it from iterations. if (!nodes[n].Links.empty() && !nodes[n].mustSpill()) Linked.push_back(n); - - DEBUG({ - dbgs() << " EB#" << n << format(" = %+2.0f", nodes[n].Value) - << format(", Bias %+.2f", nodes[n].Bias) - << format(", Freq %.1f/%.1f", nodes[n].Frequency[0], - nodes[n].Frequency[1]); - for (unsigned i = 0, e = nodes[n].Links.size(); i != e; ++i) - dbgs() << format(", %.2f -> EB#%u", nodes[n].Links[i].first, - nodes[n].Links[i].second); - dbgs() << '\n'; - }); } // Iterate the network to convergence. From bob.wilson at apple.com Thu Feb 17 18:39:11 2011 From: bob.wilson at apple.com (Bob Wilson) Date: Fri, 18 Feb 2011 00:39:11 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r125803 - in /llvm-gcc-4.2/trunk: build_gcc gcc/Makefile.in gcc/mklibgcc.in Message-ID: <20110218003911.B0E222A6C12C@llvm.org> Author: bwilson Date: Thu Feb 17 18:39:11 2011 New Revision: 125803 URL: http://llvm.org/viewvc/llvm-project?rev=125803&view=rev Log: Radar 8710868: Build a separate version of libcc_kext.a for each ARM slice. Combine them together into a single fat library, as is already done for x86. Modified: llvm-gcc-4.2/trunk/build_gcc llvm-gcc-4.2/trunk/gcc/Makefile.in llvm-gcc-4.2/trunk/gcc/mklibgcc.in Modified: llvm-gcc-4.2/trunk/build_gcc URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/build_gcc?rev=125803&r1=125802&r2=125803&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/build_gcc (original) +++ llvm-gcc-4.2/trunk/build_gcc Thu Feb 17 18:39:11 2011 @@ -397,14 +397,25 @@ # LLVM LOCAL Support for non /usr $DEST_ROOT D=`echo $DT/$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS` mv $D/static/libgcc.a $D/libgcc_static.a || exit 1 - mv $D/kext/libgcc.a $D/libcc_kext.a || exit 1 - rm -r $D/static $D/kext || exit 1 + # LLVM LOCAL begin ARM slice-specific kext libraries + rm -r $D/static || exit 1 + if [ -e $D/kext/libgcc.a ]; then + mv $D/kext/libgcc.a $D/libcc_kext.a || exit 1 + rm -r $D/kext || exit 1 + fi + # LLVM LOCAL end ARM slice-specific kext libraries # glue together kext64 stuff if [ -e $D/kext64/libgcc.a ]; then libtool -static $D/{kext64/libgcc.a,libcc_kext.a} -o $D/libcc_kext1.a 2>&1 | grep -v 'has no symbols' mv $D/libcc_kext1.a $D/libcc_kext.a rm -rf $D/kext64 fi + # LLVM LOCAL begin ARM slice-specific kext libraries + if [ $t = 'arm' ]; then + libtool -static $D/kext*/libgcc.a -o $D/libcc_kext.a 2>&1 | grep -v 'has no symbols' + rm -rf $D/kext* || exit 1 + fi + # LLVM LOCAL end ARM slice-specific kext libraries done # Build the cross-hosted compilers. Modified: llvm-gcc-4.2/trunk/gcc/Makefile.in URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/Makefile.in?rev=125803&r1=125802&r2=125803&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/Makefile.in (original) +++ llvm-gcc-4.2/trunk/gcc/Makefile.in Thu Feb 17 18:39:11 2011 @@ -1689,12 +1689,27 @@ # LLVM LOCAL begin libcc_kext ifneq (,$(findstring darwin,$(target))) -APPLE_EXTRA_MULTI := static;@static at fno-pic kext;@Dmalloc=kern_os_malloc at Dfree=kern_os_free at DLIBCC_KEXT@static at fno-pic@fno-exceptions at fno-non-call-exceptions$(KEXT_EXTRA_FLAGS) $(if $(findstring i686,$(target)),kext64;@mkernel at m64@Dmalloc=kern_os_malloc at Dfree=kern_os_free at DLIBCC_KEXT$(KEXT_EXTRA_FLAGS)) +APPLE_KEXT_FLAGS := Dmalloc=kern_os_malloc at Dfree=kern_os_free at DLIBCC_KEXT@static at fno-pic@fno-exceptions at fno-non-call-exceptions$(KEXT_EXTRA_FLAGS) +APPLE_KEXT64_FLAGS := mkernel at m64@Dmalloc=kern_os_malloc at Dfree=kern_os_free at DLIBCC_KEXT$(KEXT_EXTRA_FLAGS) +APPLE_EXTRA_MULTI := \ + static;@static at fno-pic \ + $(if $(findstring arm,$(target)),,kext;@$(APPLE_KEXT_FLAGS)) \ + $(if $(findstring i686,$(target)),kext64;@$(APPLE_KEXT64_FLAGS)) endif # LLVM LOCAL end libcc_kext +# LLVM LOCAL Set apple_extra_multi with a separate kext for each ARM slice. libgcc.mk: config.status Makefile mklibgcc $(LIB2ADD) $(LIB2ADD_ST) specs \ xgcc$(exeext) stamp-as stamp-collect-ld stamp-nm + apple_extra_multi="$(APPLE_EXTRA_MULTI)"; \ + for multilib in `$(GCC_FOR_TARGET) --print-multi-lib`; do \ + multilib_dir=`echo $$multilib | sed -e "s/;.*//"`; \ + if [ "$$multilib_dir" != "." ]; then \ + if echo v5 v6 v7 | grep $$multilib_dir > /dev/null 2>&1; then \ + apple_extra_multi="$$apple_extra_multi kext$${multilib}@$(APPLE_KEXT_FLAGS)"; \ + fi; \ + fi; \ + done; \ objext='$(objext)' \ LIB1ASMFUNCS='$(LIB1ASMFUNCS)' \ LIB2FUNCS_ST='$(LIB2FUNCS_ST)' \ @@ -1727,7 +1742,7 @@ D128PBIT='$(D128PBIT)' \ D128PBIT_FUNCS='$(D128PBIT_FUNCS)' \ APPLE_LOCAL='APPLE LOCAL libcc_kext' \ - MULTILIBS="`$(GCC_FOR_TARGET) --print-multi-lib` $(APPLE_EXTRA_MULTI)" \ + MULTILIBS="`$(GCC_FOR_TARGET) --print-multi-lib` $$apple_extra_multi" \ EXTRA_MULTILIB_PARTS='$(EXTRA_MULTILIB_PARTS)' \ SHLIB_LINK='$(SHLIB_LINK)' \ SHLIB_INSTALL='$(SHLIB_INSTALL)' \ Modified: llvm-gcc-4.2/trunk/gcc/mklibgcc.in URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/mklibgcc.in?rev=125803&r1=125802&r2=125803&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/mklibgcc.in (original) +++ llvm-gcc-4.2/trunk/gcc/mklibgcc.in Thu Feb 17 18:39:11 2011 @@ -827,7 +827,13 @@ # Shared libraries. # APPLE LOCAL libcc_kext - if [ "$libgcc_s_so" -a "$dir" != "static" -a "$dir" != "kext" -a "$dir" != "kext64" ]; then + # LLVM LOCAL begin ARM slice-specific kext libraries + kextdir= + if echo "$dir" | grep kext > /dev/null 2>&1; then + kextdir=1 + fi + # LLVM LOCAL end ARM slice-specific kext libraries + if [ "$libgcc_s_so" -a "$dir" != "static" -a "X$kextdir" = "X" ]; then echo "" echo "$libgcc_s_so: stmp-dirs $libunwind_so" echo " $SHLIB_LINK" \ @@ -908,7 +914,13 @@ shlib_slibdir_qual="/$os_multilib_dir" fi # APPLE LOCAL libcc_kext - if [ "$dir" != "static" -a "$dir" != "kext" -a "$dir" != "kext64" ]; then + # LLVM LOCAL begin ARM slice-specific kext libraries + kextdir= + if echo "$dir" | grep kext > /dev/null 2>&1; then + kextdir=1 + fi + # LLVM LOCAL end ARM slice-specific kext libraries + if [ "$dir" != "static" -a "X$kextdir" = "X" ]; then echo " $SHLIB_INSTALL" \ | sed -e "s%@multilib_dir@%$dir%g" \ -e "s%@shlib_base_name@%libgcc_s%g" \ From akyrtzi at gmail.com Thu Feb 17 18:47:07 2011 From: akyrtzi at gmail.com (Argyrios Kyrtzidis) Date: Fri, 18 Feb 2011 00:47:07 -0000 Subject: [llvm-commits] [llvm] r125804 - /llvm/trunk/lib/Support/Mutex.cpp Message-ID: <20110218004707.40ACB2A6C12C@llvm.org> Author: akirtzidis Date: Thu Feb 17 18:47:07 2011 New Revision: 125804 URL: http://llvm.org/viewvc/llvm-project?rev=125804&view=rev Log: Check the errorcode. Modified: llvm/trunk/lib/Support/Mutex.cpp Modified: llvm/trunk/lib/Support/Mutex.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Mutex.cpp?rev=125804&r1=125803&r2=125804&view=diff ============================================================================== --- llvm/trunk/lib/Support/Mutex.cpp (original) +++ llvm/trunk/lib/Support/Mutex.cpp Thu Feb 17 18:47:07 2011 @@ -78,6 +78,7 @@ #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) // Make it a process local mutex errorcode = pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_PRIVATE); + assert(errorcode == 0); #endif // Initialize the mutex From joerg at bec.de Thu Feb 17 18:48:12 2011 From: joerg at bec.de (Joerg Sonnenberger) Date: Fri, 18 Feb 2011 00:48:12 -0000 Subject: [llvm-commits] [llvm] r125805 - in /llvm/trunk: lib/Target/X86/X86InstrSSE.td test/MC/X86/x86-32.s test/MC/X86/x86-64.s Message-ID: <20110218004812.2230E2A6C12C@llvm.org> Author: joerg Date: Thu Feb 17 18:48:11 2011 New Revision: 125805 URL: http://llvm.org/viewvc/llvm-project?rev=125805&view=rev Log: Recognize monitor/mwait with explicit register arguments Modified: llvm/trunk/lib/Target/X86/X86InstrSSE.td llvm/trunk/test/MC/X86/x86-32.s llvm/trunk/test/MC/X86/x86-64.s Modified: llvm/trunk/lib/Target/X86/X86InstrSSE.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrSSE.td?rev=125805&r1=125804&r2=125805&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86InstrSSE.td (original) +++ llvm/trunk/lib/Target/X86/X86InstrSSE.td Thu Feb 17 18:48:11 2011 @@ -3673,6 +3673,14 @@ def MWAITrr : I<0x01, MRM_C9, (outs), (ins), "mwait", []>, TB, Requires<[HasSSE3]>; +def : InstAlias<"mwait %eax, %ecx", (MWAITrr)>, Requires<[In32BitMode]>; +def : InstAlias<"mwait %rax, %rcx", (MWAITrr)>, Requires<[In64BitMode]>; + +def : InstAlias<"monitor %eax, %ecx, %edx", (MONITORrrr)>, + Requires<[In32BitMode]>; +def : InstAlias<"monitor %rax, %rcx, %rdx", (MONITORrrr)>, + Requires<[In64BitMode]>; + //===---------------------------------------------------------------------===// // Non-Instruction Patterns //===---------------------------------------------------------------------===// Modified: llvm/trunk/test/MC/X86/x86-32.s URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/X86/x86-32.s?rev=125805&r1=125804&r2=125805&view=diff ============================================================================== --- llvm/trunk/test/MC/X86/x86-32.s (original) +++ llvm/trunk/test/MC/X86/x86-32.s Thu Feb 17 18:48:11 2011 @@ -15,9 +15,15 @@ monitor // CHECK: monitor // CHECK: encoding: [0x0f,0x01,0xc8] + monitor %eax, %ecx, %edx +// CHECK: monitor +// CHECK: encoding: [0x0f,0x01,0xc8] mwait // CHECK: mwait // CHECK: encoding: [0x0f,0x01,0xc9] + mwait %eax, %ecx +// CHECK: mwait +// CHECK: encoding: [0x0f,0x01,0xc9] vmcall // CHECK: vmcall Modified: llvm/trunk/test/MC/X86/x86-64.s URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/X86/x86-64.s?rev=125805&r1=125804&r2=125805&view=diff ============================================================================== --- llvm/trunk/test/MC/X86/x86-64.s (original) +++ llvm/trunk/test/MC/X86/x86-64.s Thu Feb 17 18:48:11 2011 @@ -2,6 +2,18 @@ // RUN: FileCheck < %t %s // RUN: FileCheck --check-prefix=CHECK-STDERR < %t.err %s + monitor +// CHECK: monitor +// CHECK: encoding: [0x0f,0x01,0xc8] + monitor %rax, %rcx, %rdx +// CHECK: monitor +// CHECK: encoding: [0x0f,0x01,0xc8] + mwait +// CHECK: mwait +// CHECK: encoding: [0x0f,0x01,0xc9] + mwait %rax, %rcx +// CHECK: mwait +// CHECK: encoding: [0x0f,0x01,0xc9] // Suffix inference: From dmalyshev at accesssoftek.com Thu Feb 17 19:06:06 2011 From: dmalyshev at accesssoftek.com (Danil Malyshev) Date: Thu, 17 Feb 2011 17:06:06 -0800 Subject: [llvm-commits] Fix LLVM tools filename extensions in regress tests for Windows Message-ID: <6AE1604EE3EC5F4296C096518C6B77EE17DD290816@mail.accesssoftek.com> Hello All Some tests on Windows use the "not" utility and fail with an error "program not executable". The reason for this error is that the name of the executable file sended to the "not" without the extension. Attached patch fixes this problem - for each an llvm tool added the file extension. This is a Windows-specific patch and it does not affect any other platform. Tested in the MinGW. The patch fixes the following tests: LLVM :: Assembler/2002-07-25-ParserAssertionFailure.ll LLVM :: Assembler/2003-04-15-ConstantInitAssertion.ll LLVM :: Assembler/2003-05-21-MalformedShiftCrash.ll LLVM :: Assembler/2003-05-21-MalformedStructCrash.ll LLVM :: Assembler/2003-11-11-ImplicitRename.ll LLVM :: Assembler/2003-11-24-SymbolTableCrash.ll LLVM :: Assembler/2003-12-30-TypeMapInvalidMemory.ll LLVM :: Assembler/2004-03-30-UnclosedFunctionCrash.ll LLVM :: Assembler/2004-11-28-InvalidTypeCrash.ll LLVM :: Assembler/2006-09-28-CrashOnInvalid.ll LLVM :: Assembler/2007-01-02-Undefined-Arg-Type.ll LLVM :: Assembler/2007-01-16-CrashOnBadCast.ll LLVM :: Assembler/2007-01-16-CrashOnBadCast2.ll LLVM :: Assembler/2007-03-18-InvalidNumberedVar.ll LLVM :: Assembler/2007-08-06-AliasInvalid.ll LLVM :: Assembler/2007-11-26-AttributeOverload.ll LLVM :: Assembler/2008-02-18-IntPointerCrash.ll LLVM :: Assembler/2008-09-02-FunctionNotes2.ll LLVM :: Assembler/align-inst-alloca.ll LLVM :: Assembler/align-inst-load.ll LLVM :: Assembler/align-inst-store.ll LLVM :: Assembler/extractvalue-invalid-idx.ll LLVM :: Assembler/getelementptr_struct.ll LLVM :: Assembler/insertvalue-invalid-idx.ll LLVM :: Bitcode/null-type.ll LLVM :: CodeGen/X86/GC/badreadproto.ll LLVM :: CodeGen/X86/GC/badrootproto.ll LLVM :: CodeGen/X86/GC/badwriteproto.ll LLVM :: CodeGen/X86/GC/fat.ll LLVM :: CodeGen/X86/GC/outside.ll LLVM :: CodeGen/X86/label-redefinition.ll LLVM :: CodeGen/X86/nosse-error1.ll LLVM :: CodeGen/X86/nosse-error2.ll LLVM :: Feature/globalredefinition3.ll LLVM :: Linker/link-messages.ll LLVM :: Linker/redefinition.ll LLVM :: MC/AsmParser/dash-n.s LLVM :: MC/AsmParser/directive_abort.s LLVM :: MC/AsmParser/equ.s LLVM :: MC/AsmParser/expr_symbol_modifiers.s LLVM :: MC/AsmParser/macros-parsing.s LLVM :: MC/AsmParser/paren.s LLVM :: MC/AsmParser/variables-invalid.s LLVM :: MC/ELF/bad-section.s LLVM :: MC/ELF/diff2.s LLVM :: MC/ELF/invalid-symver.s LLVM :: MC/X86/x86_errors.s LLVM :: Other/2009-09-14-function-elements.ll LLVM :: Other/invalid-commandline-option.ll LLVM :: TableGen/BitsInitOverflow.td LLVM :: TableGen/UnterminatedComment.td LLVM :: Verifier/2002-04-13-RetTypes.ll LLVM :: Verifier/2002-11-05-GetelementptrPointers.ll LLVM :: Verifier/2004-05-21-SwitchConstantMismatch.ll LLVM :: Verifier/2005-03-21-UndefinedTypeReference.ll LLVM :: Verifier/2006-10-15-AddrLabel.ll LLVM :: Verifier/2006-12-12-IntrinsicDefine.ll LLVM :: Verifier/2007-12-21-InvokeParamAttrs.ll LLVM :: Verifier/2008-01-11-VarargAttrs.ll LLVM :: Verifier/2008-03-01-AllocaSized.ll LLVM :: Verifier/2008-08-22-MemCpyAlignment.ll LLVM :: Verifier/2008-11-15-RetVoid.ll LLVM :: Verifier/2009-05-29-InvokeResult1.ll LLVM :: Verifier/2009-05-29-InvokeResult2.ll LLVM :: Verifier/2009-05-29-InvokeResult3.ll LLVM :: Verifier/2010-08-07-PointerIntrinsic.ll LLVM :: Verifier/AmbiguousPhi.ll LLVM :: Verifier/PhiGrouping.ll LLVM :: Verifier/SelfReferential.ll LLVM :: Verifier/aliasing-chain.ll LLVM :: Verifier/byval-1.ll LLVM :: Verifier/byval-2.ll LLVM :: Verifier/gcread-ptrptr.ll LLVM :: Verifier/gcroot-alloca.ll LLVM :: Verifier/gcroot-meta.ll LLVM :: Verifier/gcroot-ptrptr.ll LLVM :: Verifier/gcwrite-ptrptr.ll LLVM :: Verifier/invoke-1.ll LLVM :: Verifier/invoke-2.ll Thank you, Danil -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110217/32507d87/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: fix-exp-01.patch Type: application/octet-stream Size: 1073 bytes Desc: fix-exp-01.patch Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110217/32507d87/attachment-0001.obj From pwalton at mozilla.com Thu Feb 17 19:51:29 2011 From: pwalton at mozilla.com (Patrick Walton) Date: Thu, 17 Feb 2011 17:51:29 -0800 Subject: [llvm-commits] [PATCH] Expose Type::getName() to the C bindings Message-ID: <4D5DD0A1.7030800@mozilla.com> Hi everyone, Currently, the LLVM C bindings allow names for types to be registered. However, a consumer can't get those names back out again. This patch adds an API for it. Thanks, Patrick -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: pcwalton-type-names.diff Url: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110217/a0a924d8/attachment.pl From peter at pcc.me.uk Thu Feb 17 20:59:21 2011 From: peter at pcc.me.uk (Peter Collingbourne) Date: Fri, 18 Feb 2011 02:59:21 -0000 Subject: [llvm-commits] [llvm] r125824 - /llvm/trunk/tools/opt/opt.cpp Message-ID: <20110218025921.5F5DC2A6C12C@llvm.org> Author: pcc Date: Thu Feb 17 20:59:21 2011 New Revision: 125824 URL: http://llvm.org/viewvc/llvm-project?rev=125824&view=rev Log: Make -disable-simplify-libcalls work with -std-compile-opts Modified: llvm/trunk/tools/opt/opt.cpp Modified: llvm/trunk/tools/opt/opt.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/opt/opt.cpp?rev=125824&r1=125823&r2=125824&view=diff ============================================================================== --- llvm/trunk/tools/opt/opt.cpp (original) +++ llvm/trunk/tools/opt/opt.cpp Thu Feb 17 20:59:21 2011 @@ -427,7 +427,7 @@ /*OptimizeSize=*/ false, /*UnitAtATime=*/ true, /*UnrollLoops=*/ true, - /*SimplifyLibCalls=*/ true, + !DisableSimplifyLibCalls, /*HaveExceptions=*/ true, InliningPass); } From resistor at mac.com Thu Feb 17 22:21:03 2011 From: resistor at mac.com (Owen Anderson) Date: Thu, 17 Feb 2011 20:21:03 -0800 Subject: [llvm-commits] [llvm] r115927 - in /llvm/trunk: include/llvm-c/Core.h include/llvm/InitializePasses.h lib/Transforms/Scalar/Scalar.cpp lib/Transforms/Utils/CMakeLists.txt lib/Transforms/Utils/Utils.cpp lib/VMCore/Core.cpp In-Reply-To: <8ABF54E8-A00D-4046-BAEB-99C22BB8849A@apple.com> References: <20101007175547.E941F2A6C12E@llvm.org> <9638033B-44C4-4936-A2C8-A88090FCD719@apple.com> <77D9A52D-0465-4752-A69C-1A7E030D1083@mac.com> <8ABF54E8-A00D-4046-BAEB-99C22BB8849A@apple.com> Message-ID: <85674857-3E92-4CE6-A3AE-5AD1EE9B4340@mac.com> On Jan 17, 2011, at 9:33 AM, Chris Lattner wrote: > > On Jan 16, 2011, at 12:51 AM, Owen Anderson wrote: >> That is still the case. There's two kinds of clients that we care about: >> >> 1) clang and similar clients, which know upfront which set of passes they care about. Their passes are explicitly initialized when they call createFooPass(). Since they never call the global initializeScalarOpts(), they don't link in Scalar.cpp, instead only linking in those passes for which they call createFooPass(). >> >> 2) opt and kin, which need to link/initialize all passes available, so that they can be available from the command line. These clients do call initializeScalarOpts(), thus forcing linkage of all the passes as desired. > > Ok, how about following the existing pattern of putting this in a header file instead of a .cpp file? With this header, is "LinkAllPasses" needed? Can we remove LinkAllPasses and just use "InitializeAllPasses" instead? We can do that, if you want, but we'll still want to have separate headers for LinkAllPasses() vs. LinkAllCodeGen(), etc., so that opt doesn't have to link in all of CodeGen, and vice-versa for llc. --Owen -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110217/534146de/attachment.html From sabre at nondot.org Thu Feb 17 22:25:21 2011 From: sabre at nondot.org (Chris Lattner) Date: Fri, 18 Feb 2011 04:25:21 -0000 Subject: [llvm-commits] [llvm] r125827 - /llvm/trunk/lib/Transforms/Utils/LoopUnroll.cpp Message-ID: <20110218042521.2EA5F2A6C12C@llvm.org> Author: lattner Date: Thu Feb 17 22:25:21 2011 New Revision: 125827 URL: http://llvm.org/viewvc/llvm-project?rev=125827&view=rev Log: Don't unroll loops whose header block's address is taken. This is part of a futile attempt to not "break" bizzaro code like this: l1: printf("l1: %p\n", &&l1); ++x; if( x < 3 ) goto l1; Previously we'd fold &&l1 to 1, which is fine per our semantics but not helpful to the user. Modified: llvm/trunk/lib/Transforms/Utils/LoopUnroll.cpp Modified: llvm/trunk/lib/Transforms/Utils/LoopUnroll.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/LoopUnroll.cpp?rev=125827&r1=125826&r2=125827&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Utils/LoopUnroll.cpp (original) +++ llvm/trunk/lib/Transforms/Utils/LoopUnroll.cpp Thu Feb 17 22:25:21 2011 @@ -96,7 +96,7 @@ } /// Unroll the given loop by Count. The loop must be in LCSSA form. Returns true -/// if unrolling was succesful, or false if the loop was unmodified. Unrolling +/// if unrolling was successful, or false if the loop was unmodified. Unrolling /// can only fail when the loop's latch block is not terminated by a conditional /// branch instruction. However, if the trip count (and multiple) are not known, /// loop unrolling will mostly produce more code that is no faster. @@ -105,7 +105,8 @@ /// /// If a LoopPassManager is passed in, and the loop is fully removed, it will be /// removed from the LoopPassManager as well. LPM can also be NULL. -bool llvm::UnrollLoop(Loop *L, unsigned Count, LoopInfo* LI, LPPassManager* LPM) { +bool llvm::UnrollLoop(Loop *L, unsigned Count, + LoopInfo *LI, LPPassManager *LPM) { BasicBlock *Preheader = L->getLoopPreheader(); if (!Preheader) { DEBUG(dbgs() << " Can't unroll; loop preheader-insertion failed.\n"); @@ -127,6 +128,13 @@ " Can't unroll; loop not terminated by a conditional branch.\n"); return false; } + + if (Header->hasAddressTaken()) { + // The loop-rotate pass can be helpful to avoid this in many cases. + DEBUG(dbgs() << + " Won't unroll loop: address of header block is taken.\n"); + return false; + } // Notify ScalarEvolution that the loop will be substantially changed, // if not outright eliminated. From sabre at nondot.org Thu Feb 17 22:41:42 2011 From: sabre at nondot.org (Chris Lattner) Date: Fri, 18 Feb 2011 04:41:42 -0000 Subject: [llvm-commits] [llvm] r125828 - in /llvm/trunk: include/llvm/Constant.h include/llvm/GlobalValue.h lib/VMCore/Constants.cpp lib/VMCore/Globals.cpp Message-ID: <20110218044142.EBCF52A6C12C@llvm.org> Author: lattner Date: Thu Feb 17 22:41:42 2011 New Revision: 125828 URL: http://llvm.org/viewvc/llvm-project?rev=125828&view=rev Log: hoist GlobalValue::removeDeadConstantUsers up to being a method on Constant. Modified: llvm/trunk/include/llvm/Constant.h llvm/trunk/include/llvm/GlobalValue.h llvm/trunk/lib/VMCore/Constants.cpp llvm/trunk/lib/VMCore/Globals.cpp Modified: llvm/trunk/include/llvm/Constant.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Constant.h?rev=125828&r1=125827&r2=125828&view=diff ============================================================================== --- llvm/trunk/include/llvm/Constant.h (original) +++ llvm/trunk/include/llvm/Constant.h Thu Feb 17 22:41:42 2011 @@ -141,16 +141,22 @@ assert(0 && "Constants that do not have operands cannot be using 'From'!"); } - static Constant* getNullValue(const Type* Ty); + static Constant *getNullValue(const Type* Ty); /// @returns the value for an integer constant of the given type that has all /// its bits set to true. /// @brief Get the all ones value - static Constant* getAllOnesValue(const Type* Ty); + static Constant *getAllOnesValue(const Type* Ty); /// getIntegerValue - Return the value for an integer or pointer constant, /// or a vector thereof, with the given scalar value. - static Constant* getIntegerValue(const Type* Ty, const APInt &V); + static Constant *getIntegerValue(const Type* Ty, const APInt &V); + + /// removeDeadConstantUsers - If there are any dead constant users dangling + /// off of this constant, remove them. This method is useful for clients + /// that want to check to see if a global is unused, but don't want to deal + /// with potentially dead constants hanging off of the globals. + void removeDeadConstantUsers() const; }; } // End llvm namespace Modified: llvm/trunk/include/llvm/GlobalValue.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/GlobalValue.h?rev=125828&r1=125827&r2=125828&view=diff ============================================================================== --- llvm/trunk/include/llvm/GlobalValue.h (original) +++ llvm/trunk/include/llvm/GlobalValue.h Thu Feb 17 22:41:42 2011 @@ -282,12 +282,6 @@ inline Module *getParent() { return Parent; } inline const Module *getParent() const { return Parent; } - /// removeDeadConstantUsers - If there are any dead constant users dangling - /// off of this global value, remove them. This method is useful for clients - /// that want to check to see if a global is unused, but don't want to deal - /// with potentially dead constants hanging off of the globals. - void removeDeadConstantUsers() const; - // Methods for support type inquiry through isa, cast, and dyn_cast: static inline bool classof(const GlobalValue *) { return true; } static inline bool classof(const Value *V) { Modified: llvm/trunk/lib/VMCore/Constants.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Constants.cpp?rev=125828&r1=125827&r2=125828&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/Constants.cpp (original) +++ llvm/trunk/lib/VMCore/Constants.cpp Thu Feb 17 22:41:42 2011 @@ -262,6 +262,59 @@ } +/// removeDeadUsersOfConstant - If the specified constantexpr is dead, remove +/// it. This involves recursively eliminating any dead users of the +/// constantexpr. +static bool removeDeadUsersOfConstant(const Constant *C) { + if (isa(C)) return false; // Cannot remove this + + while (!C->use_empty()) { + const Constant *User = dyn_cast(C->use_back()); + if (!User) return false; // Non-constant usage; + if (!removeDeadUsersOfConstant(User)) + return false; // Constant wasn't dead + } + + const_cast(C)->destroyConstant(); + return true; +} + + +/// removeDeadConstantUsers - If there are any dead constant users dangling +/// off of this constant, remove them. This method is useful for clients +/// that want to check to see if a global is unused, but don't want to deal +/// with potentially dead constants hanging off of the globals. +void Constant::removeDeadConstantUsers() const { + Value::const_use_iterator I = use_begin(), E = use_end(); + Value::const_use_iterator LastNonDeadUser = E; + while (I != E) { + const Constant *User = dyn_cast(*I); + if (User == 0) { + LastNonDeadUser = I; + ++I; + continue; + } + + if (!removeDeadUsersOfConstant(User)) { + // If the constant wasn't dead, remember that this was the last live use + // and move on to the next constant. + LastNonDeadUser = I; + ++I; + continue; + } + + // If the constant was dead, then the iterator is invalidated. + if (LastNonDeadUser == E) { + I = use_begin(); + if (I == E) break; + } else { + I = LastNonDeadUser; + ++I; + } + } +} + + //===----------------------------------------------------------------------===// // ConstantInt Modified: llvm/trunk/lib/VMCore/Globals.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Globals.cpp?rev=125828&r1=125827&r2=125828&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/Globals.cpp (original) +++ llvm/trunk/lib/VMCore/Globals.cpp Thu Feb 17 22:41:42 2011 @@ -26,23 +26,6 @@ // GlobalValue Class //===----------------------------------------------------------------------===// -/// removeDeadUsersOfConstant - If the specified constantexpr is dead, remove -/// it. This involves recursively eliminating any dead users of the -/// constantexpr. -static bool removeDeadUsersOfConstant(const Constant *C) { - if (isa(C)) return false; // Cannot remove this - - while (!C->use_empty()) { - const Constant *User = dyn_cast(C->use_back()); - if (!User) return false; // Non-constant usage; - if (!removeDeadUsersOfConstant(User)) - return false; // Constant wasn't dead - } - - const_cast(C)->destroyConstant(); - return true; -} - bool GlobalValue::isMaterializable() const { return getParent() && getParent()->isMaterializable(this); } @@ -56,38 +39,6 @@ getParent()->Dematerialize(this); } -/// removeDeadConstantUsers - If there are any dead constant users dangling -/// off of this global value, remove them. This method is useful for clients -/// that want to check to see if a global is unused, but don't want to deal -/// with potentially dead constants hanging off of the globals. -void GlobalValue::removeDeadConstantUsers() const { - Value::const_use_iterator I = use_begin(), E = use_end(); - Value::const_use_iterator LastNonDeadUser = E; - while (I != E) { - if (const Constant *User = dyn_cast(*I)) { - if (!removeDeadUsersOfConstant(User)) { - // If the constant wasn't dead, remember that this was the last live use - // and move on to the next constant. - LastNonDeadUser = I; - ++I; - } else { - // If the constant was dead, then the iterator is invalidated. - if (LastNonDeadUser == E) { - I = use_begin(); - if (I == E) break; - } else { - I = LastNonDeadUser; - ++I; - } - } - } else { - LastNonDeadUser = I; - ++I; - } - } -} - - /// Override destroyConstant to make sure it doesn't get called on /// GlobalValue's because they shouldn't be treated like other constants. void GlobalValue::destroyConstant() { From sabre at nondot.org Thu Feb 17 22:43:07 2011 From: sabre at nondot.org (Chris Lattner) Date: Fri, 18 Feb 2011 04:43:07 -0000 Subject: [llvm-commits] [llvm] r125829 - in /llvm/trunk: lib/Transforms/Scalar/JumpThreading.cpp test/Transforms/JumpThreading/indirectbr.ll Message-ID: <20110218044307.111EB2A6C12C@llvm.org> Author: lattner Date: Thu Feb 17 22:43:06 2011 New Revision: 125829 URL: http://llvm.org/viewvc/llvm-project?rev=125829&view=rev Log: prevent jump threading from merging blocks when their address is taken (and used!). This prevents merging the blocks (invalidating the block addresses) in a case like this: #define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; }) void foo() { printf("%p\n", _THIS_IP_); printf("%p\n", _THIS_IP_); printf("%p\n", _THIS_IP_); } which fixes PR4151. Modified: llvm/trunk/lib/Transforms/Scalar/JumpThreading.cpp llvm/trunk/test/Transforms/JumpThreading/indirectbr.ll Modified: llvm/trunk/lib/Transforms/Scalar/JumpThreading.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/JumpThreading.cpp?rev=125829&r1=125828&r2=125829&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/JumpThreading.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/JumpThreading.cpp Thu Feb 17 22:43:06 2011 @@ -606,6 +606,16 @@ return MinSucc; } +static bool hasAddressTakenAndUsed(BasicBlock *BB) { + if (!BB->hasAddressTaken()) return false; + + // If the block has its address taken, it may be a tree of dead constants + // hanging off of it. These shouldn't keep the block alive. + BlockAddress *BA = BlockAddress::get(BB); + BA->removeDeadConstantUsers(); + return !BA->use_empty(); +} + /// ProcessBlock - If there are any predecessors whose control can be threaded /// through to a successor, transform them now. bool JumpThreading::ProcessBlock(BasicBlock *BB) { @@ -621,7 +631,7 @@ // predecessors of our predecessor block. if (BasicBlock *SinglePred = BB->getSinglePredecessor()) { if (SinglePred->getTerminator()->getNumSuccessors() == 1 && - SinglePred != BB) { + SinglePred != BB && !hasAddressTakenAndUsed(BB)) { // If SinglePred was a loop header, BB becomes one. if (LoopHeaders.erase(SinglePred)) LoopHeaders.insert(BB); Modified: llvm/trunk/test/Transforms/JumpThreading/indirectbr.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/JumpThreading/indirectbr.ll?rev=125829&r1=125828&r2=125829&view=diff ============================================================================== --- llvm/trunk/test/Transforms/JumpThreading/indirectbr.ll (original) +++ llvm/trunk/test/Transforms/JumpThreading/indirectbr.ll Thu Feb 17 22:43:06 2011 @@ -44,7 +44,9 @@ ; Check constant folding of indirectbr ; CHECK: void @test2 -; CHECK-NEXT: : +; CHECK: entry: +; CHECK-NEXT: br label %L1 +; CHECK: L1: ; CHECK-NEXT: call void @bar ; CHECK-NEXT: ret void define void @test2() nounwind { @@ -59,3 +61,34 @@ call void @baz() ret void } + + +; PR4151 +; Don't merge address-taken blocks. + at .str = private unnamed_addr constant [4 x i8] c"%p\0A\00" + +; CHECK: @test3 +; CHECK: __here: +; CHECK: blockaddress(@test3, %__here) +; CHECK: __here1: +; CHECK: blockaddress(@test3, %__here1) +; CHECK: __here3: +; CHECK: blockaddress(@test3, %__here3) +define void @test3() nounwind ssp noredzone { +entry: + br label %__here + +__here: ; preds = %entry + %call = call i32 (...)* @printf(i8* getelementptr inbounds ([4 x i8]* @.str, i64 0, i64 0), i64 ptrtoint (i8* blockaddress(@test3, %__here) to i64)) nounwind noredzone + br label %__here1 + +__here1: ; preds = %__here + %call2 = call i32 (...)* @printf(i8* getelementptr inbounds ([4 x i8]* @.str, i64 0, i64 0), i64 ptrtoint (i8* blockaddress(@test3, %__here1) to i64)) nounwind noredzone + br label %__here3 + +__here3: ; preds = %__here1 + %call4 = call i32 (...)* @printf(i8* getelementptr inbounds ([4 x i8]* @.str, i64 0, i64 0), i64 ptrtoint (i8* blockaddress(@test3, %__here3) to i64)) nounwind noredzone + ret void +} + +declare i32 @printf(...) noredzone From zwarich at apple.com Thu Feb 17 22:58:10 2011 From: zwarich at apple.com (Cameron Zwarich) Date: Fri, 18 Feb 2011 04:58:10 -0000 Subject: [llvm-commits] [llvm] r125830 - in /llvm/trunk: include/llvm/CodeGen/SelectionDAG.h lib/CodeGen/SelectionDAG/LegalizeDAG.cpp lib/CodeGen/SelectionDAG/SDNodeDbgValue.h lib/CodeGen/SelectionDAG/SelectionDAG.cpp lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp test/CodeGen/X86/dbg-value-inlined-parameter.ll Message-ID: <20110218045810.747542A6C12C@llvm.org> Author: zwarich Date: Thu Feb 17 22:58:10 2011 New Revision: 125830 URL: http://llvm.org/viewvc/llvm-project?rev=125830&view=rev Log: Roll out r125794 to help diagnose the llvm-gcc-i386-linux-selfhost failure. Removed: llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAG.h llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAG.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAG.h?rev=125830&r1=125829&r2=125830&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/SelectionDAG.h (original) +++ llvm/trunk/include/llvm/CodeGen/SelectionDAG.h Thu Feb 17 22:58:10 2011 @@ -100,6 +100,10 @@ return DbgValMap[Node]; } + void removeSDDbgValues(const SDNode *Node) { + DbgValMap.erase(Node); + } + typedef SmallVector::iterator DbgIterator; DbgIterator DbgBegin() { return DbgValues.begin(); } DbgIterator DbgEnd() { return DbgValues.end(); } Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp?rev=125830&r1=125829&r2=125830&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Thu Feb 17 22:58:10 2011 @@ -87,9 +87,6 @@ // If someone requests legalization of the new node, return itself. if (From != To) LegalizedNodes.insert(std::make_pair(To, To)); - - // Transfer SDDbgValues. - DAG.TransferDbgValues(From, To); } public: Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h?rev=125830&r1=125829&r2=125830&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h Thu Feb 17 22:58:10 2011 @@ -83,6 +83,14 @@ // Returns the SDNode* for a register ref SDNode *getSDNode() { assert (kind==SDNODE); return u.s.Node; } + // setSDNode - If underlying SDNode is replaced by another node then + // SelectionDAG can use this to transfer DbgValue. + void setSDNode(SDNode *N, unsigned R) { + assert (kind==SDNODE); + u.s.Node = N; + u.s.ResNo = R; + } + // Returns the ResNo for a register ref unsigned getResNo() { assert (kind==SDNODE); return u.s.ResNo; } Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=125830&r1=125829&r2=125830&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Thu Feb 17 22:58:10 2011 @@ -5508,14 +5508,12 @@ SDNode *FromNode = From.getNode(); SDNode *ToNode = To.getNode(); SmallVector &DVs = GetDbgValues(FromNode); + DbgInfo->removeSDDbgValues(FromNode); for (SmallVector::iterator I = DVs.begin(), E = DVs.end(); I != E; ++I) { - SDDbgValue *Dbg = *I; - if (Dbg->getKind() == SDDbgValue::SDNODE) { - SDDbgValue *Clone = getDbgValue(Dbg->getMDPtr(), ToNode, To.getResNo(), - Dbg->getOffset(), Dbg->getDebugLoc(), - Dbg->getOrder()); - AddDbgValue(Clone, ToNode, false); + if ((*I)->getKind() == SDDbgValue::SDNODE) { + AddDbgValue(*I, ToNode, false); + (*I)->setSDNode(ToNode, To.getResNo()); } } } Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp?rev=125830&r1=125829&r2=125830&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Thu Feb 17 22:58:10 2011 @@ -4287,7 +4287,7 @@ N.getResNo(), Offset, dl, SDNodeOrder); DAG.AddDbgValue(SDV, N.getNode(), false); } - } else if (!V->use_empty() ) { + } else if (isa(V) && !V->use_empty() ) { // Do not call getValue(V) yet, as we don't want to generate code. // Remember it for later. DanglingDebugInfo DDI(&DI, dl, SDNodeOrder); Removed: llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll?rev=125829&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll (original) +++ llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll (removed) @@ -1,86 +0,0 @@ -; RUN: llc -mtriple=x86_64-apple-darwin < %s | FileCheck %s - -;CHECK: DW_TAG_inlined_subroutine -;CHECK-NEXT: DW_AT_abstract_origin -;CHECK-NEXT: DW_AT_low_pc -;CHECK-NEXT: DW_AT_high_pc -;CHECK-NEXT: DW_AT_call_file -;CHECK-NEXT: DW_AT_call_line -;CHECK-NEXT: DW_TAG_formal_parameter -;CHECK-NEXT: .ascii "sp" ## DW_AT_name - -%struct.S1 = type { float*, i32 } - - at p = common global %struct.S1 zeroinitializer, align 8 - -define i32 @foo(%struct.S1* nocapture %sp, i32 %nums) nounwind optsize ssp { -entry: - tail call void @llvm.dbg.value(metadata !{%struct.S1* %sp}, i64 0, metadata !9), !dbg !20 - tail call void @llvm.dbg.value(metadata !{i32 %nums}, i64 0, metadata !18), !dbg !21 - %tmp2 = getelementptr inbounds %struct.S1* %sp, i64 0, i32 1, !dbg !22 - store i32 %nums, i32* %tmp2, align 4, !dbg !22, !tbaa !24 - %call = tail call float* @bar(i32 %nums) nounwind optsize, !dbg !27 - %tmp5 = getelementptr inbounds %struct.S1* %sp, i64 0, i32 0, !dbg !27 - store float* %call, float** %tmp5, align 8, !dbg !27, !tbaa !28 - %cmp = icmp ne float* %call, null, !dbg !29 - %cond = zext i1 %cmp to i32, !dbg !29 - ret i32 %cond, !dbg !29 -} - -declare float* @bar(i32) optsize - -define void @foobar() nounwind optsize ssp { -entry: - tail call void @llvm.dbg.value(metadata !30, i64 0, metadata !9) nounwind, !dbg !31 - tail call void @llvm.dbg.value(metadata !34, i64 0, metadata !18) nounwind, !dbg !35 - store i32 1, i32* getelementptr inbounds (%struct.S1* @p, i64 0, i32 1), align 8, !dbg !36, !tbaa !24 - %call.i = tail call float* @bar(i32 1) nounwind optsize, !dbg !37 - store float* %call.i, float** getelementptr inbounds (%struct.S1* @p, i64 0, i32 0), align 8, !dbg !37, !tbaa !28 - ret void, !dbg !38 -} - -declare void @llvm.dbg.value(metadata, i64, metadata) nounwind readnone - -!llvm.dbg.sp = !{!0, !6} -!llvm.dbg.lv.foo = !{!9, !18} -!llvm.dbg.gv = !{!19} - -!0 = metadata !{i32 589870, i32 0, metadata !1, metadata !"foo", metadata !"foo", metadata !"", metadata !1, i32 8, metadata !3, i1 false, i1 true, i32 0, i32 0, i32 0, i32 256, i1 true, i32 (%struct.S1*, i32)* @foo} ; [ DW_TAG_subprogram ] -!1 = metadata !{i32 589865, metadata !"nm2.c", metadata !"/private/tmp", metadata !2} ; [ DW_TAG_file_type ] -!2 = metadata !{i32 589841, i32 0, i32 12, metadata !"nm2.c", metadata !"/private/tmp", metadata !"clang version 2.9 (trunk 125693)", i1 true, i1 true, metadata !"", i32 0} ; [ DW_TAG_compile_unit ] -!3 = metadata !{i32 589845, metadata !1, metadata !"", metadata !1, i32 0, i64 0, i64 0, i32 0, i32 0, i32 0, metadata !4, i32 0, i32 0} ; [ DW_TAG_subroutine_type ] -!4 = metadata !{metadata !5} -!5 = metadata !{i32 589860, metadata !2, metadata !"int", null, i32 0, i64 32, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] -!6 = metadata !{i32 589870, i32 0, metadata !1, metadata !"foobar", metadata !"foobar", metadata !"", metadata !1, i32 15, metadata !7, i1 false, i1 true, i32 0, i32 0, i32 0, i32 0, i1 true, void ()* @foobar} ; [ DW_TAG_subprogram ] -!7 = metadata !{i32 589845, metadata !1, metadata !"", metadata !1, i32 0, i64 0, i64 0, i32 0, i32 0, i32 0, metadata !8, i32 0, i32 0} ; [ DW_TAG_subroutine_type ] -!8 = metadata !{null} -!9 = metadata !{i32 590081, metadata !0, metadata !"sp", metadata !1, i32 7, metadata !10, i32 0} ; [ DW_TAG_arg_variable ] -!10 = metadata !{i32 589839, metadata !2, metadata !"", null, i32 0, i64 64, i64 64, i64 0, i32 0, metadata !11} ; [ DW_TAG_pointer_type ] -!11 = metadata !{i32 589846, metadata !2, metadata !"S1", metadata !1, i32 4, i64 0, i64 0, i64 0, i32 0, metadata !12} ; [ DW_TAG_typedef ] -!12 = metadata !{i32 589843, metadata !2, metadata !"S1", metadata !1, i32 1, i64 128, i64 64, i32 0, i32 0, i32 0, metadata !13, i32 0, i32 0} ; [ DW_TAG_structure_type ] -!13 = metadata !{metadata !14, metadata !17} -!14 = metadata !{i32 589837, metadata !1, metadata !"m", metadata !1, i32 2, i64 64, i64 64, i64 0, i32 0, metadata !15} ; [ DW_TAG_member ] -!15 = metadata !{i32 589839, metadata !2, metadata !"", null, i32 0, i64 64, i64 64, i64 0, i32 0, metadata !16} ; [ DW_TAG_pointer_type ] -!16 = metadata !{i32 589860, metadata !2, metadata !"float", null, i32 0, i64 32, i64 32, i64 0, i32 0, i32 4} ; [ DW_TAG_base_type ] -!17 = metadata !{i32 589837, metadata !1, metadata !"nums", metadata !1, i32 3, i64 32, i64 32, i64 64, i32 0, metadata !5} ; [ DW_TAG_member ] -!18 = metadata !{i32 590081, metadata !0, metadata !"nums", metadata !1, i32 7, metadata !5, i32 0} ; [ DW_TAG_arg_variable ] -!19 = metadata !{i32 589876, i32 0, metadata !2, metadata !"p", metadata !"p", metadata !"", metadata !1, i32 14, metadata !11, i32 0, i32 1, %struct.S1* @p} ; [ DW_TAG_variable ] -!20 = metadata !{i32 7, i32 13, metadata !0, null} -!21 = metadata !{i32 7, i32 21, metadata !0, null} -!22 = metadata !{i32 9, i32 3, metadata !23, null} -!23 = metadata !{i32 589835, metadata !0, i32 8, i32 1, metadata !1, i32 0} ; [ DW_TAG_lexical_block ] -!24 = metadata !{metadata !"int", metadata !25} -!25 = metadata !{metadata !"omnipotent char", metadata !26} -!26 = metadata !{metadata !"Simple C/C++ TBAA", null} -!27 = metadata !{i32 10, i32 3, metadata !23, null} -!28 = metadata !{metadata !"any pointer", metadata !25} -!29 = metadata !{i32 11, i32 3, metadata !23, null} -!30 = metadata !{%struct.S1* @p} -!31 = metadata !{i32 7, i32 13, metadata !0, metadata !32} -!32 = metadata !{i32 16, i32 3, metadata !33, null} -!33 = metadata !{i32 589835, metadata !6, i32 15, i32 15, metadata !1, i32 1} ; [ DW_TAG_lexical_block ] -!34 = metadata !{i32 1} -!35 = metadata !{i32 7, i32 21, metadata !0, metadata !32} -!36 = metadata !{i32 9, i32 3, metadata !23, metadata !32} -!37 = metadata !{i32 10, i32 3, metadata !23, metadata !32} -!38 = metadata !{i32 17, i32 1, metadata !33, null} From zwarich at apple.com Thu Feb 17 23:02:06 2011 From: zwarich at apple.com (Cameron Zwarich) Date: Thu, 17 Feb 2011 21:02:06 -0800 Subject: [llvm-commits] [llvm] r125794 - in /llvm/trunk: include/llvm/CodeGen/SelectionDAG.h lib/CodeGen/SelectionDAG/LegalizeDAG.cpp lib/CodeGen/SelectionDAG/SDNodeDbgValue.h lib/CodeGen/SelectionDAG/SelectionDAG.cpp lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp test/CodeGen/X86/dbg-value-inlined-parameter.ll In-Reply-To: <20110217233327.D53A82A6C12C@llvm.org> References: <20110217233327.D53A82A6C12C@llvm.org> Message-ID: <38F35C11-B253-4EBC-9A91-4B912F5FED02@apple.com> I'm going to roll this out to help diagnose the failure on the llvm-gcc-i386-linux-selfhost bot. It is the only significant change in the blamed revision range. Sorry about that! Cameron On Feb 17, 2011, at 3:33 PM, Devang Patel wrote: > Author: dpatel > Date: Thu Feb 17 17:33:27 2011 > New Revision: 125794 > > URL: http://llvm.org/viewvc/llvm-project?rev=125794&view=rev > Log: > Do not lose debug info of an inlined function argument even if the argument is only used through GEPs. > > Added: > llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll > Modified: > llvm/trunk/include/llvm/CodeGen/SelectionDAG.h > llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp > llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h > llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp > llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp > > Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAG.h > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAG.h?rev=125794&r1=125793&r2=125794&view=diff > ============================================================================== > --- llvm/trunk/include/llvm/CodeGen/SelectionDAG.h (original) > +++ llvm/trunk/include/llvm/CodeGen/SelectionDAG.h Thu Feb 17 17:33:27 2011 > @@ -100,10 +100,6 @@ > return DbgValMap[Node]; > } > > - void removeSDDbgValues(const SDNode *Node) { > - DbgValMap.erase(Node); > - } > - > typedef SmallVector::iterator DbgIterator; > DbgIterator DbgBegin() { return DbgValues.begin(); } > DbgIterator DbgEnd() { return DbgValues.end(); } > > Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp?rev=125794&r1=125793&r2=125794&view=diff > ============================================================================== > --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp (original) > +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Thu Feb 17 17:33:27 2011 > @@ -87,6 +87,9 @@ > // If someone requests legalization of the new node, return itself. > if (From != To) > LegalizedNodes.insert(std::make_pair(To, To)); > + > + // Transfer SDDbgValues. > + DAG.TransferDbgValues(From, To); > } > > public: > > Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h?rev=125794&r1=125793&r2=125794&view=diff > ============================================================================== > --- llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h (original) > +++ llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h Thu Feb 17 17:33:27 2011 > @@ -83,14 +83,6 @@ > // Returns the SDNode* for a register ref > SDNode *getSDNode() { assert (kind==SDNODE); return u.s.Node; } > > - // setSDNode - If underlying SDNode is replaced by another node then > - // SelectionDAG can use this to transfer DbgValue. > - void setSDNode(SDNode *N, unsigned R) { > - assert (kind==SDNODE); > - u.s.Node = N; > - u.s.ResNo = R; > - } > - > // Returns the ResNo for a register ref > unsigned getResNo() { assert (kind==SDNODE); return u.s.ResNo; } > > > Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=125794&r1=125793&r2=125794&view=diff > ============================================================================== > --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original) > +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Thu Feb 17 17:33:27 2011 > @@ -5508,12 +5508,14 @@ > SDNode *FromNode = From.getNode(); > SDNode *ToNode = To.getNode(); > SmallVector &DVs = GetDbgValues(FromNode); > - DbgInfo->removeSDDbgValues(FromNode); > for (SmallVector::iterator I = DVs.begin(), E = DVs.end(); > I != E; ++I) { > - if ((*I)->getKind() == SDDbgValue::SDNODE) { > - AddDbgValue(*I, ToNode, false); > - (*I)->setSDNode(ToNode, To.getResNo()); > + SDDbgValue *Dbg = *I; > + if (Dbg->getKind() == SDDbgValue::SDNODE) { > + SDDbgValue *Clone = getDbgValue(Dbg->getMDPtr(), ToNode, To.getResNo(), > + Dbg->getOffset(), Dbg->getDebugLoc(), > + Dbg->getOrder()); > + AddDbgValue(Clone, ToNode, false); > } > } > } > > Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp?rev=125794&r1=125793&r2=125794&view=diff > ============================================================================== > --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp (original) > +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Thu Feb 17 17:33:27 2011 > @@ -4287,7 +4287,7 @@ > N.getResNo(), Offset, dl, SDNodeOrder); > DAG.AddDbgValue(SDV, N.getNode(), false); > } > - } else if (isa(V) && !V->use_empty() ) { > + } else if (!V->use_empty() ) { > // Do not call getValue(V) yet, as we don't want to generate code. > // Remember it for later. > DanglingDebugInfo DDI(&DI, dl, SDNodeOrder); > > Added: llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll?rev=125794&view=auto > ============================================================================== > --- llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll (added) > +++ llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll Thu Feb 17 17:33:27 2011 > @@ -0,0 +1,86 @@ > +; RUN: llc -mtriple=x86_64-apple-darwin < %s | FileCheck %s > + > +;CHECK: DW_TAG_inlined_subroutine > +;CHECK-NEXT: DW_AT_abstract_origin > +;CHECK-NEXT: DW_AT_low_pc > +;CHECK-NEXT: DW_AT_high_pc > +;CHECK-NEXT: DW_AT_call_file > +;CHECK-NEXT: DW_AT_call_line > +;CHECK-NEXT: DW_TAG_formal_parameter > +;CHECK-NEXT: .ascii "sp" ## DW_AT_name > + > +%struct.S1 = type { float*, i32 } > + > + at p = common global %struct.S1 zeroinitializer, align 8 > + > +define i32 @foo(%struct.S1* nocapture %sp, i32 %nums) nounwind optsize ssp { > +entry: > + tail call void @llvm.dbg.value(metadata !{%struct.S1* %sp}, i64 0, metadata !9), !dbg !20 > + tail call void @llvm.dbg.value(metadata !{i32 %nums}, i64 0, metadata !18), !dbg !21 > + %tmp2 = getelementptr inbounds %struct.S1* %sp, i64 0, i32 1, !dbg !22 > + store i32 %nums, i32* %tmp2, align 4, !dbg !22, !tbaa !24 > + %call = tail call float* @bar(i32 %nums) nounwind optsize, !dbg !27 > + %tmp5 = getelementptr inbounds %struct.S1* %sp, i64 0, i32 0, !dbg !27 > + store float* %call, float** %tmp5, align 8, !dbg !27, !tbaa !28 > + %cmp = icmp ne float* %call, null, !dbg !29 > + %cond = zext i1 %cmp to i32, !dbg !29 > + ret i32 %cond, !dbg !29 > +} > + > +declare float* @bar(i32) optsize > + > +define void @foobar() nounwind optsize ssp { > +entry: > + tail call void @llvm.dbg.value(metadata !30, i64 0, metadata !9) nounwind, !dbg !31 > + tail call void @llvm.dbg.value(metadata !34, i64 0, metadata !18) nounwind, !dbg !35 > + store i32 1, i32* getelementptr inbounds (%struct.S1* @p, i64 0, i32 1), align 8, !dbg !36, !tbaa !24 > + %call.i = tail call float* @bar(i32 1) nounwind optsize, !dbg !37 > + store float* %call.i, float** getelementptr inbounds (%struct.S1* @p, i64 0, i32 0), align 8, !dbg !37, !tbaa !28 > + ret void, !dbg !38 > +} > + > +declare void @llvm.dbg.value(metadata, i64, metadata) nounwind readnone > + > +!llvm.dbg.sp = !{!0, !6} > +!llvm.dbg.lv.foo = !{!9, !18} > +!llvm.dbg.gv = !{!19} > + > +!0 = metadata !{i32 589870, i32 0, metadata !1, metadata !"foo", metadata !"foo", metadata !"", metadata !1, i32 8, metadata !3, i1 false, i1 true, i32 0, i32 0, i32 0, i32 256, i1 true, i32 (%struct.S1*, i32)* @foo} ; [ DW_TAG_subprogram ] > +!1 = metadata !{i32 589865, metadata !"nm2.c", metadata !"/private/tmp", metadata !2} ; [ DW_TAG_file_type ] > +!2 = metadata !{i32 589841, i32 0, i32 12, metadata !"nm2.c", metadata !"/private/tmp", metadata !"clang version 2.9 (trunk 125693)", i1 true, i1 true, metadata !"", i32 0} ; [ DW_TAG_compile_unit ] > +!3 = metadata !{i32 589845, metadata !1, metadata !"", metadata !1, i32 0, i64 0, i64 0, i32 0, i32 0, i32 0, metadata !4, i32 0, i32 0} ; [ DW_TAG_subroutine_type ] > +!4 = metadata !{metadata !5} > +!5 = metadata !{i32 589860, metadata !2, metadata !"int", null, i32 0, i64 32, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] > +!6 = metadata !{i32 589870, i32 0, metadata !1, metadata !"foobar", metadata !"foobar", metadata !"", metadata !1, i32 15, metadata !7, i1 false, i1 true, i32 0, i32 0, i32 0, i32 0, i1 true, void ()* @foobar} ; [ DW_TAG_subprogram ] > +!7 = metadata !{i32 589845, metadata !1, metadata !"", metadata !1, i32 0, i64 0, i64 0, i32 0, i32 0, i32 0, metadata !8, i32 0, i32 0} ; [ DW_TAG_subroutine_type ] > +!8 = metadata !{null} > +!9 = metadata !{i32 590081, metadata !0, metadata !"sp", metadata !1, i32 7, metadata !10, i32 0} ; [ DW_TAG_arg_variable ] > +!10 = metadata !{i32 589839, metadata !2, metadata !"", null, i32 0, i64 64, i64 64, i64 0, i32 0, metadata !11} ; [ DW_TAG_pointer_type ] > +!11 = metadata !{i32 589846, metadata !2, metadata !"S1", metadata !1, i32 4, i64 0, i64 0, i64 0, i32 0, metadata !12} ; [ DW_TAG_typedef ] > +!12 = metadata !{i32 589843, metadata !2, metadata !"S1", metadata !1, i32 1, i64 128, i64 64, i32 0, i32 0, i32 0, metadata !13, i32 0, i32 0} ; [ DW_TAG_structure_type ] > +!13 = metadata !{metadata !14, metadata !17} > +!14 = metadata !{i32 589837, metadata !1, metadata !"m", metadata !1, i32 2, i64 64, i64 64, i64 0, i32 0, metadata !15} ; [ DW_TAG_member ] > +!15 = metadata !{i32 589839, metadata !2, metadata !"", null, i32 0, i64 64, i64 64, i64 0, i32 0, metadata !16} ; [ DW_TAG_pointer_type ] > +!16 = metadata !{i32 589860, metadata !2, metadata !"float", null, i32 0, i64 32, i64 32, i64 0, i32 0, i32 4} ; [ DW_TAG_base_type ] > +!17 = metadata !{i32 589837, metadata !1, metadata !"nums", metadata !1, i32 3, i64 32, i64 32, i64 64, i32 0, metadata !5} ; [ DW_TAG_member ] > +!18 = metadata !{i32 590081, metadata !0, metadata !"nums", metadata !1, i32 7, metadata !5, i32 0} ; [ DW_TAG_arg_variable ] > +!19 = metadata !{i32 589876, i32 0, metadata !2, metadata !"p", metadata !"p", metadata !"", metadata !1, i32 14, metadata !11, i32 0, i32 1, %struct.S1* @p} ; [ DW_TAG_variable ] > +!20 = metadata !{i32 7, i32 13, metadata !0, null} > +!21 = metadata !{i32 7, i32 21, metadata !0, null} > +!22 = metadata !{i32 9, i32 3, metadata !23, null} > +!23 = metadata !{i32 589835, metadata !0, i32 8, i32 1, metadata !1, i32 0} ; [ DW_TAG_lexical_block ] > +!24 = metadata !{metadata !"int", metadata !25} > +!25 = metadata !{metadata !"omnipotent char", metadata !26} > +!26 = metadata !{metadata !"Simple C/C++ TBAA", null} > +!27 = metadata !{i32 10, i32 3, metadata !23, null} > +!28 = metadata !{metadata !"any pointer", metadata !25} > +!29 = metadata !{i32 11, i32 3, metadata !23, null} > +!30 = metadata !{%struct.S1* @p} > +!31 = metadata !{i32 7, i32 13, metadata !0, metadata !32} > +!32 = metadata !{i32 16, i32 3, metadata !33, null} > +!33 = metadata !{i32 589835, metadata !6, i32 15, i32 15, metadata !1, i32 1} ; [ DW_TAG_lexical_block ] > +!34 = metadata !{i32 1} > +!35 = metadata !{i32 7, i32 21, metadata !0, metadata !32} > +!36 = metadata !{i32 9, i32 3, metadata !23, metadata !32} > +!37 = metadata !{i32 10, i32 3, metadata !23, metadata !32} > +!38 = metadata !{i32 17, i32 1, metadata !33, null} > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From geek4civic at gmail.com Thu Feb 17 23:02:45 2011 From: geek4civic at gmail.com (NAKAMURA Takumi) Date: Fri, 18 Feb 2011 14:02:45 +0900 Subject: [llvm-commits] [Review request][Win64] Use pushq/popq GPRs in function prologue/epilogue In-Reply-To: References: Message-ID: Ping. It would also resolve potential issue if other x86-64 targets had a new calling conversions to preserve XMMs. ...Takumi On Mon, Feb 7, 2011 at 8:49 PM, NAKAMURA Takumi wrote: > Anton, > > I attached an updated patch, refined and comments added, thank you. > It is at; https://github.com/chapuni/LLVM/commit/8da7419f8170e5a11063eb8e992ecb1ad40f9f6a > > > On the github, Anton wrote; >> View Commit: https://github.com/chapuni/LLVM/commit/d719f1b1ba5f01823e00904c1599adf356089a1d > >> This will pessimize non-win64 targets. Basically, the problem is that you cannot use pushq/popq for high xmm regs, which are callee-saved on win64-only (but not on linux / darwin, for example). > > I thought the patch does not affect to non-win64 targets, but it might > be dubious to check whether regs are GPR or not. > I rewrote checking expressions. > > I am sorry if I missed your point. > >> Another problem is function prologue emission. Have you verified that you always have proper stack frame? Even in case when high xmm regs (xmm5, etc.) are spilled? > > As far as spiller emits in order [pushq GPRs...] and [mov xmm to fp], > and restorer emits in order [mov xmm from fp] and [popq GPRs], > emitPrologue() and emitEpilogue() will emit adjusting %rsp onto proper place. > And I can expect spiller can place XMMs i128 aligned. > > ; for example > define void @foo() nounwind { > entry: > ?tail call void (...)* @bar() nounwind > ?tail call void asm sideeffect "nop", > "~{si},~{di},~{xmm13},~{xmm11},~{xmm15},~{dirflag},~{fpsr},~{flags}"() > nounwind > ?ret void > } > declare void @bar(...) > > #### -mtriple=x86_64-mingw32 > foo: > ? ? ? ?pushq ? %rsi > ? ? ? ?pushq ? %rdi > ? ? ? ?subq ? ?$88, %rsp > ? ? ? ?movaps ?%xmm15, 32(%rsp) ? ? ? ?# 16-byte Spill > ? ? ? ?movaps ?%xmm13, 48(%rsp) ? ? ? ?# 16-byte Spill > ? ? ? ?movaps ?%xmm11, 64(%rsp) ? ? ? ?# 16-byte Spill > ? ? ? ?callq ? bar > ? ? ? ?#APP > ? ? ? ?nop > ? ? ? ?#NO_APP > ? ? ? ?movaps ?64(%rsp), %xmm11 ? ? ? ?# 16-byte Reload > ? ? ? ?movaps ?48(%rsp), %xmm13 ? ? ? ?# 16-byte Reload > ? ? ? ?movaps ?32(%rsp), %xmm15 ? ? ? ?# 16-byte Reload > ? ? ? ?addq ? ?$88, %rsp > ? ? ? ?popq ? ?%rdi > ? ? ? ?popq ? ?%rsi > ? ? ? ?ret > > And also, I have checked to build clang by 3 stage. > (x64-clang can build and test clang and llvm) > > > ...Takumi > From geek4civic at gmail.com Thu Feb 17 23:07:38 2011 From: geek4civic at gmail.com (NAKAMURA Takumi) Date: Fri, 18 Feb 2011 14:07:38 +0900 Subject: [llvm-commits] [PATCH] fix complation on mingw32 In-Reply-To: <4CFCCAA7.1030808@netfarm.it> References: <4CFCCAA7.1030808@netfarm.it> Message-ID: Good afternoon Gianluigi, On Mon, Dec 6, 2010 at 8:36 PM, Gianluigi Tiesi wrote: > ::write() needs inclusion of io.h either on msvc and mingw > so the correct ifdef is _WIN32 It would also be possible, though, I guess shall supply write() on mingw. ...Takumi From sabre at nondot.org Thu Feb 17 23:05:01 2011 From: sabre at nondot.org (Chris Lattner) Date: Fri, 18 Feb 2011 05:05:01 -0000 Subject: [llvm-commits] [llvm] r125831 - /llvm/trunk/test/Transforms/LoopUnroll/basic.ll Message-ID: <20110218050501.964862A6C12C@llvm.org> Author: lattner Date: Thu Feb 17 23:05:01 2011 New Revision: 125831 URL: http://llvm.org/viewvc/llvm-project?rev=125831&view=rev Log: add a testcase for r125827 Added: llvm/trunk/test/Transforms/LoopUnroll/basic.ll Added: llvm/trunk/test/Transforms/LoopUnroll/basic.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopUnroll/basic.ll?rev=125831&view=auto ============================================================================== --- llvm/trunk/test/Transforms/LoopUnroll/basic.ll (added) +++ llvm/trunk/test/Transforms/LoopUnroll/basic.ll Thu Feb 17 23:05:01 2011 @@ -0,0 +1,24 @@ +; RUN: opt < %s -loop-unroll -S | FileCheck %s + + +; This should not unroll since the address of the loop header is taken. + +; CHECK: @test1 +; CHECK: store i8* blockaddress(@test1, %l1), i8** %P +; CHECK: l1: +; CHECK-NEXT: phi i32 +; rdar://8287027 +define i32 @test1(i8** %P) nounwind ssp { +entry: + store i8* blockaddress(@test1, %l1), i8** %P + br label %l1 + +l1: ; preds = %l1, %entry + %x.0 = phi i32 [ 0, %entry ], [ %inc, %l1 ] + %inc = add nsw i32 %x.0, 1 + %exitcond = icmp eq i32 %inc, 3 + br i1 %exitcond, label %l2, label %l1 + +l2: ; preds = %l1 + ret i32 0 +} From sabre at nondot.org Thu Feb 17 23:35:49 2011 From: sabre at nondot.org (Chris Lattner) Date: Fri, 18 Feb 2011 05:35:49 -0000 Subject: [llvm-commits] [llvm] r125832 - /llvm/trunk/lib/Target/X86/README.txt Message-ID: <20110218053549.7F2852A6C12C@llvm.org> Author: lattner Date: Thu Feb 17 23:35:49 2011 New Revision: 125832 URL: http://llvm.org/viewvc/llvm-project?rev=125832&view=rev Log: add a poor division by constant case. Modified: llvm/trunk/lib/Target/X86/README.txt Modified: llvm/trunk/lib/Target/X86/README.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/README.txt?rev=125832&r1=125831&r2=125832&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/README.txt (original) +++ llvm/trunk/lib/Target/X86/README.txt Thu Feb 17 23:35:49 2011 @@ -1884,3 +1884,40 @@ ret //===---------------------------------------------------------------------===// + +This: +char t(char c) { + return c/3; +} + +Compiles to: $clang t.c -S -o - -O3 -mkernel -fomit-frame-pointer + +_t: ## @t + movslq %edi, %rax + imulq $-1431655765, %rax, %rcx ## imm = 0xFFFFFFFFAAAAAAAB + shrq $32, %rcx + addl %ecx, %eax + movl %eax, %ecx + shrl $31, %ecx + shrl %eax + addl %ecx, %eax + movsbl %al, %eax + ret + +GCC gets: + +_t: + movl $86, %eax + imulb %dil + shrw $8, %ax + sarb $7, %dil + subb %dil, %al + movsbl %al,%eax + ret + +which is nicer. This also happens for int, not just char. + +//===---------------------------------------------------------------------===// + + + From zwarich at apple.com Fri Feb 18 00:05:49 2011 From: zwarich at apple.com (Cameron Zwarich) Date: Thu, 17 Feb 2011 22:05:49 -0800 Subject: [llvm-commits] [llvm] r125794 - in /llvm/trunk: include/llvm/CodeGen/SelectionDAG.h lib/CodeGen/SelectionDAG/LegalizeDAG.cpp lib/CodeGen/SelectionDAG/SDNodeDbgValue.h lib/CodeGen/SelectionDAG/SelectionDAG.cpp lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp test/CodeGen/X86/dbg-value-inlined-parameter.ll In-Reply-To: <38F35C11-B253-4EBC-9A91-4B912F5FED02@apple.com> References: <20110217233327.D53A82A6C12C@llvm.org> <38F35C11-B253-4EBC-9A91-4B912F5FED02@apple.com> Message-ID: The build has made it further, so it looks like this was the problem. Cameron On Feb 17, 2011, at 9:02 PM, Cameron Zwarich wrote: > I'm going to roll this out to help diagnose the failure on the llvm-gcc-i386-linux-selfhost bot. It is the only significant change in the blamed revision range. Sorry about that! > > Cameron > > On Feb 17, 2011, at 3:33 PM, Devang Patel wrote: > >> Author: dpatel >> Date: Thu Feb 17 17:33:27 2011 >> New Revision: 125794 >> >> URL: http://llvm.org/viewvc/llvm-project?rev=125794&view=rev >> Log: >> Do not lose debug info of an inlined function argument even if the argument is only used through GEPs. >> >> Added: >> llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll >> Modified: >> llvm/trunk/include/llvm/CodeGen/SelectionDAG.h >> llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp >> llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h >> llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp >> llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp >> >> Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAG.h >> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAG.h?rev=125794&r1=125793&r2=125794&view=diff >> ============================================================================== >> --- llvm/trunk/include/llvm/CodeGen/SelectionDAG.h (original) >> +++ llvm/trunk/include/llvm/CodeGen/SelectionDAG.h Thu Feb 17 17:33:27 2011 >> @@ -100,10 +100,6 @@ >> return DbgValMap[Node]; >> } >> >> - void removeSDDbgValues(const SDNode *Node) { >> - DbgValMap.erase(Node); >> - } >> - >> typedef SmallVector::iterator DbgIterator; >> DbgIterator DbgBegin() { return DbgValues.begin(); } >> DbgIterator DbgEnd() { return DbgValues.end(); } >> >> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp >> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp?rev=125794&r1=125793&r2=125794&view=diff >> ============================================================================== >> --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp (original) >> +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Thu Feb 17 17:33:27 2011 >> @@ -87,6 +87,9 @@ >> // If someone requests legalization of the new node, return itself. >> if (From != To) >> LegalizedNodes.insert(std::make_pair(To, To)); >> + >> + // Transfer SDDbgValues. >> + DAG.TransferDbgValues(From, To); >> } >> >> public: >> >> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h >> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h?rev=125794&r1=125793&r2=125794&view=diff >> ============================================================================== >> --- llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h (original) >> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h Thu Feb 17 17:33:27 2011 >> @@ -83,14 +83,6 @@ >> // Returns the SDNode* for a register ref >> SDNode *getSDNode() { assert (kind==SDNODE); return u.s.Node; } >> >> - // setSDNode - If underlying SDNode is replaced by another node then >> - // SelectionDAG can use this to transfer DbgValue. >> - void setSDNode(SDNode *N, unsigned R) { >> - assert (kind==SDNODE); >> - u.s.Node = N; >> - u.s.ResNo = R; >> - } >> - >> // Returns the ResNo for a register ref >> unsigned getResNo() { assert (kind==SDNODE); return u.s.ResNo; } >> >> >> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp >> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=125794&r1=125793&r2=125794&view=diff >> ============================================================================== >> --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original) >> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Thu Feb 17 17:33:27 2011 >> @@ -5508,12 +5508,14 @@ >> SDNode *FromNode = From.getNode(); >> SDNode *ToNode = To.getNode(); >> SmallVector &DVs = GetDbgValues(FromNode); >> - DbgInfo->removeSDDbgValues(FromNode); >> for (SmallVector::iterator I = DVs.begin(), E = DVs.end(); >> I != E; ++I) { >> - if ((*I)->getKind() == SDDbgValue::SDNODE) { >> - AddDbgValue(*I, ToNode, false); >> - (*I)->setSDNode(ToNode, To.getResNo()); >> + SDDbgValue *Dbg = *I; >> + if (Dbg->getKind() == SDDbgValue::SDNODE) { >> + SDDbgValue *Clone = getDbgValue(Dbg->getMDPtr(), ToNode, To.getResNo(), >> + Dbg->getOffset(), Dbg->getDebugLoc(), >> + Dbg->getOrder()); >> + AddDbgValue(Clone, ToNode, false); >> } >> } >> } >> >> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp >> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp?rev=125794&r1=125793&r2=125794&view=diff >> ============================================================================== >> --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp (original) >> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Thu Feb 17 17:33:27 2011 >> @@ -4287,7 +4287,7 @@ >> N.getResNo(), Offset, dl, SDNodeOrder); >> DAG.AddDbgValue(SDV, N.getNode(), false); >> } >> - } else if (isa(V) && !V->use_empty() ) { >> + } else if (!V->use_empty() ) { >> // Do not call getValue(V) yet, as we don't want to generate code. >> // Remember it for later. >> DanglingDebugInfo DDI(&DI, dl, SDNodeOrder); >> >> Added: llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll >> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll?rev=125794&view=auto >> ============================================================================== >> --- llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll (added) >> +++ llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll Thu Feb 17 17:33:27 2011 >> @@ -0,0 +1,86 @@ >> +; RUN: llc -mtriple=x86_64-apple-darwin < %s | FileCheck %s >> + >> +;CHECK: DW_TAG_inlined_subroutine >> +;CHECK-NEXT: DW_AT_abstract_origin >> +;CHECK-NEXT: DW_AT_low_pc >> +;CHECK-NEXT: DW_AT_high_pc >> +;CHECK-NEXT: DW_AT_call_file >> +;CHECK-NEXT: DW_AT_call_line >> +;CHECK-NEXT: DW_TAG_formal_parameter >> +;CHECK-NEXT: .ascii "sp" ## DW_AT_name >> + >> +%struct.S1 = type { float*, i32 } >> + >> + at p = common global %struct.S1 zeroinitializer, align 8 >> + >> +define i32 @foo(%struct.S1* nocapture %sp, i32 %nums) nounwind optsize ssp { >> +entry: >> + tail call void @llvm.dbg.value(metadata !{%struct.S1* %sp}, i64 0, metadata !9), !dbg !20 >> + tail call void @llvm.dbg.value(metadata !{i32 %nums}, i64 0, metadata !18), !dbg !21 >> + %tmp2 = getelementptr inbounds %struct.S1* %sp, i64 0, i32 1, !dbg !22 >> + store i32 %nums, i32* %tmp2, align 4, !dbg !22, !tbaa !24 >> + %call = tail call float* @bar(i32 %nums) nounwind optsize, !dbg !27 >> + %tmp5 = getelementptr inbounds %struct.S1* %sp, i64 0, i32 0, !dbg !27 >> + store float* %call, float** %tmp5, align 8, !dbg !27, !tbaa !28 >> + %cmp = icmp ne float* %call, null, !dbg !29 >> + %cond = zext i1 %cmp to i32, !dbg !29 >> + ret i32 %cond, !dbg !29 >> +} >> + >> +declare float* @bar(i32) optsize >> + >> +define void @foobar() nounwind optsize ssp { >> +entry: >> + tail call void @llvm.dbg.value(metadata !30, i64 0, metadata !9) nounwind, !dbg !31 >> + tail call void @llvm.dbg.value(metadata !34, i64 0, metadata !18) nounwind, !dbg !35 >> + store i32 1, i32* getelementptr inbounds (%struct.S1* @p, i64 0, i32 1), align 8, !dbg !36, !tbaa !24 >> + %call.i = tail call float* @bar(i32 1) nounwind optsize, !dbg !37 >> + store float* %call.i, float** getelementptr inbounds (%struct.S1* @p, i64 0, i32 0), align 8, !dbg !37, !tbaa !28 >> + ret void, !dbg !38 >> +} >> + >> +declare void @llvm.dbg.value(metadata, i64, metadata) nounwind readnone >> + >> +!llvm.dbg.sp = !{!0, !6} >> +!llvm.dbg.lv.foo = !{!9, !18} >> +!llvm.dbg.gv = !{!19} >> + >> +!0 = metadata !{i32 589870, i32 0, metadata !1, metadata !"foo", metadata !"foo", metadata !"", metadata !1, i32 8, metadata !3, i1 false, i1 true, i32 0, i32 0, i32 0, i32 256, i1 true, i32 (%struct.S1*, i32)* @foo} ; [ DW_TAG_subprogram ] >> +!1 = metadata !{i32 589865, metadata !"nm2.c", metadata !"/private/tmp", metadata !2} ; [ DW_TAG_file_type ] >> +!2 = metadata !{i32 589841, i32 0, i32 12, metadata !"nm2.c", metadata !"/private/tmp", metadata !"clang version 2.9 (trunk 125693)", i1 true, i1 true, metadata !"", i32 0} ; [ DW_TAG_compile_unit ] >> +!3 = metadata !{i32 589845, metadata !1, metadata !"", metadata !1, i32 0, i64 0, i64 0, i32 0, i32 0, i32 0, metadata !4, i32 0, i32 0} ; [ DW_TAG_subroutine_type ] >> +!4 = metadata !{metadata !5} >> +!5 = metadata !{i32 589860, metadata !2, metadata !"int", null, i32 0, i64 32, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] >> +!6 = metadata !{i32 589870, i32 0, metadata !1, metadata !"foobar", metadata !"foobar", metadata !"", metadata !1, i32 15, metadata !7, i1 false, i1 true, i32 0, i32 0, i32 0, i32 0, i1 true, void ()* @foobar} ; [ DW_TAG_subprogram ] >> +!7 = metadata !{i32 589845, metadata !1, metadata !"", metadata !1, i32 0, i64 0, i64 0, i32 0, i32 0, i32 0, metadata !8, i32 0, i32 0} ; [ DW_TAG_subroutine_type ] >> +!8 = metadata !{null} >> +!9 = metadata !{i32 590081, metadata !0, metadata !"sp", metadata !1, i32 7, metadata !10, i32 0} ; [ DW_TAG_arg_variable ] >> +!10 = metadata !{i32 589839, metadata !2, metadata !"", null, i32 0, i64 64, i64 64, i64 0, i32 0, metadata !11} ; [ DW_TAG_pointer_type ] >> +!11 = metadata !{i32 589846, metadata !2, metadata !"S1", metadata !1, i32 4, i64 0, i64 0, i64 0, i32 0, metadata !12} ; [ DW_TAG_typedef ] >> +!12 = metadata !{i32 589843, metadata !2, metadata !"S1", metadata !1, i32 1, i64 128, i64 64, i32 0, i32 0, i32 0, metadata !13, i32 0, i32 0} ; [ DW_TAG_structure_type ] >> +!13 = metadata !{metadata !14, metadata !17} >> +!14 = metadata !{i32 589837, metadata !1, metadata !"m", metadata !1, i32 2, i64 64, i64 64, i64 0, i32 0, metadata !15} ; [ DW_TAG_member ] >> +!15 = metadata !{i32 589839, metadata !2, metadata !"", null, i32 0, i64 64, i64 64, i64 0, i32 0, metadata !16} ; [ DW_TAG_pointer_type ] >> +!16 = metadata !{i32 589860, metadata !2, metadata !"float", null, i32 0, i64 32, i64 32, i64 0, i32 0, i32 4} ; [ DW_TAG_base_type ] >> +!17 = metadata !{i32 589837, metadata !1, metadata !"nums", metadata !1, i32 3, i64 32, i64 32, i64 64, i32 0, metadata !5} ; [ DW_TAG_member ] >> +!18 = metadata !{i32 590081, metadata !0, metadata !"nums", metadata !1, i32 7, metadata !5, i32 0} ; [ DW_TAG_arg_variable ] >> +!19 = metadata !{i32 589876, i32 0, metadata !2, metadata !"p", metadata !"p", metadata !"", metadata !1, i32 14, metadata !11, i32 0, i32 1, %struct.S1* @p} ; [ DW_TAG_variable ] >> +!20 = metadata !{i32 7, i32 13, metadata !0, null} >> +!21 = metadata !{i32 7, i32 21, metadata !0, null} >> +!22 = metadata !{i32 9, i32 3, metadata !23, null} >> +!23 = metadata !{i32 589835, metadata !0, i32 8, i32 1, metadata !1, i32 0} ; [ DW_TAG_lexical_block ] >> +!24 = metadata !{metadata !"int", metadata !25} >> +!25 = metadata !{metadata !"omnipotent char", metadata !26} >> +!26 = metadata !{metadata !"Simple C/C++ TBAA", null} >> +!27 = metadata !{i32 10, i32 3, metadata !23, null} >> +!28 = metadata !{metadata !"any pointer", metadata !25} >> +!29 = metadata !{i32 11, i32 3, metadata !23, null} >> +!30 = metadata !{%struct.S1* @p} >> +!31 = metadata !{i32 7, i32 13, metadata !0, metadata !32} >> +!32 = metadata !{i32 16, i32 3, metadata !33, null} >> +!33 = metadata !{i32 589835, metadata !6, i32 15, i32 15, metadata !1, i32 1} ; [ DW_TAG_lexical_block ] >> +!34 = metadata !{i32 1} >> +!35 = metadata !{i32 7, i32 21, metadata !0, metadata !32} >> +!36 = metadata !{i32 9, i32 3, metadata !23, metadata !32} >> +!37 = metadata !{i32 10, i32 3, metadata !23, metadata !32} >> +!38 = metadata !{i32 17, i32 1, metadata !33, null} >> >> >> _______________________________________________ >> llvm-commits mailing list >> llvm-commits at cs.uiuc.edu >> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From clattner at apple.com Fri Feb 18 00:13:56 2011 From: clattner at apple.com (Chris Lattner) Date: Thu, 17 Feb 2011 22:13:56 -0800 Subject: [llvm-commits] [llvm] r115927 - in /llvm/trunk: include/llvm-c/Core.h include/llvm/InitializePasses.h lib/Transforms/Scalar/Scalar.cpp lib/Transforms/Utils/CMakeLists.txt lib/Transforms/Utils/Utils.cpp lib/VMCore/Core.cpp In-Reply-To: <85674857-3E92-4CE6-A3AE-5AD1EE9B4340@mac.com> References: <20101007175547.E941F2A6C12E@llvm.org> <9638033B-44C4-4936-A2C8-A88090FCD719@apple.com> <77D9A52D-0465-4752-A69C-1A7E030D1083@mac.com> <8ABF54E8-A00D-4046-BAEB-99C22BB8849A@apple.com> <85674857-3E92-4CE6-A3AE-5AD1EE9B4340@mac.com> Message-ID: On Feb 17, 2011, at 8:21 PM, Owen Anderson wrote: >>> >>> 1) clang and similar clients, which know upfront which set of passes they care about. Their passes are explicitly initialized when they call createFooPass(). Since they never call the global initializeScalarOpts(), they don't link in Scalar.cpp, instead only linking in those passes for which they call createFooPass(). >>> >>> 2) opt and kin, which need to link/initialize all passes available, so that they can be available from the command line. These clients do call initializeScalarOpts(), thus forcing linkage of all the passes as desired. >> >> Ok, how about following the existing pattern of putting this in a header file instead of a .cpp file? With this header, is "LinkAllPasses" needed? Can we remove LinkAllPasses and just use "InitializeAllPasses" instead? > > We can do that, if you want, but we'll still want to have separate headers for LinkAllPasses() vs. LinkAllCodeGen(), etc., so that opt doesn't have to link in all of CodeGen, and vice-versa for llc. Sure, I'm just looking to *reduce* the number of places that have to be touched to add a new pass. -Chris -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110217/dca729d4/attachment.html From geek4civic at gmail.com Fri Feb 18 00:47:22 2011 From: geek4civic at gmail.com (NAKAMURA Takumi) Date: Fri, 18 Feb 2011 15:47:22 +0900 Subject: [llvm-commits] Fix LLVM tools filename extensions in regress tests for Windows In-Reply-To: <6AE1604EE3EC5F4296C096518C6B77EE17DD290816@mail.accesssoftek.com> References: <6AE1604EE3EC5F4296C096518C6B77EE17DD290816@mail.accesssoftek.com> Message-ID: Danil, Thank you, it works for me. Checked on msys and vs8. Daniel, may I commit this? Or please give us any comments, thank you. ...Takumi From geek4civic at gmail.com Fri Feb 18 01:06:58 2011 From: geek4civic at gmail.com (NAKAMURA Takumi) Date: Fri, 18 Feb 2011 16:06:58 +0900 Subject: [llvm-commits] [Review Request] Target/X86: Tweak va_arg for Win64 not to miss taking va_start when number of fixed args > 4. Message-ID: --- lib/Target/X86/X86ISelLowering.cpp | 8 +++++--- test/CodeGen/X86/win64_vararg.ll | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) --- It just works for me, though, I am not confident of its way. Let me know whoever would know better way, thank you. ...Takumi -------------- next part -------------- A non-text attachment was scrubbed... Name: 0002-Target-X86-Tweak-va_arg-for-Win64-not-to-miss-ta.patch.txt Type: text/x-patch Size: 2565 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110218/120d261a/attachment-0001.bin From geek4civic at gmail.com Fri Feb 18 01:07:00 2011 From: geek4civic at gmail.com (NAKAMURA Takumi) Date: Fri, 18 Feb 2011 16:07:00 +0900 Subject: [llvm-commits] [Review Request] Target/X86: Tweak va_arg for Win64 not to miss taking va_start when number of fixed args > 4. Message-ID: --- lib/Target/X86/X86ISelLowering.cpp | 8 +++++--- test/CodeGen/X86/win64_vararg.ll | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) --- It just works for me, though, I am not confident of its way. Let me know whoever would know better way, thank you. ...Takumi -------------- next part -------------- A non-text attachment was scrubbed... Name: 0002-Target-X86-Tweak-va_arg-for-Win64-not-to-miss-ta.patch.txt Type: text/x-patch Size: 2565 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110218/824694a1/attachment.bin From wilsons at start.ca Fri Feb 18 01:28:17 2011 From: wilsons at start.ca (Stephen Wilson) Date: Fri, 18 Feb 2011 02:28:17 -0500 Subject: [llvm-commits] [PATCH] Support building LLDB. Message-ID: This patch lets LLDB build as an LLVM subproject. LLDB is not built in parallel with the rest of the tools directory as it depends on Clang. Index: tools/Makefile =================================================================== --- tools/Makefile (revision 125832) +++ tools/Makefile (working copy) @@ -12,6 +12,10 @@ # Build clang if present. OPTIONAL_PARALLEL_DIRS := clang +# Build LLDB if present. Note LLDB must be built last as it depends on the +# wider LLVM infrastructure (including Clang). +OPTIONAL_DIRS := lldb + # NOTE: The tools are organized into five groups of four consisting of one # large and three small executables. This is done to minimize memory load # in parallel builds. Please retain this ordering. @@ -26,7 +30,8 @@ # Let users override the set of tools to build from the command line. ifdef ONLY_TOOLS OPTIONAL_PARALLEL_DIRS := - PARALLEL_DIRS := $(ONLY_TOOLS) + OPTIONAL_DIRS := $(findstring lldb,$(ONLY_TOOLS)) + PARALLEL_DIRS := $(filter-out lldb,$(ONLY_TOOLS)) endif include $(LEVEL)/Makefile.config From geek4civic at gmail.com Fri Feb 18 01:30:53 2011 From: geek4civic at gmail.com (NAKAMURA Takumi) Date: Fri, 18 Feb 2011 16:30:53 +0900 Subject: [llvm-commits] [Review Request] Target/X86: Tweak alloca and add a testcase for mingw64 and msvcrt on Win64. [PR8778] Message-ID: --- lib/Target/X86/X86FrameLowering.cpp | 19 +++++++-- lib/Target/X86/X86ISelLowering.cpp | 57 +++++++++++++++++++-------- lib/Target/X86/X86InstrControl.td | 10 +++++ test/CodeGen/X86/win64_alloca_dynalloca.ll | 55 +++++++++++++++++++++++++++ test/CodeGen/X86/win_chkstk.ll | 2 +- 5 files changed, 120 insertions(+), 23 deletions(-) create mode 100644 test/CodeGen/X86/win64_alloca_dynalloca.ll -- It introduces W64ALLOCA. I would attempt to rework, if there is a way to avoid W64ALLOCA. It is incompatible to TDM-GCC. ...Takumi -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-Target-X86-Tweak-alloca-and-add-a-testcase-for-m.patch.txt Type: text/x-patch Size: 9150 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110218/8bb9d685/attachment.bin From geek4civic at gmail.com Fri Feb 18 01:46:00 2011 From: geek4civic at gmail.com (NAKAMURA Takumi) Date: Fri, 18 Feb 2011 16:46:00 +0900 Subject: [llvm-commits] [Review Request] lib/Target/X86/X86FastISel.cpp: [PR6275] Fix for Win32's dllimport function. Message-ID: Function must not be GlobalVariable. FIXME: Are latter conditions needed to check? --- lib/Target/X86/X86FastISel.cpp | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) --- I am dubious in one point; // Can't handle TLS or DLLImport. // FIXME: Are they needed? if (const GlobalVariable *GVar = dyn_cast(GV)) if (GVar->isThreadLocal() || GVar->hasDLLImportLinkage()) return false; Let me know if this clause could be eliminated, thank you. ...Takumi -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-lib-Target-X86-X86FastISel.cpp-PR6275-Fix-for-Wi.patch.txt Type: text/x-patch Size: 685 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110218/afea6dda/attachment.bin From baldrick at free.fr Fri Feb 18 02:07:00 2011 From: baldrick at free.fr (Duncan Sands) Date: Fri, 18 Feb 2011 09:07:00 +0100 Subject: [llvm-commits] [llvm] r125794 - in /llvm/trunk: include/llvm/CodeGen/SelectionDAG.h lib/CodeGen/SelectionDAG/LegalizeDAG.cpp lib/CodeGen/SelectionDAG/SDNodeDbgValue.h lib/CodeGen/SelectionDAG/SelectionDAG.cpp lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp test/CodeGen/X86/dbg-value-inlined-parameter.ll In-Reply-To: <38F35C11-B253-4EBC-9A91-4B912F5FED02@apple.com> References: <20110217233327.D53A82A6C12C@llvm.org> <38F35C11-B253-4EBC-9A91-4B912F5FED02@apple.com> Message-ID: <4D5E28A4.3000701@free.fr> > I'm going to roll this out to help diagnose the failure on the llvm-gcc-i386-linux-selfhost bot. It is the only significant change in the blamed revision range. Sorry about that! Thanks Cameron - hopefully this will fix the i386 dragonegg buildbot which also blew up. Ciao, Duncan. > > Cameron > > On Feb 17, 2011, at 3:33 PM, Devang Patel wrote: > >> Author: dpatel >> Date: Thu Feb 17 17:33:27 2011 >> New Revision: 125794 >> >> URL: http://llvm.org/viewvc/llvm-project?rev=125794&view=rev >> Log: >> Do not lose debug info of an inlined function argument even if the argument is only used through GEPs. >> >> Added: >> llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll >> Modified: >> llvm/trunk/include/llvm/CodeGen/SelectionDAG.h >> llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp >> llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h >> llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp >> llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp >> >> Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAG.h >> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAG.h?rev=125794&r1=125793&r2=125794&view=diff >> ============================================================================== >> --- llvm/trunk/include/llvm/CodeGen/SelectionDAG.h (original) >> +++ llvm/trunk/include/llvm/CodeGen/SelectionDAG.h Thu Feb 17 17:33:27 2011 >> @@ -100,10 +100,6 @@ >> return DbgValMap[Node]; >> } >> >> - void removeSDDbgValues(const SDNode *Node) { >> - DbgValMap.erase(Node); >> - } >> - >> typedef SmallVector::iterator DbgIterator; >> DbgIterator DbgBegin() { return DbgValues.begin(); } >> DbgIterator DbgEnd() { return DbgValues.end(); } >> >> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp >> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp?rev=125794&r1=125793&r2=125794&view=diff >> ============================================================================== >> --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp (original) >> +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Thu Feb 17 17:33:27 2011 >> @@ -87,6 +87,9 @@ >> // If someone requests legalization of the new node, return itself. >> if (From != To) >> LegalizedNodes.insert(std::make_pair(To, To)); >> + >> + // Transfer SDDbgValues. >> + DAG.TransferDbgValues(From, To); >> } >> >> public: >> >> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h >> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h?rev=125794&r1=125793&r2=125794&view=diff >> ============================================================================== >> --- llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h (original) >> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h Thu Feb 17 17:33:27 2011 >> @@ -83,14 +83,6 @@ >> // Returns the SDNode* for a register ref >> SDNode *getSDNode() { assert (kind==SDNODE); return u.s.Node; } >> >> - // setSDNode - If underlying SDNode is replaced by another node then >> - // SelectionDAG can use this to transfer DbgValue. >> - void setSDNode(SDNode *N, unsigned R) { >> - assert (kind==SDNODE); >> - u.s.Node = N; >> - u.s.ResNo = R; >> - } >> - >> // Returns the ResNo for a register ref >> unsigned getResNo() { assert (kind==SDNODE); return u.s.ResNo; } >> >> >> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp >> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=125794&r1=125793&r2=125794&view=diff >> ============================================================================== >> --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original) >> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Thu Feb 17 17:33:27 2011 >> @@ -5508,12 +5508,14 @@ >> SDNode *FromNode = From.getNode(); >> SDNode *ToNode = To.getNode(); >> SmallVector &DVs = GetDbgValues(FromNode); >> - DbgInfo->removeSDDbgValues(FromNode); >> for (SmallVector::iterator I = DVs.begin(), E = DVs.end(); >> I != E; ++I) { >> - if ((*I)->getKind() == SDDbgValue::SDNODE) { >> - AddDbgValue(*I, ToNode, false); >> - (*I)->setSDNode(ToNode, To.getResNo()); >> + SDDbgValue *Dbg = *I; >> + if (Dbg->getKind() == SDDbgValue::SDNODE) { >> + SDDbgValue *Clone = getDbgValue(Dbg->getMDPtr(), ToNode, To.getResNo(), >> + Dbg->getOffset(), Dbg->getDebugLoc(), >> + Dbg->getOrder()); >> + AddDbgValue(Clone, ToNode, false); >> } >> } >> } >> >> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp >> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp?rev=125794&r1=125793&r2=125794&view=diff >> ============================================================================== >> --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp (original) >> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Thu Feb 17 17:33:27 2011 >> @@ -4287,7 +4287,7 @@ >> N.getResNo(), Offset, dl, SDNodeOrder); >> DAG.AddDbgValue(SDV, N.getNode(), false); >> } >> - } else if (isa(V)&& !V->use_empty() ) { >> + } else if (!V->use_empty() ) { >> // Do not call getValue(V) yet, as we don't want to generate code. >> // Remember it for later. >> DanglingDebugInfo DDI(&DI, dl, SDNodeOrder); >> >> Added: llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll >> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll?rev=125794&view=auto >> ============================================================================== >> --- llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll (added) >> +++ llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll Thu Feb 17 17:33:27 2011 >> @@ -0,0 +1,86 @@ >> +; RUN: llc -mtriple=x86_64-apple-darwin< %s | FileCheck %s >> + >> +;CHECK: DW_TAG_inlined_subroutine >> +;CHECK-NEXT: DW_AT_abstract_origin >> +;CHECK-NEXT: DW_AT_low_pc >> +;CHECK-NEXT: DW_AT_high_pc >> +;CHECK-NEXT: DW_AT_call_file >> +;CHECK-NEXT: DW_AT_call_line >> +;CHECK-NEXT: DW_TAG_formal_parameter >> +;CHECK-NEXT: .ascii "sp" ## DW_AT_name >> + >> +%struct.S1 = type { float*, i32 } >> + >> + at p = common global %struct.S1 zeroinitializer, align 8 >> + >> +define i32 @foo(%struct.S1* nocapture %sp, i32 %nums) nounwind optsize ssp { >> +entry: >> + tail call void @llvm.dbg.value(metadata !{%struct.S1* %sp}, i64 0, metadata !9), !dbg !20 >> + tail call void @llvm.dbg.value(metadata !{i32 %nums}, i64 0, metadata !18), !dbg !21 >> + %tmp2 = getelementptr inbounds %struct.S1* %sp, i64 0, i32 1, !dbg !22 >> + store i32 %nums, i32* %tmp2, align 4, !dbg !22, !tbaa !24 >> + %call = tail call float* @bar(i32 %nums) nounwind optsize, !dbg !27 >> + %tmp5 = getelementptr inbounds %struct.S1* %sp, i64 0, i32 0, !dbg !27 >> + store float* %call, float** %tmp5, align 8, !dbg !27, !tbaa !28 >> + %cmp = icmp ne float* %call, null, !dbg !29 >> + %cond = zext i1 %cmp to i32, !dbg !29 >> + ret i32 %cond, !dbg !29 >> +} >> + >> +declare float* @bar(i32) optsize >> + >> +define void @foobar() nounwind optsize ssp { >> +entry: >> + tail call void @llvm.dbg.value(metadata !30, i64 0, metadata !9) nounwind, !dbg !31 >> + tail call void @llvm.dbg.value(metadata !34, i64 0, metadata !18) nounwind, !dbg !35 >> + store i32 1, i32* getelementptr inbounds (%struct.S1* @p, i64 0, i32 1), align 8, !dbg !36, !tbaa !24 >> + %call.i = tail call float* @bar(i32 1) nounwind optsize, !dbg !37 >> + store float* %call.i, float** getelementptr inbounds (%struct.S1* @p, i64 0, i32 0), align 8, !dbg !37, !tbaa !28 >> + ret void, !dbg !38 >> +} >> + >> +declare void @llvm.dbg.value(metadata, i64, metadata) nounwind readnone >> + >> +!llvm.dbg.sp = !{!0, !6} >> +!llvm.dbg.lv.foo = !{!9, !18} >> +!llvm.dbg.gv = !{!19} >> + >> +!0 = metadata !{i32 589870, i32 0, metadata !1, metadata !"foo", metadata !"foo", metadata !"", metadata !1, i32 8, metadata !3, i1 false, i1 true, i32 0, i32 0, i32 0, i32 256, i1 true, i32 (%struct.S1*, i32)* @foo} ; [ DW_TAG_subprogram ] >> +!1 = metadata !{i32 589865, metadata !"nm2.c", metadata !"/private/tmp", metadata !2} ; [ DW_TAG_file_type ] >> +!2 = metadata !{i32 589841, i32 0, i32 12, metadata !"nm2.c", metadata !"/private/tmp", metadata !"clang version 2.9 (trunk 125693)", i1 true, i1 true, metadata !"", i32 0} ; [ DW_TAG_compile_unit ] >> +!3 = metadata !{i32 589845, metadata !1, metadata !"", metadata !1, i32 0, i64 0, i64 0, i32 0, i32 0, i32 0, metadata !4, i32 0, i32 0} ; [ DW_TAG_subroutine_type ] >> +!4 = metadata !{metadata !5} >> +!5 = metadata !{i32 589860, metadata !2, metadata !"int", null, i32 0, i64 32, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] >> +!6 = metadata !{i32 589870, i32 0, metadata !1, metadata !"foobar", metadata !"foobar", metadata !"", metadata !1, i32 15, metadata !7, i1 false, i1 true, i32 0, i32 0, i32 0, i32 0, i1 true, void ()* @foobar} ; [ DW_TAG_subprogram ] >> +!7 = metadata !{i32 589845, metadata !1, metadata !"", metadata !1, i32 0, i64 0, i64 0, i32 0, i32 0, i32 0, metadata !8, i32 0, i32 0} ; [ DW_TAG_subroutine_type ] >> +!8 = metadata !{null} >> +!9 = metadata !{i32 590081, metadata !0, metadata !"sp", metadata !1, i32 7, metadata !10, i32 0} ; [ DW_TAG_arg_variable ] >> +!10 = metadata !{i32 589839, metadata !2, metadata !"", null, i32 0, i64 64, i64 64, i64 0, i32 0, metadata !11} ; [ DW_TAG_pointer_type ] >> +!11 = metadata !{i32 589846, metadata !2, metadata !"S1", metadata !1, i32 4, i64 0, i64 0, i64 0, i32 0, metadata !12} ; [ DW_TAG_typedef ] >> +!12 = metadata !{i32 589843, metadata !2, metadata !"S1", metadata !1, i32 1, i64 128, i64 64, i32 0, i32 0, i32 0, metadata !13, i32 0, i32 0} ; [ DW_TAG_structure_type ] >> +!13 = metadata !{metadata !14, metadata !17} >> +!14 = metadata !{i32 589837, metadata !1, metadata !"m", metadata !1, i32 2, i64 64, i64 64, i64 0, i32 0, metadata !15} ; [ DW_TAG_member ] >> +!15 = metadata !{i32 589839, metadata !2, metadata !"", null, i32 0, i64 64, i64 64, i64 0, i32 0, metadata !16} ; [ DW_TAG_pointer_type ] >> +!16 = metadata !{i32 589860, metadata !2, metadata !"float", null, i32 0, i64 32, i64 32, i64 0, i32 0, i32 4} ; [ DW_TAG_base_type ] >> +!17 = metadata !{i32 589837, metadata !1, metadata !"nums", metadata !1, i32 3, i64 32, i64 32, i64 64, i32 0, metadata !5} ; [ DW_TAG_member ] >> +!18 = metadata !{i32 590081, metadata !0, metadata !"nums", metadata !1, i32 7, metadata !5, i32 0} ; [ DW_TAG_arg_variable ] >> +!19 = metadata !{i32 589876, i32 0, metadata !2, metadata !"p", metadata !"p", metadata !"", metadata !1, i32 14, metadata !11, i32 0, i32 1, %struct.S1* @p} ; [ DW_TAG_variable ] >> +!20 = metadata !{i32 7, i32 13, metadata !0, null} >> +!21 = metadata !{i32 7, i32 21, metadata !0, null} >> +!22 = metadata !{i32 9, i32 3, metadata !23, null} >> +!23 = metadata !{i32 589835, metadata !0, i32 8, i32 1, metadata !1, i32 0} ; [ DW_TAG_lexical_block ] >> +!24 = metadata !{metadata !"int", metadata !25} >> +!25 = metadata !{metadata !"omnipotent char", metadata !26} >> +!26 = metadata !{metadata !"Simple C/C++ TBAA", null} >> +!27 = metadata !{i32 10, i32 3, metadata !23, null} >> +!28 = metadata !{metadata !"any pointer", metadata !25} >> +!29 = metadata !{i32 11, i32 3, metadata !23, null} >> +!30 = metadata !{%struct.S1* @p} >> +!31 = metadata !{i32 7, i32 13, metadata !0, metadata !32} >> +!32 = metadata !{i32 16, i32 3, metadata !33, null} >> +!33 = metadata !{i32 589835, metadata !6, i32 15, i32 15, metadata !1, i32 1} ; [ DW_TAG_lexical_block ] >> +!34 = metadata !{i32 1} >> +!35 = metadata !{i32 7, i32 21, metadata !0, metadata !32} >> +!36 = metadata !{i32 9, i32 3, metadata !23, metadata !32} >> +!37 = metadata !{i32 10, i32 3, metadata !23, metadata !32} >> +!38 = metadata !{i32 17, i32 1, metadata !33, null} >> >> >> _______________________________________________ >> llvm-commits mailing list >> llvm-commits at cs.uiuc.edu >> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From pawel.kunio at gmail.com Fri Feb 18 05:51:56 2011 From: pawel.kunio at gmail.com (pawel kunio) Date: Fri, 18 Feb 2011 13:51:56 +0200 Subject: [llvm-commits] my 2nd attempt at now-infamous PR889 In-Reply-To: <221A2263-9E96-45D8-A085-D53C649B1FA3@apple.com> References: <221A2263-9E96-45D8-A085-D53C649B1FA3@apple.com> Message-ID: Hello, Let me state the steps taken, so that we can try to schedule partial patch sending for review: 1 adding missing trivial empty destructors to Value-derived classes for avoiding of calls to compiler-generated destructors. 2 implementing deleter2 which will call specific destructor based on Value-type could be using mock delete ptr implementation in first release to make build not break, to be replaced later with real implementation. 3 replacing calls to delete Value* with calls to deleter2. 4 adding special iplist2 as future replacement of iplist to enforce element destruction by deleter2 instead of operator delete. 5 replacing iplist uses with iplist2. 6 adding realThis to User to retrieve the real allocated pointer from User* (which is kind of fake due to tweaked placement new used for allocating User). 7 changing visibility of destructors to protected to cause the compiler to expose the now-banned destructor calls (responsibility of which will be taken by deleter2 method). 8 making deleter2 friend of Value-derived classes to make detructors visible to deleter2 9 finally due to ld problem which is used with gcc compiler for building llvm on some platforms, PseudoSourceValue had to be moved to lib/VMCore from lib/CodeGen. 10 in lib/CodeGen/pseudosourcevalue.cpp, PSVGlobalsTy had to be modified to create and destroy Values dynamically. Please note that 3,4,5 make up some 60-70% of this patch as well as its hard to separate out clearly 4 from 5. Please state which steps would You see included in separate partial patches to make work easier to be scheduled and managed from Your side. (on a side note review tool like used in google chrome would be great replacement of this process, sigh). Also if possible please refer me to more specific workitems by Doug, so that I can try to reproduce his way of solving similar issue. Best regards, Pawel Kunio On Fri, Feb 18, 2011 at 1:15 AM, Chris Lattner wrote: > > On Feb 16, 2011, at 9:13 PM, pawel kunio wrote: > > > Hello, > > In a meantime of preparing 2 tests for PR9067, I came with my 2nd and > hopefully now more > > successful attempt at now-infamous PR889 devirtualize Value destructor. > > > > Please find patches for llvm and clang attached to this mail. As I can > see from mingw build > > environment, it will need moving PseudoSourceValue.cpp from lib/CodeGen > to lib/VMCore > > after applying patch (seems not to be required on vc build env, as order > of libraries given > > to linker is not meaningful there). > > > > Please note that destructors have been moved into protected part of > interface as well as > > empty destructors were implemented for all Value-derived classes to help > in catching all > > destructions. > > Hi Pawel, > > Thank you for working on this! Unfortunately, this patch is way too > monolithic to review like this though, could you split it out into a series > of obvious changes? Doug recently "devirtualized" the clang decl hierarchy > by devirtualizing one method at a time, which worked really well. > > -Chris > > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110218/d8111b84/attachment.html From geek4civic at gmail.com Fri Feb 18 06:34:38 2011 From: geek4civic at gmail.com (NAKAMURA Takumi) Date: Fri, 18 Feb 2011 21:34:38 +0900 Subject: [llvm-commits] [Review Request] lib/MC/WinCOFFStreamer.cpp: [PR8354] Emit .bss as .bss${foobar} instead of .bss$linkonce_{foobar} and emit local storage without IMAGE_SCN_LNK_COMDAT. Message-ID: --- lib/MC/WinCOFFStreamer.cpp | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) --- I had used the patch in bugs. http://llvm.org/bugs/show_bug.cgi?id=8354#c2 It is improved version. WinCOFFStreamer::AddCommonSymbol() can emit symbols's alignment as section alignment, though, .lcomm's alignment is not emitted for now. Now, each common symbols would be emitted as individual section .bss${foobar}. It might be overkill. :p Checked with 3-stage clang build on Windows x64. ...Takumi -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-lib-MC-WinCOFFStreamer.cpp-PR8354-Emit-.bss-as-..patch.txt Type: text/x-patch Size: 1131 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110218/e9c392e6/attachment.bin From aggarwa4 at illinois.edu Fri Feb 18 09:39:21 2011 From: aggarwa4 at illinois.edu (Arushi Aggarwal) Date: Fri, 18 Feb 2011 15:39:21 -0000 Subject: [llvm-commits] [poolalloc] r125834 - /poolalloc/trunk/lib/AssistDS/MergeGEP.cpp Message-ID: <20110218153921.93A962A6C12C@llvm.org> Author: aggarwa4 Date: Fri Feb 18 09:39:21 2011 New Revision: 125834 URL: http://llvm.org/viewvc/llvm-project?rev=125834&view=rev Log: Merge GEPs with single use, even if they are not struct type. Modified: poolalloc/trunk/lib/AssistDS/MergeGEP.cpp Modified: poolalloc/trunk/lib/AssistDS/MergeGEP.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/MergeGEP.cpp?rev=125834&r1=125833&r2=125834&view=diff ============================================================================== --- poolalloc/trunk/lib/AssistDS/MergeGEP.cpp (original) +++ poolalloc/trunk/lib/AssistDS/MergeGEP.cpp Fri Feb 18 09:39:21 2011 @@ -35,7 +35,7 @@ bool changed = false; bool found; do { - found = false; + found = false; for (Module::iterator F = M.begin(); F != M.end(); ++F){ for (Function::iterator B = F->begin(), FE = F->end(); B != FE; ++B) { for (BasicBlock::iterator I = B->begin(), BE = B->end(); I != BE; I++) { @@ -44,11 +44,6 @@ GetElementPtrInst *GEP = cast(I); if(!isa(GEP->getType()->getElementType())) continue; - for (gep_type_iterator I = gep_type_begin(GEP), E = gep_type_end(GEP); - I != E; ++I) { - if (isa(*I)) { - gep_type_iterator II = I; - if(++II == E){ std::vector worklist; for (Value::use_iterator UI = GEP->use_begin(), UE = GEP->use_end(); UI != UE; ++UI){ @@ -73,9 +68,6 @@ found = true; changed = true; } - } - } - } } } std::vector worklist; @@ -106,8 +98,6 @@ Indices.end(), GEP->getName()+ "mod", GEP); - //GEP->dump(); - //GEPNew->dump(); GEP->replaceAllUsesWith(GEPNew); GEP->eraseFromParent(); changed = true; From benny.kra at googlemail.com Fri Feb 18 10:11:40 2011 From: benny.kra at googlemail.com (Benjamin Kramer) Date: Fri, 18 Feb 2011 16:11:40 -0000 Subject: [llvm-commits] [llvm] r125842 - /llvm/trunk/include/llvm/Intrinsics.td Message-ID: <20110218161140.799772A6C12C@llvm.org> Author: d0k Date: Fri Feb 18 10:11:40 2011 New Revision: 125842 URL: http://llvm.org/viewvc/llvm-project?rev=125842&view=rev Log: The objectsize intrinsic doesn't access any memory. Modified: llvm/trunk/include/llvm/Intrinsics.td Modified: llvm/trunk/include/llvm/Intrinsics.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Intrinsics.td?rev=125842&r1=125841&r2=125842&view=diff ============================================================================== --- llvm/trunk/include/llvm/Intrinsics.td (original) +++ llvm/trunk/include/llvm/Intrinsics.td Fri Feb 18 10:11:40 2011 @@ -259,7 +259,7 @@ // Internal interface for object size checking def int_objectsize : Intrinsic<[llvm_anyint_ty], [llvm_ptr_ty, llvm_i1_ty], - [IntrReadArgMem]>, + [IntrNoMem]>, GCCBuiltin<"__builtin_object_size">; //===-------------------- Bit Manipulation Intrinsics ---------------------===// From baldrick at free.fr Fri Feb 18 10:25:37 2011 From: baldrick at free.fr (Duncan Sands) Date: Fri, 18 Feb 2011 16:25:37 -0000 Subject: [llvm-commits] [llvm] r125843 - in /llvm/trunk: lib/Transforms/InstCombine/InstCombineCompares.cpp test/Transforms/InstCombine/icmp.ll test/Transforms/InstCombine/sub.ll Message-ID: <20110218162537.D56652A6C12C@llvm.org> Author: baldrick Date: Fri Feb 18 10:25:37 2011 New Revision: 125843 URL: http://llvm.org/viewvc/llvm-project?rev=125843&view=rev Log: Add some transforms of the kind X-Y>X -> 0>Y which are valid when there is no overflow. These subsume some existing equality transforms, so zap those. Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp llvm/trunk/test/Transforms/InstCombine/icmp.ll llvm/trunk/test/Transforms/InstCombine/sub.ll Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp?rev=125843&r1=125842&r2=125843&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp (original) +++ llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp Fri Feb 18 10:25:37 2011 @@ -2267,7 +2267,7 @@ return new ICmpInst(Pred, Constant::getNullValue(Op0->getType()), C == Op0 ? D : C); - // icmp (X+Y), (X+Z) -> icmp Y,Z for equalities or if there is no overflow. + // icmp (X+Y), (X+Z) -> icmp Y, Z for equalities or if there is no overflow. if (A && C && (A == C || A == D || B == C || B == D) && NoOp0WrapProblem && NoOp1WrapProblem && // Try not to increase register pressure. @@ -2286,12 +2286,26 @@ if (BO1 && BO1->getOpcode() == Instruction::Sub) C = BO1->getOperand(0), D = BO1->getOperand(1); - // icmp (Y-X), (Z-X) -> icmp Y,Z for equalities or if there is no overflow. + // icmp (X-Y), X -> icmp 0, Y for equalities or if there is no overflow. + if (A == Op1 && NoOp0WrapProblem) + return new ICmpInst(Pred, Constant::getNullValue(Op1->getType()), B); + + // icmp X, (X-Y) -> icmp Y, 0 for equalities or if there is no overflow. + if (C == Op0 && NoOp1WrapProblem) + return new ICmpInst(Pred, D, Constant::getNullValue(Op0->getType())); + + // icmp (Y-X), (Z-X) -> icmp Y, Z for equalities or if there is no overflow. if (B && D && B == D && NoOp0WrapProblem && NoOp1WrapProblem && // Try not to increase register pressure. BO0->hasOneUse() && BO1->hasOneUse()) return new ICmpInst(Pred, A, C); + // icmp (X-Y), (X-Z) -> icmp Z, Y for equalities or if there is no overflow. + if (A && C && A == C && NoOp0WrapProblem && NoOp1WrapProblem && + // Try not to increase register pressure. + BO0->hasOneUse() && BO1->hasOneUse()) + return new ICmpInst(Pred, D, B); + if (BO0 && BO1 && BO0->getOpcode() == BO1->getOpcode() && BO0->hasOneUse() && BO1->hasOneUse() && BO0->getOperand(1) == BO1->getOperand(1)) { @@ -2375,12 +2389,7 @@ if (I.isEquality()) { Value *A, *B, *C, *D; - - // -x == -y --> x == y - if (match(Op0, m_Neg(m_Value(A))) && - match(Op1, m_Neg(m_Value(B)))) - return new ICmpInst(I.getPredicate(), A, B); - + if (match(Op0, m_Xor(m_Value(A), m_Value(B)))) { if (A == Op1 || B == Op1) { // (A^B) == A -> B == 0 Value *OtherVal = A == Op1 ? B : A; @@ -2415,16 +2424,6 @@ Constant::getNullValue(A->getType())); } - // (A-B) == A -> B == 0 - if (match(Op0, m_Sub(m_Specific(Op1), m_Value(B)))) - return new ICmpInst(I.getPredicate(), B, - Constant::getNullValue(B->getType())); - - // A == (A-B) -> B == 0 - if (match(Op1, m_Sub(m_Specific(Op0), m_Value(B)))) - return new ICmpInst(I.getPredicate(), B, - Constant::getNullValue(B->getType())); - // (X&Z) == (Y&Z) -> (X^Y) & Z == 0 if (Op0->hasOneUse() && Op1->hasOneUse() && match(Op0, m_And(m_Value(A), m_Value(B))) && Modified: llvm/trunk/test/Transforms/InstCombine/icmp.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/icmp.ll?rev=125843&r1=125842&r2=125843&view=diff ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/icmp.ll (original) +++ llvm/trunk/test/Transforms/InstCombine/icmp.ll Fri Feb 18 10:25:37 2011 @@ -235,6 +235,7 @@ } ; CHECK: @test25 +; X + Z > Y + Z -> X > Y if there is no overflow. ; CHECK: %c = icmp sgt i32 %x, %y ; CHECK: ret i1 %c define i1 @test25(i32 %x, i32 %y, i32 %z) { @@ -245,11 +246,134 @@ } ; CHECK: @test26 -; CHECK: %c = icmp sgt i32 %x, %y +; X + Z > Y + Z -> X > Y if there is no overflow. +; CHECK: %c = icmp ugt i32 %x, %y ; CHECK: ret i1 %c define i1 @test26(i32 %x, i32 %y, i32 %z) { + %lhs = add nuw i32 %x, %z + %rhs = add nuw i32 %y, %z + %c = icmp ugt i32 %lhs, %rhs + ret i1 %c +} + +; CHECK: @test27 +; X - Z > Y - Z -> X > Y if there is no overflow. +; CHECK: %c = icmp sgt i32 %x, %y +; CHECK: ret i1 %c +define i1 @test27(i32 %x, i32 %y, i32 %z) { %lhs = sub nsw i32 %x, %z %rhs = sub nsw i32 %y, %z %c = icmp sgt i32 %lhs, %rhs ret i1 %c } + +; CHECK: @test28 +; X - Z > Y - Z -> X > Y if there is no overflow. +; CHECK: %c = icmp ugt i32 %x, %y +; CHECK: ret i1 %c +define i1 @test28(i32 %x, i32 %y, i32 %z) { + %lhs = sub nuw i32 %x, %z + %rhs = sub nuw i32 %y, %z + %c = icmp ugt i32 %lhs, %rhs + ret i1 %c +} + +; CHECK: @test29 +; X + Y > X -> Y > 0 if there is no overflow. +; CHECK: %c = icmp sgt i32 %y, 0 +; CHECK: ret i1 %c +define i1 @test29(i32 %x, i32 %y) { + %lhs = add nsw i32 %x, %y + %c = icmp sgt i32 %lhs, %x + ret i1 %c +} + +; CHECK: @test30 +; X + Y > X -> Y > 0 if there is no overflow. +; CHECK: %c = icmp ne i32 %y, 0 +; CHECK: ret i1 %c +define i1 @test30(i32 %x, i32 %y) { + %lhs = add nuw i32 %x, %y + %c = icmp ugt i32 %lhs, %x + ret i1 %c +} + +; CHECK: @test31 +; X > X + Y -> 0 > Y if there is no overflow. +; CHECK: %c = icmp slt i32 %y, 0 +; CHECK: ret i1 %c +define i1 @test31(i32 %x, i32 %y) { + %rhs = add nsw i32 %x, %y + %c = icmp sgt i32 %x, %rhs + ret i1 %c +} + +; CHECK: @test32 +; X > X + Y -> 0 > Y if there is no overflow. +; CHECK: ret i1 false +define i1 @test32(i32 %x, i32 %y) { + %rhs = add nuw i32 %x, %y + %c = icmp ugt i32 %x, %rhs + ret i1 %c +} + +; CHECK: @test33 +; X - Y > X -> 0 > Y if there is no overflow. +; CHECK: %c = icmp slt i32 %y, 0 +; CHECK: ret i1 %c +define i1 @test33(i32 %x, i32 %y) { + %lhs = sub nsw i32 %x, %y + %c = icmp sgt i32 %lhs, %x + ret i1 %c +} + +; CHECK: @test34 +; X - Y > X -> 0 > Y if there is no overflow. +; CHECK: ret i1 false +define i1 @test34(i32 %x, i32 %y) { + %lhs = sub nuw i32 %x, %y + %c = icmp ugt i32 %lhs, %x + ret i1 %c +} + +; CHECK: @test35 +; X > X - Y -> Y > 0 if there is no overflow. +; CHECK: %c = icmp sgt i32 %y, 0 +; CHECK: ret i1 %c +define i1 @test35(i32 %x, i32 %y) { + %rhs = sub nsw i32 %x, %y + %c = icmp sgt i32 %x, %rhs + ret i1 %c +} + +; CHECK: @test36 +; X > X - Y -> Y > 0 if there is no overflow. +; CHECK: %c = icmp ne i32 %y, 0 +; CHECK: ret i1 %c +define i1 @test36(i32 %x, i32 %y) { + %rhs = sub nuw i32 %x, %y + %c = icmp ugt i32 %x, %rhs + ret i1 %c +} + +; CHECK: @test37 +; X - Y > X - Z -> Z > Y if there is no overflow. +; CHECK: %c = icmp sgt i32 %z, %y +; CHECK: ret i1 %c +define i1 @test37(i32 %x, i32 %y, i32 %z) { + %lhs = sub nsw i32 %x, %y + %rhs = sub nsw i32 %x, %z + %c = icmp sgt i32 %lhs, %rhs + ret i1 %c +} + +; CHECK: @test38 +; X - Y > X - Z -> Z > Y if there is no overflow. +; CHECK: %c = icmp ugt i32 %z, %y +; CHECK: ret i1 %c +define i1 @test38(i32 %x, i32 %y, i32 %z) { + %lhs = sub nuw i32 %x, %y + %rhs = sub nuw i32 %x, %z + %c = icmp ugt i32 %lhs, %rhs + ret i1 %c +} Modified: llvm/trunk/test/Transforms/InstCombine/sub.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/sub.ll?rev=125843&r1=125842&r2=125843&view=diff ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/sub.ll (original) +++ llvm/trunk/test/Transforms/InstCombine/sub.ll Fri Feb 18 10:25:37 2011 @@ -209,7 +209,7 @@ %tmp5 = icmp eq i32 %tmp2, %tmp4 ret i1 %tmp5 ; CHECK: @test22 -; CHECK: %tmp5 = icmp eq i32 %a, %b +; CHECK: %tmp5 = icmp eq i32 %b, %a ; CHECK: ret i1 %tmp5 } From daniel at zuster.org Fri Feb 18 10:32:51 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:32:51 -0000 Subject: [llvm-commits] [zorg] r125844 - /zorg/trunk/zorg/buildbot/util/reloading.py Message-ID: <20110218163251.A57CF2A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:32:51 2011 New Revision: 125844 URL: http://llvm.org/viewvc/llvm-project?rev=125844&view=rev Log: buildbot: Add a helper module for reloading changed modules. - Only a partial solution, because it doesn't deal with any dependencies among modules. Added: zorg/trunk/zorg/buildbot/util/reloading.py Added: zorg/trunk/zorg/buildbot/util/reloading.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/util/reloading.py?rev=125844&view=auto ============================================================================== --- zorg/trunk/zorg/buildbot/util/reloading.py (added) +++ zorg/trunk/zorg/buildbot/util/reloading.py Fri Feb 18 10:32:51 2011 @@ -0,0 +1,44 @@ +""" +Helper module for defining a utility which will reload all of the +modules used in the system. + +This is important when using buildbot's reload command. +""" + +import os +import sys + +time_cache = {} + +def path_starts_with_one_of(path, paths): + for p in paths: + if path.startswith(p): + return True + +def reload_all(only_paths = [], log = False): + # Reload all modules in sys.modules which have changed. + for module in sys.modules.values(): + if not hasattr(module, '__file__'): + continue + path = getattr(module, '__file__') + if not path: + continue + if os.path.splitext(path)[1] in ['.pyc', '.pyo', '.pyd']: + path = path[:-1] + + # Never reload ourselves, we don't want to kill the cache. + if path == __file__: + continue + + # If we were given a limited path list, only reload modules + # with paths under that. + if only_paths and not path_starts_with_one_of(path, only_paths): + continue + + if os.path.isfile(path): + mtime = os.stat(path).st_mtime + if path not in time_cache or mtime != time_cache[path]: + if log: + print >>sys.stderr, "note: reloading %r" % path + time_cache[path] = mtime + reload(module) From rafael.espindola at gmail.com Fri Feb 18 10:37:07 2011 From: rafael.espindola at gmail.com (Rafael Avila de Espindola) Date: Fri, 18 Feb 2011 11:37:07 -0500 Subject: [llvm-commits] [PATCH] Expose Type::getName() to the C bindings In-Reply-To: <4D5DD0A1.7030800@mozilla.com> References: <4D5DD0A1.7030800@mozilla.com> Message-ID: <4D5EA033.6000101@gmail.com> On 11-02-17 08:51 PM, Patrick Walton wrote: > Hi everyone, > > Currently, the LLVM C bindings allow names for types to be registered. > However, a consumer can't get those names back out again. This patch > adds an API for it. The patch is OK. Do you need me to commit it? > Thanks, > Patrick Cheers, Rafael From rafael.espindola at gmail.com Fri Feb 18 10:35:37 2011 From: rafael.espindola at gmail.com (Rafael Espindola) Date: Fri, 18 Feb 2011 16:35:37 -0000 Subject: [llvm-commits] [llvm] r125845 - in /llvm/trunk: include/llvm-c/Core.h lib/VMCore/Core.cpp Message-ID: <20110218163537.B55962A6C12C@llvm.org> Author: rafael Date: Fri Feb 18 10:35:37 2011 New Revision: 125845 URL: http://llvm.org/viewvc/llvm-project?rev=125845&view=rev Log: Expose getTypeName to the C API. Patch by Patrick Walton. Modified: llvm/trunk/include/llvm-c/Core.h llvm/trunk/lib/VMCore/Core.cpp Modified: llvm/trunk/include/llvm-c/Core.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm-c/Core.h?rev=125845&r1=125844&r2=125845&view=diff ============================================================================== --- llvm/trunk/include/llvm-c/Core.h (original) +++ llvm/trunk/include/llvm-c/Core.h Fri Feb 18 10:35:37 2011 @@ -322,6 +322,7 @@ LLVMBool LLVMAddTypeName(LLVMModuleRef M, const char *Name, LLVMTypeRef Ty); void LLVMDeleteTypeName(LLVMModuleRef M, const char *Name); LLVMTypeRef LLVMGetTypeByName(LLVMModuleRef M, const char *Name); +const char *LLVMGetTypeName(LLVMModuleRef M, LLVMTypeRef Ty); /** See Module::dump. */ void LLVMDumpModule(LLVMModuleRef M); Modified: llvm/trunk/lib/VMCore/Core.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Core.cpp?rev=125845&r1=125844&r2=125845&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/Core.cpp (original) +++ llvm/trunk/lib/VMCore/Core.cpp Fri Feb 18 10:35:37 2011 @@ -128,6 +128,10 @@ return wrap(unwrap(M)->getTypeByName(Name)); } +const char *LLVMGetTypeName(LLVMModuleRef M, LLVMTypeRef Ty) { + return unwrap(M)->getTypeName(unwrap(Ty)).c_str(); +} + void LLVMDumpModule(LLVMModuleRef M) { unwrap(M)->dump(); } From daniel at zuster.org Fri Feb 18 10:40:08 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:40:08 -0000 Subject: [llvm-commits] [zorg] r125848 - in /zorg/trunk/llvmlab: ./ README.txt llvmlab/ llvmlab/__init__.py llvmlab/ui/ llvmlab/ui/__init__.py llvmlab/ui/app.py setup.py Message-ID: <20110218164008.29BE82A6C12E@llvm.org> Author: ddunbar Date: Fri Feb 18 10:40:07 2011 New Revision: 125848 URL: http://llvm.org/viewvc/llvm-project?rev=125848&view=rev Log: llvmlab: Start sketching lab.llvm.org web app. - Let's try a web app with Flask, eh? Added: zorg/trunk/llvmlab/ zorg/trunk/llvmlab/README.txt zorg/trunk/llvmlab/llvmlab/ zorg/trunk/llvmlab/llvmlab/__init__.py zorg/trunk/llvmlab/llvmlab/ui/ zorg/trunk/llvmlab/llvmlab/ui/__init__.py zorg/trunk/llvmlab/llvmlab/ui/app.py zorg/trunk/llvmlab/setup.py Added: zorg/trunk/llvmlab/README.txt URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/README.txt?rev=125848&view=auto ============================================================================== --- zorg/trunk/llvmlab/README.txt (added) +++ zorg/trunk/llvmlab/README.txt Fri Feb 18 10:40:07 2011 @@ -0,0 +1,5 @@ +====================== + lab.llvm.org Web App +====================== + +This directory and its subdirectories contain the lab.llvm.org web app. Added: zorg/trunk/llvmlab/llvmlab/__init__.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/__init__.py?rev=125848&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/__init__.py (added) +++ zorg/trunk/llvmlab/llvmlab/__init__.py Fri Feb 18 10:40:07 2011 @@ -0,0 +1,6 @@ +__author__ = 'Daniel Dunbar' +__email__ = 'daniel at zuster.org' +__versioninfo__ = (0, 1, 0) +__version__ = '.'.join(map(str, __versioninfo__)) + 'dev' + +__all__ = [] Added: zorg/trunk/llvmlab/llvmlab/ui/__init__.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/__init__.py?rev=125848&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/__init__.py (added) +++ zorg/trunk/llvmlab/llvmlab/ui/__init__.py Fri Feb 18 10:40:07 2011 @@ -0,0 +1 @@ +__all__ = [] Added: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125848&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (added) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:40:07 2011 @@ -0,0 +1,9 @@ +from flask import Flask +app = Flask(__name__) + + at app.route('/') +def index(): + return "Ceci n'est pas un laboratoire." + +if __name__ == '__main__': + app.run() Added: zorg/trunk/llvmlab/setup.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/setup.py?rev=125848&view=auto ============================================================================== --- zorg/trunk/llvmlab/setup.py (added) +++ zorg/trunk/llvmlab/setup.py Fri Feb 18 10:40:07 2011 @@ -0,0 +1,42 @@ +import llvmlab +import os + +from setuptools import setup, find_packages + +# setuptools expects to be invoked from within the directory of setup.py, but it +# is nice to allow: +# python path/to/setup.py install +# to work (for scripts, etc.) +os.chdir(os.path.dirname(os.path.abspath(__file__))) + +setup( + name = "llvmlab", + version = llvmlab.__version__, + + author = llvmlab.__author__, + author_email = llvmlab.__email__, + url = 'http://lab.llvm.org', + license = 'BSD', + + description = "lab.llvm.org Web App", + keywords = 'web testing performance development llvm', + + classifiers=[ + 'Development Status :: 1 - Planning', + 'Environment :: Web Environment', + 'Intended Audience :: Developers', + ('License :: OSI Approved :: ' + 'University of Illinois/NCSA Open Source License'), + 'Natural Language :: English', + 'Operating System :: OS Independent', + 'Progamming Language :: Python', + 'Topic :: Software Development :: Quality Assurance', + 'Topic :: Software Development :: Testing', + ], + + zip_safe = False, + + packages = find_packages(), + + install_requires=['Flask'], +) From daniel at zuster.org Fri Feb 18 10:40:11 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:40:11 -0000 Subject: [llvm-commits] [zorg] r125850 - in /zorg/trunk/llvmlab/llvmlab/ui: app.py static/ static/favicon.ico Message-ID: <20110218164011.36BF62A6C12F@llvm.org> Author: ddunbar Date: Fri Feb 18 10:40:11 2011 New Revision: 125850 URL: http://llvm.org/viewvc/llvm-project?rev=125850&view=rev Log: llvmlab: Add a favicon. Also, use debugger by default when started from command line. Added: zorg/trunk/llvmlab/llvmlab/ui/static/ zorg/trunk/llvmlab/llvmlab/ui/static/favicon.ico Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125850&r1=125849&r2=125850&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:40:11 2011 @@ -1,9 +1,17 @@ -from flask import Flask -app = Flask(__name__) +import flask +from flask import redirect, url_for + +# Construct the Flask application. +app = flask.Flask(__name__) @app.route('/') def index(): return "Ceci n'est pas un laboratoire." + at app.route('/favicon.ico') +def favicon_ico(): + return redirect(url_for('static', filename='favicon.ico')) + if __name__ == '__main__': + app.debug = True app.run() Added: zorg/trunk/llvmlab/llvmlab/ui/static/favicon.ico URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/static/favicon.ico?rev=125850&view=auto ============================================================================== Binary files zorg/trunk/llvmlab/llvmlab/ui/static/favicon.ico (added) and zorg/trunk/llvmlab/llvmlab/ui/static/favicon.ico Fri Feb 18 10:40:11 2011 differ From daniel at zuster.org Fri Feb 18 10:40:14 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:40:14 -0000 Subject: [llvm-commits] [zorg] r125852 - in /zorg/trunk/llvmlab/llvmlab/ui: app.py static/style.css templates/ templates/index.html Message-ID: <20110218164014.E884B2A6C130@llvm.org> Author: ddunbar Date: Fri Feb 18 10:40:14 2011 New Revision: 125852 URL: http://llvm.org/viewvc/llvm-project?rev=125852&view=rev Log: llvmlab: Move index page into a template. Added: zorg/trunk/llvmlab/llvmlab/ui/static/style.css zorg/trunk/llvmlab/llvmlab/ui/templates/ zorg/trunk/llvmlab/llvmlab/ui/templates/index.html Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125852&r1=125851&r2=125852&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:40:14 2011 @@ -1,12 +1,12 @@ import flask -from flask import redirect, url_for +from flask import redirect, render_template, url_for # Construct the Flask application. app = flask.Flask(__name__) @app.route('/') def index(): - return "Ceci n'est pas un laboratoire." + return render_template("index.html") @app.route('/favicon.ico') def favicon_ico(): Added: zorg/trunk/llvmlab/llvmlab/ui/static/style.css URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/static/style.css?rev=125852&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/static/style.css (added) +++ zorg/trunk/llvmlab/llvmlab/ui/static/style.css Fri Feb 18 10:40:14 2011 @@ -0,0 +1,6 @@ +body { + background-color: #F0F3FF; + font-family: "Lucida Grande", "Lucida Sans Unicode", Arial, Verdana, + Helvetica, sans-serif; + font-size: small; +} Added: zorg/trunk/llvmlab/llvmlab/ui/templates/index.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/index.html?rev=125852&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/index.html (added) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/index.html Fri Feb 18 10:40:14 2011 @@ -0,0 +1,12 @@ + + + + lab.llvm.org + + + +Ceci n'est pas un laboratoire. + + From daniel at zuster.org Fri Feb 18 10:40:18 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:40:18 -0000 Subject: [llvm-commits] [zorg] r125853 - in /zorg/trunk/llvmlab/llvmlab/ui: static/style.css templates/index.html templates/layout.html Message-ID: <20110218164018.531992A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:40:18 2011 New Revision: 125853 URL: http://llvm.org/viewvc/llvm-project?rev=125853&view=rev Log: llvmlab: Factor out top-level layout template. Added: zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html Modified: zorg/trunk/llvmlab/llvmlab/ui/static/style.css zorg/trunk/llvmlab/llvmlab/ui/templates/index.html Modified: zorg/trunk/llvmlab/llvmlab/ui/static/style.css URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/static/style.css?rev=125853&r1=125852&r2=125853&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/static/style.css (original) +++ zorg/trunk/llvmlab/llvmlab/ui/static/style.css Fri Feb 18 10:40:18 2011 @@ -4,3 +4,33 @@ Helvetica, sans-serif; font-size: small; } + +div.body { + color: #000; + margin: 20px; +} +div.body a { + color: #333; +} + +div.header { + background-color: #50505A; + color: #FFF; + font-size: 125%; + padding: 10px 10px; + text-align: left; +} +div.header a { + color: #FFF; +} + +div.footer { + background-color: #50505A; + color: #FFF; + font-size: 75%; + padding: 10px 10px; + text-align: right; +} +div.footer a { + color: #FFF; +} Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/index.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/index.html?rev=125853&r1=125852&r2=125853&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/index.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/index.html Fri Feb 18 10:40:18 2011 @@ -1,12 +1,7 @@ - - - - lab.llvm.org - - - +{% extends "layout.html" %} +{% block title %}home{% endblock %} +{% block body %} + Ceci n'est pas un laboratoire. - - + +{% endblock %} Added: zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html?rev=125853&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html (added) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html Fri Feb 18 10:40:18 2011 @@ -0,0 +1,21 @@ + + + + + {{ self.title() }} + + + +
+ {# + #}lab.llvm.org | {{ self.title() }} +
+
{% block body %}{% endblock %}
+
+ {# + #}lab.llvm.org +
+ + From daniel at zuster.org Fri Feb 18 10:40:20 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:40:20 -0000 Subject: [llvm-commits] [zorg] r125854 - /zorg/trunk/llvmlab/llvmlab/TODO.txt Message-ID: <20110218164020.B57782A6C12E@llvm.org> Author: ddunbar Date: Fri Feb 18 10:40:20 2011 New Revision: 125854 URL: http://llvm.org/viewvc/llvm-project?rev=125854&view=rev Log: llvmlab: Sketch a TODO list. Added: zorg/trunk/llvmlab/llvmlab/TODO.txt Added: zorg/trunk/llvmlab/llvmlab/TODO.txt URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/TODO.txt?rev=125854&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/TODO.txt (added) +++ zorg/trunk/llvmlab/llvmlab/TODO.txt Fri Feb 18 10:40:20 2011 @@ -0,0 +1,29 @@ +====== + TODO +====== + +Go-Live Requirements +==================== + + - Config Logic + + - User Login + + o Expect superset of committer list. + + o Keep auth info with lab.llvm.org user cred, svn access will be an + attribute. + + o Attributes: user name, SSH key, committer name, email, commit access?, + machine access?, lab.llvm.org info (machine list, sponsor list)? + + - Machine List + + - Sponsor List + + - Intro Web Page + +Other +===== + + - Dashboard From daniel at zuster.org Fri Feb 18 10:40:27 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:40:27 -0000 Subject: [llvm-commits] [zorg] r125856 - in /zorg/trunk/llvmlab/llvmlab: user.py util.py Message-ID: <20110218164027.7D3EC2A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:40:27 2011 New Revision: 125856 URL: http://llvm.org/viewvc/llvm-project?rev=125856&view=rev Log: llvmlab: Sketch User objects. Added: zorg/trunk/llvmlab/llvmlab/user.py zorg/trunk/llvmlab/llvmlab/util.py Added: zorg/trunk/llvmlab/llvmlab/user.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/user.py?rev=125856&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/user.py (added) +++ zorg/trunk/llvmlab/llvmlab/user.py Fri Feb 18 10:40:27 2011 @@ -0,0 +1,28 @@ +""" +LLVM-Lab User Objects +""" + +from llvmlab import util + +class User(util.simple_repr_mixin): + @staticmethod + def fromdata(data): + version = data['version'] + if version != 0: + raise ValueError, "Unknown version" + + return User(data['id'], data['passhash'], + data['name'], data['email']) + + def todata(self): + return { 'version' : 0, + 'id' : self.id, + 'passhash' : self.passhash, + 'name' : self.name, + 'email' : self.email } + + def __init__(self, id, passhash, name, email): + self.id = id + self.passhash = passhash + self.name = name + self.email = email Added: zorg/trunk/llvmlab/llvmlab/util.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/util.py?rev=125856&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/util.py (added) +++ zorg/trunk/llvmlab/llvmlab/util.py Fri Feb 18 10:40:27 2011 @@ -0,0 +1,12 @@ +__all__ = [] + +def sorted(items): + items = list(items) + items.sort() + return items + +class simple_repr_mixin(object): + def __repr__(self): + return "%s(%s)" % (self.__class__.__name__, + ", ".join("%s=%r" % (k,v) + for k,v in sorted(self.__dict__.items()))) From daniel at zuster.org Fri Feb 18 10:40:24 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:40:24 -0000 Subject: [llvm-commits] [zorg] r125855 - in /zorg/trunk/llvmlab: llvmlab/TODO.txt llvmlab/llvmlabtool/ llvmlab/llvmlabtool/__init__.py llvmlab/llvmlabtool/lab.cfg.sample llvmlab/llvmlabtool/main.py llvmlab/ui/app.py llvmlab/ui/templates/layout.html setup.py Message-ID: <20110218164024.C39542A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:40:24 2011 New Revision: 125855 URL: http://llvm.org/viewvc/llvm-project?rev=125855&view=rev Log: llvmlab: Add basic llvmlab tool and config file. Added: zorg/trunk/llvmlab/llvmlab/llvmlabtool/ zorg/trunk/llvmlab/llvmlab/llvmlabtool/__init__.py zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py Modified: zorg/trunk/llvmlab/llvmlab/TODO.txt zorg/trunk/llvmlab/llvmlab/ui/app.py zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html zorg/trunk/llvmlab/setup.py Modified: zorg/trunk/llvmlab/llvmlab/TODO.txt URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/TODO.txt?rev=125855&r1=125854&r2=125855&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/TODO.txt (original) +++ zorg/trunk/llvmlab/llvmlab/TODO.txt Fri Feb 18 10:40:24 2011 @@ -5,8 +5,6 @@ Go-Live Requirements ==================== - - Config Logic - - User Login o Expect superset of committer list. Added: zorg/trunk/llvmlab/llvmlab/llvmlabtool/__init__.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/llvmlabtool/__init__.py?rev=125855&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/llvmlabtool/__init__.py (added) +++ zorg/trunk/llvmlab/llvmlab/llvmlabtool/__init__.py Fri Feb 18 10:40:24 2011 @@ -0,0 +1,3 @@ +__all__ = ['main'] + +from main import main Added: zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample?rev=125855&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample (added) +++ zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample Fri Feb 18 10:40:24 2011 @@ -0,0 +1,20 @@ +# -*- Python -*- + +""" +LLVM Lab Configuration File +""" + +# Server administrator information. +ADMIN_LOGIN = %(admin_login)r +ADMIN_PASSHASH = %(admin_passhash)r +ADMIN_NAME = %(admin_name)r +ADMIN_EMAIL = %(admin_email)r + +# Should server run in debug mode? +DEBUG = %(debug_server)r + +# Secret key for this server instance. +SECRET_KEY = %(secret_key)r + +# Path to the managed data file. +DATA_PATH = %(data_path)r Added: zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py?rev=125855&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py (added) +++ zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py Fri Feb 18 10:40:24 2011 @@ -0,0 +1,110 @@ +"""Implements the command line 'llvmlab' tool.""" + +import hashlib +import os +import random +import shutil +import sys + +import flask + +def action_create(name, args): + """create an llvmlab installation""" + + import llvmlab + from optparse import OptionParser, OptionGroup + parser = OptionParser("%%prog %s [options] " % name) + parser.add_option("-f", "--force", dest="force", action="store_true", + help="overwrite existing files") + + group = OptionGroup(parser, "CONFIG OPTIONS") + group.add_option("", "--admin-login", dest="admin_login", + help="administrator login [%default]", default='admin') + group.add_option("", "--admin-name", dest="admin_name", + help="administrator name [%default]", + default='Administrator') + group.add_option("", "--admin-password", dest="admin_password", + help="administrator password [%default]", default='admin') + group.add_option("", "--admin-email", dest="admin_email", + help="administrator email [%default]", + default='admin at example.com') + + group.add_option("", "--debug-server", dest="debug_server", + help="run server in debug mode [%default]", + action="store_true", default=False) + parser.add_option_group(group) + + (opts, args) = parser.parse_args(args) + + if len(args) != 1: + parser.error("invalid number of arguments") + + basepath, = args + basepath = os.path.abspath(basepath) + cfg_path = os.path.join(basepath, 'lab.cfg') + data_path = os.path.join(basepath, 'lab-data.json') + + if not os.path.exists(basepath): + try: + os.mkdir(basepath) + except: + parser.error("unable to create directory: %r" % basepath) + elif not os.path.isdir(basepath): + parser.error("%r exists but is not a directory" % basepath) + + if not opts.force: + if os.path.exists(cfg_path): + parser.error("%r exists (use --force to override)" % cfg_path) + if os.path.exists(data_path): + parser.error("%r exists (use --force to override)" % data_path) + + # Construct the config file. + sample_cfg_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), + "lab.cfg.sample") + sample_cfg_file = open(sample_cfg_path, "rb") + sample_cfg_data = sample_cfg_file.read() + sample_cfg_file.close() + + # Fill in the sample config. + secret_key = hashlib.sha1(str(random.getrandbits(256))).hexdigest() + cfg_options = dict(opts.__dict__) + cfg_options['admin_passhash'] = hashlib.sha256( + opts.admin_password + secret_key).hexdigest() + cfg_options['secret_key'] = secret_key + cfg_options['data_path'] = data_path + cfg_data = sample_cfg_data % cfg_options + + # Write the initial config file. + cfg_file = open(cfg_path, 'w') + cfg_file.write(cfg_data) + cfg_file.close() + + # Write the initial (empty) data file. + data_file = open(data_path, 'w') + flask.json.dump({}, data_file, indent=2) + print >>data_file + data_file.close() + +### + +commands = dict((name[7:], f) for name,f in locals().items() + if name.startswith('action_')) + +def usage(): + print >>sys.stderr, "Usage: %s command [options]" % ( + os.path.basename(sys.argv[0])) + print >>sys.stderr + print >>sys.stderr, "Available commands:" + cmds_width = max(map(len, commands)) + for name,func in sorted(commands.items()): + print >>sys.stderr, " %-*s - %s" % (cmds_width, name, func.__doc__) + sys.exit(1) + +def main(): + import sys + + if len(sys.argv) < 2 or sys.argv[1] not in commands: + usage() + + cmd = sys.argv[1] + commands[cmd](cmd, sys.argv[2:]) Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125855&r1=125854&r2=125855&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:40:24 2011 @@ -1,9 +1,14 @@ +import os + import flask from flask import redirect, render_template, url_for # Construct the Flask application. app = flask.Flask(__name__) +# Load the configuration file. +app.config.from_envvar("LLVMLAB_CONFIG") + @app.route('/') def index(): return render_template("index.html") @@ -13,5 +18,5 @@ return redirect(url_for('static', filename='favicon.ico')) if __name__ == '__main__': - app.debug = True + app.debug = app.config['DEBUG'] app.run() Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html?rev=125855&r1=125854&r2=125855&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html Fri Feb 18 10:40:24 2011 @@ -15,7 +15,11 @@
{% block body %}{% endblock %}

{# - #}lab.llvm.org + #}lab.llvm.org
+ Administered by {{ + config['ADMIN_NAME'] }} <{{ + config['ADMIN_EMAIL'] }}>
Modified: zorg/trunk/llvmlab/setup.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/setup.py?rev=125855&r1=125854&r2=125855&view=diff ============================================================================== --- zorg/trunk/llvmlab/setup.py (original) +++ zorg/trunk/llvmlab/setup.py Fri Feb 18 10:40:24 2011 @@ -35,8 +35,11 @@ ], zip_safe = False, - packages = find_packages(), - + entry_points = { + 'console_scripts': [ + 'llvmlab = llvmlab.llvmlabtool:main', + ], + }, install_requires=['Flask'], ) From daniel at zuster.org Fri Feb 18 10:40:32 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:40:32 -0000 Subject: [llvm-commits] [zorg] r125858 - /zorg/trunk/llvmlab/llvmlab/ui/app.py Message-ID: <20110218164032.DAB8A2A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:40:32 2011 New Revision: 125858 URL: http://llvm.org/viewvc/llvm-project?rev=125858&view=rev Log: llvmlab: Load data on application startup. Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125858&r1=125857&r2=125858&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:40:32 2011 @@ -3,12 +3,46 @@ import flask from flask import redirect, render_template, url_for +import llvmlab.data +import llvmlab.user + +def load_llvmlab_data(app): + """load_llvmlab_data(app) -> data.Data + + Load the LLVM-Lab data for the given application. + """ + + data_path = app.config["DATA_PATH"] + data_file = open(data_path, "rb") + data_object = flask.json.load(data_file) + data_file.close() + + # Create the internal Data object. + data = llvmlab.data.Data.fromdata(data_object) + + # Set the admin pseudo-user. + data.set_admin_user(llvmlab.user.User( + id = app.config['ADMIN_LOGIN'], + passhash = app.config['ADMIN_PASSHASH'], + name = app.config['ADMIN_NAME'], + email = app.config['ADMIN_EMAIL'])) + + return data + +### + # Construct the Flask application. app = flask.Flask(__name__) # Load the configuration file. app.config.from_envvar("LLVMLAB_CONFIG") +# Load the LLVM-Lab database. +app.config.data = load_llvmlab_data(app) + +### +# Routing + @app.route('/') def index(): return render_template("index.html") @@ -17,6 +51,8 @@ def favicon_ico(): return redirect(url_for('static', filename='favicon.ico')) +### + if __name__ == '__main__': app.debug = app.config['DEBUG'] app.run() From daniel at zuster.org Fri Feb 18 10:40:30 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:40:30 -0000 Subject: [llvm-commits] [zorg] r125857 - in /zorg/trunk/llvmlab/llvmlab: data.py llvmlabtool/main.py Message-ID: <20110218164030.47D412A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:40:30 2011 New Revision: 125857 URL: http://llvm.org/viewvc/llvm-project?rev=125857&view=rev Log: llvmlab: Sketch top-level data object. Added: zorg/trunk/llvmlab/llvmlab/data.py Modified: zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py Added: zorg/trunk/llvmlab/llvmlab/data.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/data.py?rev=125857&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/data.py (added) +++ zorg/trunk/llvmlab/llvmlab/data.py Fri Feb 18 10:40:30 2011 @@ -0,0 +1,35 @@ +""" +LLVM-Lab Data Management +""" + +from llvmlab import util +from llvmlab import user + +class Data(util.simple_repr_mixin): + @staticmethod + def fromdata(data): + version = data['version'] + if version != 0: + raise ValueError, "Unknown version" + + users = [user.User.fromdata(u) + for u in data['users']] + return Data(users) + + def todata(self): + return { 'version' : 0, + 'users' : [u.todata() + for u in self.users.values() + if u is not self.admin_user] } + + def __init__(self, users): + self.users = dict((u.id, u) for u in users) + self.admin_user = None + + def set_admin_user(self, user): + if user.id in self.users: + raise ValueError, "database contains admin user %r" % user.id + + self.admin_user = user + self.users[user.id] = user + Modified: zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py?rev=125857&r1=125856&r2=125857&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py (original) +++ zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py Fri Feb 18 10:40:30 2011 @@ -7,6 +7,7 @@ import sys import flask +import llvmlab.data def action_create(name, args): """create an llvmlab installation""" @@ -79,9 +80,12 @@ cfg_file.write(cfg_data) cfg_file.close() + # Create the inital data file. + data = llvmlab.data.Data(users = []) + # Write the initial (empty) data file. data_file = open(data_path, 'w') - flask.json.dump({}, data_file, indent=2) + flask.json.dump(data.todata(), data_file, indent=2) print >>data_file data_file.close() From daniel at zuster.org Fri Feb 18 10:40:36 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:40:36 -0000 Subject: [llvm-commits] [zorg] r125859 - in /zorg/trunk/llvmlab/llvmlab/ui: app.py templates/users.html Message-ID: <20110218164036.487902A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:40:36 2011 New Revision: 125859 URL: http://llvm.org/viewvc/llvm-project?rev=125859&view=rev Log: llvmlab: Add users info page. - Will be behind login, eventually. Added: zorg/trunk/llvmlab/llvmlab/ui/templates/users.html Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125859&r1=125858&r2=125859&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:40:36 2011 @@ -51,6 +51,10 @@ def favicon_ico(): return redirect(url_for('static', filename='favicon.ico')) + at app.route('/users') +def users(): + return render_template("users.html") + ### if __name__ == '__main__': Added: zorg/trunk/llvmlab/llvmlab/ui/templates/users.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/users.html?rev=125859&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/users.html (added) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/users.html Fri Feb 18 10:40:36 2011 @@ -0,0 +1,15 @@ +{% extends "layout.html" %} +{% block title %}users{% endblock %} +{% block body %} + + + +{% for user in config.data.users.values() %} + + + + +{% endfor %} +
User Name User Email
{{ user.name }} {{ user.email }}
+ +{% endblock %} From daniel at zuster.org Fri Feb 18 10:40:39 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:40:39 -0000 Subject: [llvm-commits] [zorg] r125860 - in /zorg/trunk/llvmlab/llvmlab/ui: static/style.css templates/layout.html Message-ID: <20110218164039.5B0F82A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:40:39 2011 New Revision: 125860 URL: http://llvm.org/viewvc/llvm-project?rev=125860&view=rev Log: llvmlab: Add support for using flask.flash(). Modified: zorg/trunk/llvmlab/llvmlab/ui/static/style.css zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html Modified: zorg/trunk/llvmlab/llvmlab/ui/static/style.css URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/static/style.css?rev=125860&r1=125859&r2=125860&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/static/style.css (original) +++ zorg/trunk/llvmlab/llvmlab/ui/static/style.css Fri Feb 18 10:40:39 2011 @@ -34,3 +34,12 @@ div.footer a { color: #FFF; } + +div.flash_messages { + margin: 10px; +} +div.flash_message { + background: #CEE5F5; + padding: 10px; + border: 1px solid #AACBE2; +} Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html?rev=125860&r1=125859&r2=125860&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html Fri Feb 18 10:40:39 2011 @@ -12,6 +12,11 @@ {# #}lab.llvm.org | {{ self.title() }}

User Name	User Email
{{ user.name }}	{{ user.email }}

+
+ {% for message in get_flashed_messages() %} +
{{ message }}
+ {% endfor %} +

{% block body %}{% endblock %}

{# From daniel at zuster.org Fri Feb 18 10:40:42 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:40:42 -0000 Subject: [llvm-commits] [zorg] r125861 - in /zorg/trunk/llvmlab/llvmlab: TODO.txt ui/app.py ui/templates/layout.html ui/templates/login.html Message-ID: <20110218164042.E83B82A6C12E@llvm.org> Author: ddunbar Date: Fri Feb 18 10:40:42 2011 New Revision: 125861 URL: http://llvm.org/viewvc/llvm-project?rev=125861&view=rev Log: llvmlab: Add login support. - Not yet very secure, password goes in plain text (TODOed). Added: zorg/trunk/llvmlab/llvmlab/ui/templates/login.html Modified: zorg/trunk/llvmlab/llvmlab/TODO.txt zorg/trunk/llvmlab/llvmlab/ui/app.py zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html Modified: zorg/trunk/llvmlab/llvmlab/TODO.txt URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/TODO.txt?rev=125861&r1=125860&r2=125861&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/TODO.txt (original) +++ zorg/trunk/llvmlab/llvmlab/TODO.txt Fri Feb 18 10:40:42 2011 @@ -7,6 +7,8 @@ - User Login + o Secure login support. + o Expect superset of committer list. o Keep auth info with lab.llvm.org user cred, svn access will be an Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125861&r1=125860&r2=125861&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:40:42 2011 @@ -1,7 +1,8 @@ +import hashlib import os import flask -from flask import redirect, render_template, url_for +from flask import redirect, render_template, request, session, url_for import llvmlab.data import llvmlab.user @@ -29,6 +30,11 @@ return data +def authenticate_login(username, password): + passhash = hashlib.sha256(password + app.config["SECRET_KEY"]).hexdigest() + user = app.config.data.users.get(username) + return user and passhash == user.passhash + ### # Construct the Flask application. @@ -37,6 +43,9 @@ # Load the configuration file. app.config.from_envvar("LLVMLAB_CONFIG") +# Set the application secret key. +app.secret_key = app.config["SECRET_KEY"] + # Load the LLVM-Lab database. app.config.data = load_llvmlab_data(app) @@ -55,6 +64,31 @@ def users(): return render_template("users.html") + at app.route('/login', methods=['GET', 'POST']) +def login(): + # If this isn't a post request, return the login template. + if request.method != 'POST': + return render_template("login.html", error=None) + + # Authenticate the user. + username = request.form['username'] + if not authenticate_login(username, request.form['password']): + return render_template("login.html", + error="Invalid login") + + # Log the user in. + session['logged_in'] = True + session['active_user'] = username + flask.flash('You were logged in as "%s"!' % username) + return redirect(url_for("index")) + + at app.route('/logout') +def logout(): + session.pop('logged_in', None) + session.pop('active_user', None) + flask.flash('You were logged out!') + return redirect(url_for("index")) + ### if __name__ == '__main__': Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html?rev=125861&r1=125860&r2=125861&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html Fri Feb 18 10:40:42 2011 @@ -11,6 +11,10 @@
{# #}lab.llvm.org | {{ self.title() }} + {% if session.logged_in %} + + Logged In: {{ session.active_user }} + {% endif %}

{% for message in get_flashed_messages() %} Added: zorg/trunk/llvmlab/llvmlab/ui/templates/login.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/login.html?rev=125861&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/login.html (added) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/login.html Fri Feb 18 10:40:42 2011 @@ -0,0 +1,15 @@ +{% extends "layout.html" %} +{% block title %}login{% endblock %} +{% block body %} +
Login
+{% if error %} +
Error: {{ error }} +{% endif %} +
+
+
Username:
+
Password:
+
+
+
+{% endblock %} From daniel at zuster.org Fri Feb 18 10:40:50 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:40:50 -0000 Subject: [llvm-commits] [zorg] r125864 - in /zorg/trunk/llvmlab/llvmlab/ui: app.py views.py Message-ID: <20110218164050.ECF552A6C12E@llvm.org> Author: ddunbar Date: Fri Feb 18 10:40:50 2011 New Revision: 125864 URL: http://llvm.org/viewvc/llvm-project?rev=125864&view=rev Log: llvmlab: Move routes into separate module. Added: zorg/trunk/llvmlab/llvmlab/ui/views.py Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125864&r1=125863&r2=125864&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:40:50 2011 @@ -2,10 +2,10 @@ import os import flask -from flask import redirect, render_template, request, session, url_for import llvmlab.data import llvmlab.user +import llvmlab.ui.views class LLVMLabApp(flask.Flask): def __init__(self, name): @@ -53,45 +53,8 @@ # Load the LLVM-Lab database. app.load_data() -### -# Routing - - at app.route('/') -def index(): - return render_template("index.html") - - at app.route('/favicon.ico') -def favicon_ico(): - return redirect(url_for('static', filename='favicon.ico')) - - at app.route('/users') -def users(): - return render_template("users.html") - - at app.route('/login', methods=['GET', 'POST']) -def login(): - # If this isn't a post request, return the login template. - if request.method != 'POST': - return render_template("login.html", error=None) - - # Authenticate the user. - username = request.form['username'] - if not app.authenticate_login(username, request.form['password']): - return render_template("login.html", - error="Invalid login") - - # Log the user in. - session['logged_in'] = True - session['active_user'] = username - flask.flash('You were logged in as "%s"!' % username) - return redirect(url_for("index")) - - at app.route('/logout') -def logout(): - session.pop('logged_in', None) - session.pop('active_user', None) - flask.flash('You were logged out!') - return redirect(url_for("index")) +# Load the application routes. +app.register_module(llvmlab.ui.views.ui) ### Added: zorg/trunk/llvmlab/llvmlab/ui/views.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/views.py?rev=125864&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/views.py (added) +++ zorg/trunk/llvmlab/llvmlab/ui/views.py Fri Feb 18 10:40:50 2011 @@ -0,0 +1,46 @@ +import flask +from flask import redirect +from flask import render_template +from flask import request +from flask import session +from flask import url_for +from flask import current_app +from flask import Module +ui = Module('app.py') + + at ui.route('/') +def index(): + return render_template("index.html") + + at ui.route('/favicon.ico') +def favicon_ico(): + return redirect(url_for('static', filename='favicon.ico')) + + at ui.route('/users') +def users(): + return render_template("users.html") + + at ui.route('/login', methods=['GET', 'POST']) +def login(): + # If this isn't a post request, return the login template. + if request.method != 'POST': + return render_template("login.html", error=None) + + # Authenticate the user. + username = request.form['username'] + if not current_app.authenticate_login(username, request.form['password']): + return render_template("login.html", + error="Invalid login") + + # Log the user in. + session['logged_in'] = True + session['active_user'] = username + flask.flash('You were logged in as "%s"!' % username) + return redirect(url_for("index")) + + at ui.route('/logout') +def logout(): + session.pop('logged_in', None) + session.pop('active_user', None) + flask.flash('You were logged out!') + return redirect(url_for("index")) From daniel at zuster.org Fri Feb 18 10:40:45 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:40:45 -0000 Subject: [llvm-commits] [zorg] r125862 - /zorg/trunk/llvmlab/llvmlab/ui/templates/users.html Message-ID: <20110218164045.AC0AD2A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:40:45 2011 New Revision: 125862 URL: http://llvm.org/viewvc/llvm-project?rev=125862&view=rev Log: llvmlab: Require login to show users page. Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/users.html Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/users.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/users.html?rev=125862&r1=125861&r2=125862&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/users.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/users.html Fri Feb 18 10:40:45 2011 @@ -2,6 +2,12 @@ {% block title %}users{% endblock %} {% block body %} +{% if not session.logged_in %} + +You must login. + +{% else %} + {% for user in config.data.users.values() %} @@ -12,4 +18,6 @@ {% endfor %}

User Name User Email
+{% endif %} + {% endblock %} From daniel at zuster.org Fri Feb 18 10:40:53 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:40:53 -0000 Subject: [llvm-commits] [zorg] r125865 - /zorg/trunk/llvmlab/llvmlab/ui/app.py Message-ID: <20110218164053.8EF2D2A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:40:53 2011 New Revision: 125865 URL: http://llvm.org/viewvc/llvm-project?rev=125865&view=rev Log: llvmlab: Move more logic into App class. Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125865&r1=125864&r2=125865&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:40:53 2011 @@ -7,19 +7,38 @@ import llvmlab.user import llvmlab.ui.views -class LLVMLabApp(flask.Flask): +class App(flask.Flask): + @staticmethod + def create_standalone(): + # Construct the application. + app = App(__name__) + + # Load the application configuration. + app.load_config() + + # Load the database. + app.load_data() + + # Load the application routes. + app.register_module(llvmlab.ui.views.ui) + + return app + def __init__(self, name): - super(LLVMLabApp, self).__init__(name) + super(App, self).__init__(name) def load_config(self): # Load the configuration file. - app.config.from_envvar("LLVMLAB_CONFIG") + self.config.from_envvar("LLVMLAB_CONFIG") # Set the application secret key. - app.secret_key = app.config["SECRET_KEY"] + self.secret_key = self.config["SECRET_KEY"] + + # Set the debug mode. + self.debug = self.config["DEBUG"] def load_data(self): - data_path = app.config["DATA_PATH"] + data_path = self.config["DATA_PATH"] data_file = open(data_path, "rb") data_object = flask.json.load(data_file) data_file.close() @@ -29,35 +48,19 @@ # Set the admin pseudo-user. data.set_admin_user(llvmlab.user.User( - id = app.config['ADMIN_LOGIN'], - passhash = app.config['ADMIN_PASSHASH'], - name = app.config['ADMIN_NAME'], - email = app.config['ADMIN_EMAIL'])) + id = self.config['ADMIN_LOGIN'], + passhash = self.config['ADMIN_PASSHASH'], + name = self.config['ADMIN_NAME'], + email = self.config['ADMIN_EMAIL'])) self.config.data = data def authenticate_login(self, username, password): passhash = hashlib.sha256( - password + app.config["SECRET_KEY"]).hexdigest() - user = app.config.data.users.get(username) + password + self.config["SECRET_KEY"]).hexdigest() + user = self.config.data.users.get(username) return user and passhash == user.passhash -### - -# Construct the Flask application. -app = LLVMLabApp(__name__) - -# Load the application configuration. -app.load_config() - -# Load the LLVM-Lab database. -app.load_data() - -# Load the application routes. -app.register_module(llvmlab.ui.views.ui) - -### - if __name__ == '__main__': - app.debug = app.config['DEBUG'] + app = App.create_standalone() app.run() From daniel at zuster.org Fri Feb 18 10:40:48 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:40:48 -0000 Subject: [llvm-commits] [zorg] r125863 - /zorg/trunk/llvmlab/llvmlab/ui/app.py Message-ID: <20110218164048.2A44E2A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:40:48 2011 New Revision: 125863 URL: http://llvm.org/viewvc/llvm-project?rev=125863&view=rev Log: llvmlab: Pull out an LLVMLabApp class. Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125863&r1=125862&r2=125863&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:40:48 2011 @@ -7,47 +7,51 @@ import llvmlab.data import llvmlab.user -def load_llvmlab_data(app): - """load_llvmlab_data(app) -> data.Data - - Load the LLVM-Lab data for the given application. - """ - - data_path = app.config["DATA_PATH"] - data_file = open(data_path, "rb") - data_object = flask.json.load(data_file) - data_file.close() - - # Create the internal Data object. - data = llvmlab.data.Data.fromdata(data_object) - - # Set the admin pseudo-user. - data.set_admin_user(llvmlab.user.User( - id = app.config['ADMIN_LOGIN'], - passhash = app.config['ADMIN_PASSHASH'], - name = app.config['ADMIN_NAME'], - email = app.config['ADMIN_EMAIL'])) - - return data - -def authenticate_login(username, password): - passhash = hashlib.sha256(password + app.config["SECRET_KEY"]).hexdigest() - user = app.config.data.users.get(username) - return user and passhash == user.passhash +class LLVMLabApp(flask.Flask): + def __init__(self, name): + super(LLVMLabApp, self).__init__(name) + + def load_config(self): + # Load the configuration file. + app.config.from_envvar("LLVMLAB_CONFIG") + + # Set the application secret key. + app.secret_key = app.config["SECRET_KEY"] + + def load_data(self): + data_path = app.config["DATA_PATH"] + data_file = open(data_path, "rb") + data_object = flask.json.load(data_file) + data_file.close() + + # Create the internal Data object. + data = llvmlab.data.Data.fromdata(data_object) + + # Set the admin pseudo-user. + data.set_admin_user(llvmlab.user.User( + id = app.config['ADMIN_LOGIN'], + passhash = app.config['ADMIN_PASSHASH'], + name = app.config['ADMIN_NAME'], + email = app.config['ADMIN_EMAIL'])) + + self.config.data = data + + def authenticate_login(self, username, password): + passhash = hashlib.sha256( + password + app.config["SECRET_KEY"]).hexdigest() + user = app.config.data.users.get(username) + return user and passhash == user.passhash ### # Construct the Flask application. -app = flask.Flask(__name__) - -# Load the configuration file. -app.config.from_envvar("LLVMLAB_CONFIG") +app = LLVMLabApp(__name__) -# Set the application secret key. -app.secret_key = app.config["SECRET_KEY"] +# Load the application configuration. +app.load_config() # Load the LLVM-Lab database. -app.config.data = load_llvmlab_data(app) +app.load_data() ### # Routing @@ -72,7 +76,7 @@ # Authenticate the user. username = request.form['username'] - if not authenticate_login(username, request.form['password']): + if not app.authenticate_login(username, request.form['password']): return render_template("login.html", error="Invalid login") From daniel at zuster.org Fri Feb 18 10:40:56 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:40:56 -0000 Subject: [llvm-commits] [zorg] r125866 - /zorg/trunk/llvmlab/llvmlab/ui/app.py Message-ID: <20110218164056.1A4172A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:40:55 2011 New Revision: 125866 URL: http://llvm.org/viewvc/llvm-project?rev=125866&view=rev Log: llvmlab: Add App.create_test_instance(). Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125866&r1=125865&r2=125866&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:40:55 2011 @@ -9,27 +9,52 @@ class App(flask.Flask): @staticmethod - def create_standalone(): + def create_standalone(config = None, data = None): # Construct the application. app = App(__name__) # Load the application configuration. - app.load_config() + app.load_config(config) # Load the database. - app.load_data() + app.load_data(data) # Load the application routes. app.register_module(llvmlab.ui.views.ui) return app + @staticmethod + def create_test_instance(): + secret_key = "not so secret" + + # Manually construct a test configuration. + # + # FIXME: Would be nice to vet that this matches the sample config. + config = { + "ADMIN_LOGIN" : "admin", + "ADMIN_PASSHASH" : hashlib.sha256( + "admin" + secret_key).hexdigest(), + "ADMIN_NAME" : "Administrator", + "ADMIN_EMAIL" : "admin at example.com", + "DEBUG" : True, + "SECRET_KEY" : secret_key, + "DATA_PATH" : None } + + # Construct an empty test database. + data = llvmlab.data.Data(users = []) + + return App.create_standalone(config, data) + def __init__(self, name): super(App, self).__init__(name) - def load_config(self): - # Load the configuration file. - self.config.from_envvar("LLVMLAB_CONFIG") + def load_config(self, config = None): + if config is None: + # Load the configuration file. + self.config.from_envvar("LLVMLAB_CONFIG") + else: + self.config.update(config) # Set the application secret key. self.secret_key = self.config["SECRET_KEY"] @@ -37,14 +62,15 @@ # Set the debug mode. self.debug = self.config["DEBUG"] - def load_data(self): - data_path = self.config["DATA_PATH"] - data_file = open(data_path, "rb") - data_object = flask.json.load(data_file) - data_file.close() + def load_data(self, data = None): + if data is None: + data_path = self.config["DATA_PATH"] + data_file = open(data_path, "rb") + data_object = flask.json.load(data_file) + data_file.close() - # Create the internal Data object. - data = llvmlab.data.Data.fromdata(data_object) + # Create the internal Data object. + data = llvmlab.data.Data.fromdata(data_object) # Set the admin pseudo-user. data.set_admin_user(llvmlab.user.User( From daniel at zuster.org Fri Feb 18 10:40:58 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:40:58 -0000 Subject: [llvm-commits] [zorg] r125867 - in /zorg/trunk/llvmlab/tests: ./ basic.py Message-ID: <20110218164058.A8C612A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:40:58 2011 New Revision: 125867 URL: http://llvm.org/viewvc/llvm-project?rev=125867&view=rev Log: llvmlab: Add some simple tests. Added: zorg/trunk/llvmlab/tests/ zorg/trunk/llvmlab/tests/basic.py Added: zorg/trunk/llvmlab/tests/basic.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/tests/basic.py?rev=125867&view=auto ============================================================================== --- zorg/trunk/llvmlab/tests/basic.py (added) +++ zorg/trunk/llvmlab/tests/basic.py Fri Feb 18 10:40:58 2011 @@ -0,0 +1,54 @@ +import os +import unittest + +import llvmlab +from llvmlab.ui import app + +class TestCase(unittest.TestCase): + def setUp(self): + self.app = app.App.create_test_instance().test_client() + + def tearDown(self): + pass + + def login(self, username, password): + return self.app.post('/login', data=dict( + username=username, + password=password), follow_redirects=True) + + def logout(self): + return self.app.get('/logout', follow_redirects=True) + +class TestBasic(TestCase): + def test_index(self): + rv = self.app.get('/') + assert rv.data.startswith('login.""" in rv.data + + # Check that the login page shows what we expect. + rv = self.app.get('/login') + assert """""" in rv.data + + # Log in as the test admin user. + rv = self.login("admin", "admin") + assert "Logged In: admin""" in rv.data + + # Check that we can access the users page now. + rv = self.app.get('/users') + assert """You must login.""" not in rv.data + assert """Administrator""" in rv.data + + # Log out. + rv = self.logout() + assert "Logged in" not in rv.data + +if __name__ == '__main__': + unittest.main() From daniel at zuster.org Fri Feb 18 10:41:02 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:41:02 -0000 Subject: [llvm-commits] [zorg] r125868 - in /zorg/trunk/llvmlab/llvmlab: llvmlabtool/main.py ui/app.py ui/templates/layout.html ui/views.py Message-ID: <20110218164102.453102A6C12E@llvm.org> Author: ddunbar Date: Fri Feb 18 10:41:02 2011 New Revision: 125868 URL: http://llvm.org/viewvc/llvm-project?rev=125868&view=rev Log: llvmlab: Add runserver command, and tweak module structure to be more canonical. Modified: zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py zorg/trunk/llvmlab/llvmlab/ui/app.py zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html zorg/trunk/llvmlab/llvmlab/ui/views.py Modified: zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py?rev=125868&r1=125867&r2=125868&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py (original) +++ zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py Fri Feb 18 10:41:02 2011 @@ -10,7 +10,7 @@ import llvmlab.data def action_create(name, args): - """create an llvmlab installation""" + """create a llvmlab installation""" import llvmlab from optparse import OptionParser, OptionGroup @@ -89,6 +89,21 @@ print >>data_file data_file.close() +def action_runserver(name, args): + """run a llvmlab instance""" + + import llvmlab + from optparse import OptionParser, OptionGroup + parser = OptionParser("%%prog %s [options] " % name) + (opts, args) = parser.parse_args(args) + + if len(args) != 0: + parser.error("invalid number of arguments") + + from llvmlab.ui import app + instance = app.App.create_standalone() + instance.run() + ### commands = dict((name[7:], f) for name,f in locals().items() Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125868&r1=125867&r2=125868&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:41:02 2011 @@ -86,7 +86,3 @@ password + self.config["SECRET_KEY"]).hexdigest() user = self.config.data.users.get(username) return user and passhash == user.passhash - -if __name__ == '__main__': - app = App.create_standalone() - app.run() Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html?rev=125868&r1=125867&r2=125868&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html Fri Feb 18 10:41:02 2011 @@ -5,7 +5,7 @@ {{ self.title() }} + #} href="{{ url_for('.static', filename='style.css') }}">
Modified: zorg/trunk/llvmlab/llvmlab/ui/views.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/views.py?rev=125868&r1=125867&r2=125868&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/views.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/views.py Fri Feb 18 10:41:02 2011 @@ -6,7 +6,7 @@ from flask import url_for from flask import current_app from flask import Module -ui = Module('app.py') +ui = Module(__name__) @ui.route('/') def index(): @@ -14,7 +14,7 @@ @ui.route('/favicon.ico') def favicon_ico(): - return redirect(url_for('static', filename='favicon.ico')) + return redirect(url_for('.static', filename='favicon.ico')) @ui.route('/users') def users(): From daniel at zuster.org Fri Feb 18 10:41:05 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:41:05 -0000 Subject: [llvm-commits] [zorg] r125869 - in /zorg/trunk/llvmlab: llvmlab/ui/templates/login.html tests/basic.py Message-ID: <20110218164105.6EB1E2A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:41:05 2011 New Revision: 125869 URL: http://llvm.org/viewvc/llvm-project?rev=125869&view=rev Log: llvmlab: Make login page display something more sensible if already logged in. Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/login.html zorg/trunk/llvmlab/tests/basic.py Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/login.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/login.html?rev=125869&r1=125868&r2=125869&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/login.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/login.html Fri Feb 18 10:41:05 2011 @@ -1,6 +1,14 @@ {% extends "layout.html" %} {% block title %}login{% endblock %} {% block body %} + +{% if session.logged_in %} + +You are already logged in. Would you like to logout? + +{% else %} +
Login
{% if error %}
Error: {{ error }} @@ -12,4 +20,7 @@
+ +{% endif %} + {% endblock %} Modified: zorg/trunk/llvmlab/tests/basic.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/tests/basic.py?rev=125869&r1=125868&r2=125869&view=diff ============================================================================== --- zorg/trunk/llvmlab/tests/basic.py (original) +++ zorg/trunk/llvmlab/tests/basic.py Fri Feb 18 10:41:05 2011 @@ -40,6 +40,10 @@ # Log in as the test admin user. rv = self.login("admin", "admin") assert "Logged In: admin""" in rv.data + + # Check that the login page shows something sensible. + rv = self.app.get('/login') + assert """You are already logged in.""" in rv.data # Check that we can access the users page now. rv = self.app.get('/users') From daniel at zuster.org Fri Feb 18 10:41:08 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:41:08 -0000 Subject: [llvm-commits] [zorg] r125870 - in /zorg/trunk/llvmlab/llvmlab/ui: templates/user.html templates/users.html views.py Message-ID: <20110218164108.DE64B2A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:41:08 2011 New Revision: 125870 URL: http://llvm.org/viewvc/llvm-project?rev=125870&view=rev Log: llvmlab: Add a per-user info page. Added: zorg/trunk/llvmlab/llvmlab/ui/templates/user.html - copied, changed from r125869, zorg/trunk/llvmlab/llvmlab/ui/templates/users.html Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/users.html zorg/trunk/llvmlab/llvmlab/ui/views.py Copied: zorg/trunk/llvmlab/llvmlab/ui/templates/user.html (from r125869, zorg/trunk/llvmlab/llvmlab/ui/templates/users.html) URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/user.html?p2=zorg/trunk/llvmlab/llvmlab/ui/templates/user.html&p1=zorg/trunk/llvmlab/llvmlab/ui/templates/users.html&r1=125869&r2=125870&rev=125870&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/users.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/user.html Fri Feb 18 10:41:08 2011 @@ -9,13 +9,9 @@ {% else %} - -{% for user in config.data.users.values() %} - - - - -{% endfor %} + + +
User Name User Email
{{ user.name }} {{ user.email }}
ID {{ user.id }}
Name {{ user.name }}
Email {{ user.email }}

{% endif %} Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/users.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/users.html?rev=125870&r1=125869&r2=125870&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/users.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/users.html Fri Feb 18 10:41:08 2011 @@ -9,9 +9,14 @@ {% else %} - + + + + {% for user in config.data.users.values() %} + Modified: zorg/trunk/llvmlab/llvmlab/ui/views.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/views.py?rev=125870&r1=125869&r2=125870&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/views.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/views.py Fri Feb 18 10:41:08 2011 @@ -1,4 +1,5 @@ import flask +from flask import abort from flask import redirect from flask import render_template from flask import request @@ -20,6 +21,14 @@ def users(): return render_template("users.html") + at ui.route('/user/') +def user(username): + user = current_app.config.data.users.get(username) + if user is None: + abort(404) + + return render_template("user.html", user=user) + @ui.route('/login', methods=['GET', 'POST']) def login(): # If this isn't a post request, return the login template. From daniel at zuster.org Fri Feb 18 10:41:11 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:41:11 -0000 Subject: [llvm-commits] [zorg] r125871 - in /zorg/trunk/llvmlab/llvmlab: data.py machine.py Message-ID: <20110218164111.C18CC2A6C12E@llvm.org> Author: ddunbar Date: Fri Feb 18 10:41:11 2011 New Revision: 125871 URL: http://llvm.org/viewvc/llvm-project?rev=125871&view=rev Log: llvmlab: Sketch Machine objects. Added: zorg/trunk/llvmlab/llvmlab/machine.py Modified: zorg/trunk/llvmlab/llvmlab/data.py Modified: zorg/trunk/llvmlab/llvmlab/data.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/data.py?rev=125871&r1=125870&r2=125871&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/data.py (original) +++ zorg/trunk/llvmlab/llvmlab/data.py Fri Feb 18 10:41:11 2011 @@ -3,7 +3,7 @@ """ from llvmlab import util -from llvmlab import user +from llvmlab import machine, user class Data(util.simple_repr_mixin): @staticmethod @@ -14,18 +14,24 @@ users = [user.User.fromdata(u) for u in data['users']] - return Data(users) + machines = [machine.Machine.fromdata(u) + for u in data['machines']] + return Data(users, machines) def todata(self): return { 'version' : 0, - 'users' : [u.todata() - for u in self.users.values() - if u is not self.admin_user] } + 'users' : [item.todata() + for item in self.users.values() + if item is not self.admin_user], + 'machine' : [item.todata() + for item in self.machines.values()] } - def __init__(self, users): - self.users = dict((u.id, u) for u in users) + def __init__(self, users, machines): + self.users = dict((item.id, item) for item in users) self.admin_user = None + self.machines = dict((item.id, item) for item in machines) + def set_admin_user(self, user): if user.id in self.users: raise ValueError, "database contains admin user %r" % user.id Added: zorg/trunk/llvmlab/llvmlab/machine.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/machine.py?rev=125871&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/machine.py (added) +++ zorg/trunk/llvmlab/llvmlab/machine.py Fri Feb 18 10:41:11 2011 @@ -0,0 +1,23 @@ +""" +LLVM-Lab Machine Objects +""" + +from llvmlab import util + +class Machine(util.simple_repr_mixin): + @staticmethod + def fromdata(data): + version = data['version'] + if version != 0: + raise ValueError, "Unknown version" + + return Machine(data['id'], data['hostname']) + + def todata(self): + return { 'version' : 0, + 'id' : self.id, + 'hostname' : self.hostname } + + def __init__(self, id, hostname): + self.id = id + self.hostname = hostname From daniel at zuster.org Fri Feb 18 10:41:19 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:41:19 -0000 Subject: [llvm-commits] [zorg] r125873 - in /zorg/trunk/llvmlab/llvmlab/ui: app.py ci/ ci/__init__.py ci/views.py frontend/views.py templates/dashboard.html Message-ID: <20110218164119.B7EEF2A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:41:19 2011 New Revision: 125873 URL: http://llvm.org/viewvc/llvm-project?rev=125873&view=rev Log: llvmlab: Sketch a new CI module for the lab dashboard. Added: zorg/trunk/llvmlab/llvmlab/ui/ci/ zorg/trunk/llvmlab/llvmlab/ui/ci/__init__.py zorg/trunk/llvmlab/llvmlab/ui/ci/views.py zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125873&r1=125872&r2=125873&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:41:19 2011 @@ -5,6 +5,7 @@ import llvmlab.data import llvmlab.user +from llvmlab.ui.ci.views import ci as ci_views from llvmlab.ui.frontend.views import frontend as frontend_views class App(flask.Flask): @@ -20,6 +21,7 @@ app.load_data(data) # Load the application routes. + app.register_module(ci_views) app.register_module(frontend_views) return app Added: zorg/trunk/llvmlab/llvmlab/ui/ci/__init__.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/ci/__init__.py?rev=125873&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/ci/__init__.py (added) +++ zorg/trunk/llvmlab/llvmlab/ui/ci/__init__.py Fri Feb 18 10:41:19 2011 @@ -0,0 +1 @@ +__all__ = [] Added: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/ci/views.py?rev=125873&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/ci/views.py (added) +++ zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Fri Feb 18 10:41:19 2011 @@ -0,0 +1,15 @@ +import flask +from flask import abort +from flask import redirect +from flask import render_template +from flask import request +from flask import session +from flask import url_for +from flask import current_app +ci = flask.Module(__name__, url_prefix='/ci') +print __name__ + + at ci.route('/') +def dashboard(): + return render_template("dashboard.html") + Modified: zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py?rev=125873&r1=125872&r2=125873&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py Fri Feb 18 10:41:19 2011 @@ -6,8 +6,7 @@ from flask import session from flask import url_for from flask import current_app -from flask import Module -frontend = Module(__name__) +frontend = flask.Module(__name__) @frontend.route('/') def index(): Added: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125873&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (added) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:41:19 2011 @@ -0,0 +1,7 @@ +{% extends "layout.html" %} +{% block title %}dashboard{% endblock %} +{% block body %} + +Welcome to the LLVM Lab Dashboard! + +{% endblock %} From daniel at zuster.org Fri Feb 18 10:41:15 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:41:15 -0000 Subject: [llvm-commits] [zorg] r125872 - in /zorg/trunk/llvmlab/llvmlab/ui: app.py frontend/ frontend/__init__.py frontend/views.py views.py Message-ID: <20110218164115.7CBB82A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:41:15 2011 New Revision: 125872 URL: http://llvm.org/viewvc/llvm-project?rev=125872&view=rev Log: llvmlab: Sink views into a separate module. Added: zorg/trunk/llvmlab/llvmlab/ui/frontend/ zorg/trunk/llvmlab/llvmlab/ui/frontend/__init__.py zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py - copied, changed from r125871, zorg/trunk/llvmlab/llvmlab/ui/views.py Removed: zorg/trunk/llvmlab/llvmlab/ui/views.py Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125872&r1=125871&r2=125872&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:41:15 2011 @@ -5,7 +5,7 @@ import llvmlab.data import llvmlab.user -import llvmlab.ui.views +from llvmlab.ui.frontend.views import frontend as frontend_views class App(flask.Flask): @staticmethod @@ -20,7 +20,7 @@ app.load_data(data) # Load the application routes. - app.register_module(llvmlab.ui.views.ui) + app.register_module(frontend_views) return app Added: zorg/trunk/llvmlab/llvmlab/ui/frontend/__init__.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/frontend/__init__.py?rev=125872&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/frontend/__init__.py (added) +++ zorg/trunk/llvmlab/llvmlab/ui/frontend/__init__.py Fri Feb 18 10:41:15 2011 @@ -0,0 +1 @@ +__all__ = [] Copied: zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py (from r125871, zorg/trunk/llvmlab/llvmlab/ui/views.py) URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py?p2=zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py&p1=zorg/trunk/llvmlab/llvmlab/ui/views.py&r1=125871&r2=125872&rev=125872&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/views.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py Fri Feb 18 10:41:15 2011 @@ -7,21 +7,21 @@ from flask import url_for from flask import current_app from flask import Module -ui = Module(__name__) +frontend = Module(__name__) - at ui.route('/') + at frontend.route('/') def index(): return render_template("index.html") - at ui.route('/favicon.ico') + at frontend.route('/favicon.ico') def favicon_ico(): return redirect(url_for('.static', filename='favicon.ico')) - at ui.route('/users') + at frontend.route('/users') def users(): return render_template("users.html") - at ui.route('/user/') + at frontend.route('/user/') def user(username): user = current_app.config.data.users.get(username) if user is None: @@ -29,7 +29,7 @@ return render_template("user.html", user=user) - at ui.route('/login', methods=['GET', 'POST']) + at frontend.route('/login', methods=['GET', 'POST']) def login(): # If this isn't a post request, return the login template. if request.method != 'POST': @@ -47,7 +47,7 @@ flask.flash('You were logged in as "%s"!' % username) return redirect(url_for("index")) - at ui.route('/logout') + at frontend.route('/logout') def logout(): session.pop('logged_in', None) session.pop('active_user', None) Removed: zorg/trunk/llvmlab/llvmlab/ui/views.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/views.py?rev=125871&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/views.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/views.py (removed) @@ -1,55 +0,0 @@ -import flask -from flask import abort -from flask import redirect -from flask import render_template -from flask import request -from flask import session -from flask import url_for -from flask import current_app -from flask import Module -ui = Module(__name__) - - at ui.route('/') -def index(): - return render_template("index.html") - - at ui.route('/favicon.ico') -def favicon_ico(): - return redirect(url_for('.static', filename='favicon.ico')) - - at ui.route('/users') -def users(): - return render_template("users.html") - - at ui.route('/user/') -def user(username): - user = current_app.config.data.users.get(username) - if user is None: - abort(404) - - return render_template("user.html", user=user) - - at ui.route('/login', methods=['GET', 'POST']) -def login(): - # If this isn't a post request, return the login template. - if request.method != 'POST': - return render_template("login.html", error=None) - - # Authenticate the user. - username = request.form['username'] - if not current_app.authenticate_login(username, request.form['password']): - return render_template("login.html", - error="Invalid login") - - # Log the user in. - session['logged_in'] = True - session['active_user'] = username - flask.flash('You were logged in as "%s"!' % username) - return redirect(url_for("index")) - - at ui.route('/logout') -def logout(): - session.pop('logged_in', None) - session.pop('active_user', None) - flask.flash('You were logged out!') - return redirect(url_for("index")) From daniel at zuster.org Fri Feb 18 10:41:22 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:41:22 -0000 Subject: [llvm-commits] [zorg] r125874 - /zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Message-ID: <20110218164122.7CD542A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:41:22 2011 New Revision: 125874 URL: http://llvm.org/viewvc/llvm-project?rev=125874&view=rev Log: llvmlab: Fill in dashboard sketch. Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125874&r1=125873&r2=125874&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:41:22 2011 @@ -2,6 +2,142 @@ {% block title %}dashboard{% endblock %} {% block body %} -Welcome to the LLVM Lab Dashboard! +
Welcome to the LLVM Lab Dashboard!
+ +
+The most recent validate revision is
+ r122966
+validated at:
+ 2011-06-01 10:34
+(available below). + +
+The tree is currently: open. + +
+ +WARNING! LLVM is currently failing the Living On checks. The tree +will close in 35 minutes! + + + + +
Current Status
+ + +{# The traffic light... #} +
User Name User Email
Users
ID Name Email
{{ + user.id }} {{ user.name }} {{ user.email }}
+ + + + + + + + +
Sanity
(Phase 1) Living On
(Phase 2) Tree Health
(Phase 3) Validation
(Phase 4)
+ +
+ +{# The results table... #} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Result Type Phase 1 Phase 2 Phase 3 Phase 4
Current --- --- --- ---
Last Completed --- --- --- ---
First Failing --- --- --- ---
Last Working --- --- --- ---
+ + +{# The builds archive table... #} + +
Latest Release
+ + +
+The latest released sources are available here: llvm-rNNNNNN. + +
+Binary packages of the latest release: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Product OS Arch Archive
LLVM Linux i386 llvm-linux-i386.tgz
Mac OS X (SnowLeopard) x86_64 llvm-darwin10-x86_64.tgz
Clang Linux i386 clang-linux-i386.tgz
Mac OS X (SnowLeopard) x86_64 clang-darwin10-x86_64.tgz
Windows i386 clang-windows-i386.tgz
llvm-gcc 4.2 Linux i386 llvm-gcc-4.2-linux-i386.tgz
Linux x86_64 llvm-gcc-4.2-linux-x86_64.tgz
{% endblock %} From daniel at zuster.org Fri Feb 18 10:41:26 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:41:26 -0000 Subject: [llvm-commits] [zorg] r125875 - in /zorg/trunk/llvmlab/llvmlab/ui: static/green.png static/red.png static/white.png static/yellow.png templates/dashboard.html Message-ID: <20110218164126.B2CC32A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:41:26 2011 New Revision: 125875 URL: http://llvm.org/viewvc/llvm-project?rev=125875&view=rev Log: llvmlab: Sketch a bit more of the dashboard. Added: zorg/trunk/llvmlab/llvmlab/ui/static/green.png zorg/trunk/llvmlab/llvmlab/ui/static/red.png zorg/trunk/llvmlab/llvmlab/ui/static/white.png zorg/trunk/llvmlab/llvmlab/ui/static/yellow.png Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Added: zorg/trunk/llvmlab/llvmlab/ui/static/green.png URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/static/green.png?rev=125875&view=auto ============================================================================== Binary files zorg/trunk/llvmlab/llvmlab/ui/static/green.png (added) and zorg/trunk/llvmlab/llvmlab/ui/static/green.png Fri Feb 18 10:41:26 2011 differ Added: zorg/trunk/llvmlab/llvmlab/ui/static/red.png URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/static/red.png?rev=125875&view=auto ============================================================================== Binary files zorg/trunk/llvmlab/llvmlab/ui/static/red.png (added) and zorg/trunk/llvmlab/llvmlab/ui/static/red.png Fri Feb 18 10:41:26 2011 differ Added: zorg/trunk/llvmlab/llvmlab/ui/static/white.png URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/static/white.png?rev=125875&view=auto ============================================================================== Binary files zorg/trunk/llvmlab/llvmlab/ui/static/white.png (added) and zorg/trunk/llvmlab/llvmlab/ui/static/white.png Fri Feb 18 10:41:26 2011 differ Added: zorg/trunk/llvmlab/llvmlab/ui/static/yellow.png URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/static/yellow.png?rev=125875&view=auto ============================================================================== Binary files zorg/trunk/llvmlab/llvmlab/ui/static/yellow.png (added) and zorg/trunk/llvmlab/llvmlab/ui/static/yellow.png Fri Feb 18 10:41:26 2011 differ Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125875&r1=125874&r2=125875&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:41:26 2011 @@ -6,7 +6,7 @@
The most recent validate revision is
- r122966
+ r123456
validated at:
2011-06-01 10:34
(available below). @@ -35,6 +35,12 @@ Tree Health
(Phase 3) Validation
(Phase 4) + + + + + +
@@ -52,31 +58,31 @@ Current - --- - --- - --- - --- + r123485 + r123482 + (blocked) + (blocked) Last Completed - --- - --- - --- - --- + r123482 + r123477 + r123457 + r123456 First Failing - --- - --- - --- - --- + + r123475 + r123457 + Last Working - --- - --- - --- - --- + r123456 + r123456 + r123456 + r123456 From daniel at zuster.org Fri Feb 18 10:41:32 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:41:32 -0000 Subject: [llvm-commits] [zorg] r125877 - /zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Message-ID: <20110218164132.B25BD2A6C12E@llvm.org> Author: ddunbar Date: Fri Feb 18 10:41:32 2011 New Revision: 125877 URL: http://llvm.org/viewvc/llvm-project?rev=125877&view=rev Log: llvmlab: Tweak dashboard to be a more realistic mockup. Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125877&r1=125876&r2=125877&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:41:32 2011 @@ -79,8 +79,8 @@ Last Working - r123456 - r123456 + r123482 + r123473 r123456 r123456 From daniel at zuster.org Fri Feb 18 10:41:29 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:41:29 -0000 Subject: [llvm-commits] [zorg] r125876 - in /zorg/trunk/llvmlab/llvmlab/ui/templates: dashboard.html dashboard_popup.html Message-ID: <20110218164129.DC0312A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:41:29 2011 New Revision: 125876 URL: http://llvm.org/viewvc/llvm-project?rev=125876&view=rev Log: llvmlab: Sketch template for a dashboard phase pop-up. Added: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard_popup.html Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125876&r1=125875&r2=125876&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:41:29 2011 @@ -5,7 +5,7 @@
Welcome to the LLVM Lab Dashboard!

-The most recent validate revision is
+The most recent released revision is
r123456
validated at:
2011-06-01 10:34
@@ -146,4 +146,8 @@ +
Example Phase Popups
+ +{% include "dashboard_popup.html" %} + {% endblock %} Added: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard_popup.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard_popup.html?rev=125876&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard_popup.html (added) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard_popup.html Fri Feb 18 10:41:29 2011 @@ -0,0 +1,11 @@ +{# Fragment template for rendering an individual phase pop-up #} +
Phase 4 - r123456
+ + + + + + + + +
Builder Status
clang-i386-darwin10-RA-fnt PASS
clang-x86_64-darwin10-RA-fnt PASS
clang-i386-linux-RA-fnt PASS
clang-x86_64-linux-RA-fnt PASS
From daniel at zuster.org Fri Feb 18 10:41:35 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:41:35 -0000 Subject: [llvm-commits] [zorg] r125878 - in /zorg/trunk/llvmlab/llvmlab/ci: ./ __init__.py config.py Message-ID: <20110218164135.892B42A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:41:35 2011 New Revision: 125878 URL: http://llvm.org/viewvc/llvm-project?rev=125878&view=rev Log: llvmlab: Start sketching Config object for representing how the lab is currently configured. Added: zorg/trunk/llvmlab/llvmlab/ci/ zorg/trunk/llvmlab/llvmlab/ci/__init__.py zorg/trunk/llvmlab/llvmlab/ci/config.py Added: zorg/trunk/llvmlab/llvmlab/ci/__init__.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/__init__.py?rev=125878&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/__init__.py (added) +++ zorg/trunk/llvmlab/llvmlab/ci/__init__.py Fri Feb 18 10:41:35 2011 @@ -0,0 +1 @@ +__all__ = [] Added: zorg/trunk/llvmlab/llvmlab/ci/config.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/config.py?rev=125878&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/config.py (added) +++ zorg/trunk/llvmlab/llvmlab/ci/config.py Fri Feb 18 10:41:35 2011 @@ -0,0 +1,118 @@ +""" +Configuration information for the CI infrastructure, for use by the dashboard. +""" + +from llvmlab import util + +class Phase(util.simple_repr_mixin): + """ + A Phase object represents a single phase of the CI process, which is + essentially a name for a group of builders which get reported in aggregate. + """ + + @staticmethod + def fromdata(data): + version = data['version'] + if version != 0: + raise ValueError, "Unknown version" + + return Phase(data['name'], data['number'], data['builder_names']) + + def todata(self): + return { 'version' : 0, + 'name' : self.name, + 'number' : self.number, + 'builder_names' : self.builder_names} + + def __init__(self, name, number, builder_names): + self.name = name + self.number = number + self.builder_names = builder_names + + +class Builder(util.simple_repr_mixin): + """ + A Builder object stores information for an individual builder which + participates in some phase. + """ + + @staticmethod + def fromdata(data): + version = data['version'] + if version != 0: + raise ValueError, "Unknown version" + + return Builder(data['name']) + + def todata(self): + return { 'version' : 0, + 'name' : self.name } + + def __init__(self, name): + self.name = name + + +class PublishedBuild(util.simple_repr_mixin): + """ + A PublishedBuild records what artifacts we publicize on the primary + dashboard home page. + """ + + @staticmethod + def fromdata(data): + version = data['version'] + if version != 0: + raise ValueError, "Unknown version" + + return PublishedBuild(data['product'], data['os'], + data['arch'], data['archive_name']) + + def todata(self): + return { 'version' : 0, + 'product' : self.product, + 'os' : self.os, + 'arch' : self.arch, + 'archive_name' : self.archive_name } + + def __init__(self, product, os, arch, archive_name): + self.product = product + self.os = os + self.arch = arch + self.archive_name = archive_name + + +class Config(util.simple_repr_mixin): + """ + The Config object holds the current representation of the lab CI + organization. + """ + + # FIXME: How much do we care about dealing with having the dashboard react + # to changes in the CIConfig? Might get messy... + + @staticmethod + def fromdata(data): + version = data['version'] + if version != 0: + raise ValueError, "Unknown version" + + return Config([Phases.fromdata(item) + for item in data['phases']], + [Builder.fromdata(item) + for item in data['builders']], + [PublishedBuild.fromdata(item) + for item in data['published_builds']]) + + def todata(self): + return { 'version' : 0, + 'phases' : [item.todata() + for item in self.phases], + 'builders' : [item.todata() + for item in self.builders], + 'published_builds' : [item.todata() + for item in self.published_builds] } + + def __init__(self, phases, builders, published_builds): + self.phases = phases + self.builders = builders + self.published_builds = published_builds From daniel at zuster.org Fri Feb 18 10:41:38 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:41:38 -0000 Subject: [llvm-commits] [zorg] r125879 - in /zorg/trunk/llvmlab/llvmlab/ui: ci/views.py templates/dashboard.html Message-ID: <20110218164138.D24172A6C12F@llvm.org> Author: ddunbar Date: Fri Feb 18 10:41:38 2011 New Revision: 125879 URL: http://llvm.org/viewvc/llvm-project?rev=125879&view=rev Log: llvmlab: Start sketching a hard-coded instance of the Config object, and migrate dashboard to using the actual Config. Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/ci/views.py?rev=125879&r1=125878&r2=125879&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/ci/views.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Fri Feb 18 10:41:38 2011 @@ -7,9 +7,25 @@ from flask import url_for from flask import current_app ci = flask.Module(__name__, url_prefix='/ci') -print __name__ + +from llvmlab.ci import config + +# Hard-coded current configuration. +# +# FIXME: Figure out how to get as much of this as possible dynamically. One +# problem is how do we deal with changes to the CI infrastructure? Should we +# load a config object per-revision, and try to be smart about caching it unless +# things change? Can we report results across changing configs? +phases = [ + config.Phase("Sanity", 1, []), + config.Phase("Living On", 2, []), + config.Phase("Tree Health", 3, []), + config.Phase("Validation", 4, [])] +builders = [] +published_builds = [] +g_config = config.Config(phases, builders, published_builds) @ci.route('/') def dashboard(): - return render_template("dashboard.html") + return render_template("dashboard.html", ci_config=g_config) Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125879&r1=125878&r2=125879&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:41:38 2011 @@ -30,10 +30,9 @@ - Sanity
(Phase 1) - Living On
(Phase 2) - Tree Health
(Phase 3) - Validation
(Phase 4) + {% for phase in ci_config.phases %} + {{ phase.name }}
(Phase {{ phase.number }}) + {% endfor %} @@ -50,10 +49,9 @@ Result Type - Phase 1 - Phase 2 - Phase 3 - Phase 4 + {% for phase in ci_config.phases %} + Phase {{ phase.number }} + {% endfor %} From daniel at zuster.org Fri Feb 18 10:41:47 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:41:47 -0000 Subject: [llvm-commits] [zorg] r125882 - /zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Message-ID: <20110218164147.90DC22A6C12E@llvm.org> Author: ddunbar Date: Fri Feb 18 10:41:47 2011 New Revision: 125882 URL: http://llvm.org/viewvc/llvm-project?rev=125882&view=rev Log: llvmlab: Fill in builder lists for each phase. Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/ci/views.py?rev=125882&r1=125881&r2=125882&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/ci/views.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Fri Feb 18 10:41:47 2011 @@ -17,10 +17,22 @@ # load a config object per-revision, and try to be smart about caching it unless # things change? Can we report results across changing configs? phases = [ - config.Phase("Sanity", 1, []), - config.Phase("Living On", 2, []), - config.Phase("Tree Health", 3, []), - config.Phase("Validation", 4, [])] + config.Phase("Sanity", 1, ["clang-x86_64-osx10-gcc42-RA"]), + config.Phase("Living On", 2, ["clang-x86_64-osx10-DA", + "clang-x86_64-osx10-RA", + "nightly_clang-x86_64-osx10-gcc42-RA"]), + config.Phase("Tree Health", 3, ["nightly_clang-x86_64-osx10-DA", + "nightly_clang-x86_64-osx10-RA", + "nightly_clang-x86_64-osx10-RA-O0", + "nightly_clang-x86_64-osx10-RA-Os", + "nightly_clang-x86_64-osx10-RA-O3", + "nightly_clang-x86_64-osx10-RA-flto", + "nightly_clang-x86_64-osx10-RA-g"]), + config.Phase("Validation", 4, ["clang-x86_64-osx10-RA-stage3", + "gccTestSuite-clang-x86_64-osx10-RA", + "nightly_clang-x86_64-osx10-RA-stage3-g", + "libcxx-clang-x86_64-osx10-RA", + "boost-trunk-clang-x86_64-osx10-RA"])] builders = [ config.Builder("clang-x86_64-osx10-gcc42-RA"), config.Builder("clang-x86_64-osx10-DA"), From daniel at zuster.org Fri Feb 18 10:41:41 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:41:41 -0000 Subject: [llvm-commits] [zorg] r125880 - in /zorg/trunk/llvmlab/llvmlab/ui: ci/views.py templates/dashboard.html Message-ID: <20110218164142.005502A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:41:41 2011 New Revision: 125880 URL: http://llvm.org/viewvc/llvm-project?rev=125880&view=rev Log: llvmlab: Continue sketching published builds part of hard-coded instance of the Config object (with dashboard support). Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/ci/views.py?rev=125880&r1=125879&r2=125880&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/ci/views.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Fri Feb 18 10:41:41 2011 @@ -22,7 +22,22 @@ config.Phase("Tree Health", 3, []), config.Phase("Validation", 4, [])] builders = [] -published_builds = [] +published_builds = [ + config.PublishedBuild("LLVM", "Linux", "i386", "llvm-linux-i386.tgz"), + config.PublishedBuild("LLVM", "Mac OS X (SnowLeopard)", "x86_64", + "llvm-darwin10-x86_64.tgz"), + + config.PublishedBuild("Clang", "Linux", "i386", "clang-linux-i386.tgz"), + config.PublishedBuild("Clang", "Linux", "x86_64", "clang-linux-x86_64.tgz"), + config.PublishedBuild("Clang", "Mac OS X (SnowLeopard)", "x86_64", + "clang-darwin10-x86_64.tgz"), + config.PublishedBuild("Clang", "Windows", "i386", "clang-windows-i386.tgz"), + + config.PublishedBuild("llvm-gcc-4.2", "Linux", "i386", + "llvm-gcc-4.2-linux-i386.tgz"), + config.PublishedBuild("llvm-gcc-4.2", "Linux", "x86_64", + "llvm-gcc-4.2-linux-x86_64.tgz"), + ] g_config = config.Config(phases, builders, published_builds) @ci.route('/') Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125880&r1=125879&r2=125880&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:41:41 2011 @@ -104,44 +104,16 @@ Archive + + {% for build in ci_config.published_builds %} - LLVM - Linux - i386 - llvm-linux-i386.tgz - - - Mac OS X (SnowLeopard) - x86_64 - llvm-darwin10-x86_64.tgz - - - Clang - Linux - i386 - clang-linux-i386.tgz - - - Mac OS X (SnowLeopard) - x86_64 - clang-darwin10-x86_64.tgz - - - Windows - i386 - clang-windows-i386.tgz - - - llvm-gcc 4.2 - Linux - i386 - llvm-gcc-4.2-linux-i386.tgz - - - Linux - x86_64 - llvm-gcc-4.2-linux-x86_64.tgz + {{ build.product }} + {{ build.os }} + {{ build.arch }} + {{ + build.archive_name }} + {% endfor %}
Example Phase Popups
From daniel at zuster.org Fri Feb 18 10:41:44 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:41:44 -0000 Subject: [llvm-commits] [zorg] r125881 - /zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Message-ID: <20110218164144.B07832A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:41:44 2011 New Revision: 125881 URL: http://llvm.org/viewvc/llvm-project?rev=125881&view=rev Log: llvmlab: Fill in builders list in hardcoded Config. Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/ci/views.py?rev=125881&r1=125880&r2=125881&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/ci/views.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Fri Feb 18 10:41:44 2011 @@ -21,7 +21,23 @@ config.Phase("Living On", 2, []), config.Phase("Tree Health", 3, []), config.Phase("Validation", 4, [])] -builders = [] +builders = [ + config.Builder("clang-x86_64-osx10-gcc42-RA"), + config.Builder("clang-x86_64-osx10-DA"), + config.Builder("clang-x86_64-osx10-RA"), + config.Builder("nightly_clang-x86_64-osx10-gcc42-RA"), + config.Builder("nightly_clang-x86_64-osx10-DA"), + config.Builder("nightly_clang-x86_64-osx10-RA"), + config.Builder("nightly_clang-x86_64-osx10-RA-O0"), + config.Builder("nightly_clang-x86_64-osx10-RA-Os"), + config.Builder("nightly_clang-x86_64-osx10-RA-O3"), + config.Builder("nightly_clang-x86_64-osx10-RA-flto"), + config.Builder("nightly_clang-x86_64-osx10-RA-g"), + config.Builder("clang-x86_64-osx10-RA-stage3"), + config.Builder("gccTestSuite-clang-x86_64-osx10-RA"), + config.Builder("nightly_clang-x86_64-osx10-RA-stage3-g"), + config.Builder("libcxx-clang-x86_64-osx10-RA"), + config.Builder("boost-trunk-clang-x86_64-osx10-RA")] published_builds = [ config.PublishedBuild("LLVM", "Linux", "i386", "llvm-linux-i386.tgz"), config.PublishedBuild("LLVM", "Mac OS X (SnowLeopard)", "x86_64", @@ -36,8 +52,7 @@ config.PublishedBuild("llvm-gcc-4.2", "Linux", "i386", "llvm-gcc-4.2-linux-i386.tgz"), config.PublishedBuild("llvm-gcc-4.2", "Linux", "x86_64", - "llvm-gcc-4.2-linux-x86_64.tgz"), - ] + "llvm-gcc-4.2-linux-x86_64.tgz")] g_config = config.Config(phases, builders, published_builds) @ci.route('/') From daniel at zuster.org Fri Feb 18 10:41:51 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:41:51 -0000 Subject: [llvm-commits] [zorg] r125883 - in /zorg/trunk/llvmlab/llvmlab: ci/config.py ui/ci/views.py Message-ID: <20110218164151.3147A2A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:41:51 2011 New Revision: 125883 URL: http://llvm.org/viewvc/llvm-project?rev=125883&view=rev Log: llvmlab: Phase config objects should also track the associated builder. Modified: zorg/trunk/llvmlab/llvmlab/ci/config.py zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Modified: zorg/trunk/llvmlab/llvmlab/ci/config.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/config.py?rev=125883&r1=125882&r2=125883&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/config.py (original) +++ zorg/trunk/llvmlab/llvmlab/ci/config.py Fri Feb 18 10:41:51 2011 @@ -16,17 +16,20 @@ if version != 0: raise ValueError, "Unknown version" - return Phase(data['name'], data['number'], data['builder_names']) + return Phase(data['name'], data['number'], + data['phase_builder'], data['builder_names']) def todata(self): return { 'version' : 0, 'name' : self.name, 'number' : self.number, + 'phase_builder' : self.phase_builder, 'builder_names' : self.builder_names} - def __init__(self, name, number, builder_names): + def __init__(self, name, number, phase_builder, builder_names): self.name = name self.number = number + self.phase_builder = phase_builder self.builder_names = builder_names Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/ci/views.py?rev=125883&r1=125882&r2=125883&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/ci/views.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Fri Feb 18 10:41:51 2011 @@ -17,23 +17,32 @@ # load a config object per-revision, and try to be smart about caching it unless # things change? Can we report results across changing configs? phases = [ - config.Phase("Sanity", 1, ["clang-x86_64-osx10-gcc42-RA"]), - config.Phase("Living On", 2, ["clang-x86_64-osx10-DA", - "clang-x86_64-osx10-RA", - "nightly_clang-x86_64-osx10-gcc42-RA"]), - config.Phase("Tree Health", 3, ["nightly_clang-x86_64-osx10-DA", - "nightly_clang-x86_64-osx10-RA", - "nightly_clang-x86_64-osx10-RA-O0", - "nightly_clang-x86_64-osx10-RA-Os", - "nightly_clang-x86_64-osx10-RA-O3", - "nightly_clang-x86_64-osx10-RA-flto", - "nightly_clang-x86_64-osx10-RA-g"]), - config.Phase("Validation", 4, ["clang-x86_64-osx10-RA-stage3", - "gccTestSuite-clang-x86_64-osx10-RA", - "nightly_clang-x86_64-osx10-RA-stage3-g", - "libcxx-clang-x86_64-osx10-RA", - "boost-trunk-clang-x86_64-osx10-RA"])] + config.Phase("Sanity", 1, "phase1 - sanity", + ["clang-x86_64-osx10-gcc42-RA"]), + config.Phase("Living On", 2, "phase2 - living", + ["clang-x86_64-osx10-DA", + "clang-x86_64-osx10-RA", + "nightly_clang-x86_64-osx10-gcc42-RA"]), + config.Phase("Tree Health", 3, "phase3 - tree health", + ["nightly_clang-x86_64-osx10-DA", + "nightly_clang-x86_64-osx10-RA", + "nightly_clang-x86_64-osx10-RA-O0", + "nightly_clang-x86_64-osx10-RA-Os", + "nightly_clang-x86_64-osx10-RA-O3", + "nightly_clang-x86_64-osx10-RA-flto", + "nightly_clang-x86_64-osx10-RA-g"]), + config.Phase("Validation", 4, "phase4 - validation", + ["clang-x86_64-osx10-RA-stage3", + "gccTestSuite-clang-x86_64-osx10-RA", + "nightly_clang-x86_64-osx10-RA-stage3-g", + "libcxx-clang-x86_64-osx10-RA", + "boost-trunk-clang-x86_64-osx10-RA"])] builders = [ + config.Builder("Validated Build"), + config.Builder("phase1 - sanity"), + config.Builder("phase2 - living"), + config.Builder("phase3 - tree health"), + config.Builder("phase4 - validation"), config.Builder("clang-x86_64-osx10-gcc42-RA"), config.Builder("clang-x86_64-osx10-DA"), config.Builder("clang-x86_64-osx10-RA"), From daniel at zuster.org Fri Feb 18 10:42:07 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:42:07 -0000 Subject: [llvm-commits] [zorg] r125889 - /zorg/trunk/llvmlab/llvmlab/data.py Message-ID: <20110218164207.E65DB2A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:42:07 2011 New Revision: 125889 URL: http://llvm.org/viewvc/llvm-project?rev=125889&view=rev Log: llvmlab.data: Fix typo. Modified: zorg/trunk/llvmlab/llvmlab/data.py Modified: zorg/trunk/llvmlab/llvmlab/data.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/data.py?rev=125889&r1=125888&r2=125889&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/data.py (original) +++ zorg/trunk/llvmlab/llvmlab/data.py Fri Feb 18 10:42:07 2011 @@ -23,8 +23,8 @@ 'users' : [item.todata() for item in self.users.values() if item is not self.admin_user], - 'machine' : [item.todata() - for item in self.machines.values()] } + 'machines' : [item.todata() + for item in self.machines.values()] } def __init__(self, users, machines): self.users = dict((item.id, item) for item in users) @@ -38,4 +38,3 @@ self.admin_user = user self.users[user.id] = user - From daniel at zuster.org Fri Feb 18 10:42:13 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:42:13 -0000 Subject: [llvm-commits] [zorg] r125891 - /zorg/trunk/llvmlab/llvmlab/ui/app.py Message-ID: <20110218164213.7A9F92A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:42:13 2011 New Revision: 125891 URL: http://llvm.org/viewvc/llvm-project?rev=125891&view=rev Log: llvmlab.ui.app: Add support for loading a particular config path, and save support. Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125891&r1=125890&r2=125891&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:42:13 2011 @@ -10,12 +10,16 @@ class App(flask.Flask): @staticmethod - def create_standalone(config = None, data = None): + def create_standalone(config = None, data = None, config_path = None): + if config_path is not None: + assert config is None + assert data is None + # Construct the application. app = App(__name__) # Load the application configuration. - app.load_config(config) + app.load_config(config, config_path) # Load the database. app.load_data(data) @@ -51,8 +55,11 @@ def __init__(self, name): super(App, self).__init__(name) - def load_config(self, config = None): - if config is None: + def load_config(self, config = None, config_path = None): + if config_path is not None: + # Load the configuration file. + self.config.from_pyfile(os.path.abspath(config_path)) + elif config is None: # Load the configuration file. self.config.from_envvar("LLVMLAB_CONFIG") else: @@ -84,6 +91,12 @@ self.config.data = data + def save_data(self): + file = open(self.config["DATA_PATH"], 'w') + flask.json.dump(self.config.data.todata(), file, indent=2) + print >>file + file.close() + def authenticate_login(self, username, password): passhash = hashlib.sha256( password + self.config["SECRET_KEY"]).hexdigest() From daniel at zuster.org Fri Feb 18 10:42:10 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:42:10 -0000 Subject: [llvm-commits] [zorg] r125890 - in /zorg/trunk/llvmlab/llvmlab: ui/app.py user.py Message-ID: <20110218164210.B62602A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:42:10 2011 New Revision: 125890 URL: http://llvm.org/viewvc/llvm-project?rev=125890&view=rev Log: llvmlab.user: Add SVN login field. Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py zorg/trunk/llvmlab/llvmlab/user.py Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125890&r1=125889&r2=125890&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:42:10 2011 @@ -79,7 +79,8 @@ id = self.config['ADMIN_LOGIN'], passhash = self.config['ADMIN_PASSHASH'], name = self.config['ADMIN_NAME'], - email = self.config['ADMIN_EMAIL'])) + email = self.config['ADMIN_EMAIL'], + htpasswd = None)) self.config.data = data Modified: zorg/trunk/llvmlab/llvmlab/user.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/user.py?rev=125890&r1=125889&r2=125890&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/user.py (original) +++ zorg/trunk/llvmlab/llvmlab/user.py Fri Feb 18 10:42:10 2011 @@ -12,17 +12,20 @@ raise ValueError, "Unknown version" return User(data['id'], data['passhash'], - data['name'], data['email']) + data['name'], data['email'], + data['htpasswd']) def todata(self): return { 'version' : 0, 'id' : self.id, 'passhash' : self.passhash, 'name' : self.name, - 'email' : self.email } + 'email' : self.email, + 'htpasswd' : self.htpasswd } - def __init__(self, id, passhash, name, email): + def __init__(self, id, passhash, name, email, htpasswd): self.id = id self.passhash = passhash self.name = name self.email = email + self.htpasswd = htpasswd From daniel at zuster.org Fri Feb 18 10:42:16 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:42:16 -0000 Subject: [llvm-commits] [zorg] r125892 - in /zorg/trunk/llvmlab/llvmlab: TODO.txt llvmlabtool/main.py Message-ID: <20110218164216.2EDD32A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:42:16 2011 New Revision: 125892 URL: http://llvm.org/viewvc/llvm-project?rev=125892&view=rev Log: llvmlab: Add a 'import-users' tool, which migrates in users from SVN. Modified: zorg/trunk/llvmlab/llvmlab/TODO.txt zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py Modified: zorg/trunk/llvmlab/llvmlab/TODO.txt URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/TODO.txt?rev=125892&r1=125891&r2=125892&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/TODO.txt (original) +++ zorg/trunk/llvmlab/llvmlab/TODO.txt Fri Feb 18 10:42:16 2011 @@ -27,3 +27,6 @@ ===== - Dashboard + + o Dashboard could be super fancy and push status updates to logged in users + (i.e., "you are on the blame list here") Modified: zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py?rev=125892&r1=125891&r2=125892&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py (original) +++ zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py Fri Feb 18 10:42:16 2011 @@ -8,6 +8,26 @@ import flask import llvmlab.data +import llvmlab.user +import llvmlab.ui.app + +def note(message): + print >>sys.stderr,"note: %s" % message +def warning(message): + print >>sys.stderr,"warning: %s" % message + +def sorted(items): + items = list(items) + items.sort() + return items +def split_name_and_email(str): + if (str.count('<') != 1 or + str.count('>') != 1 or + not str.endswith('>')): + raise ValueError,"Don't know how to parse: %r" % (str,) + + lhs,rhs = str[:-1].split("<") + return lhs.strip(), rhs.strip() def action_create(name, args): """create a llvmlab installation""" @@ -94,19 +114,99 @@ import llvmlab from optparse import OptionParser, OptionGroup - parser = OptionParser("%%prog %s [options] " % name) + parser = OptionParser("%%prog %s [options]" % name) (opts, args) = parser.parse_args(args) if len(args) != 0: parser.error("invalid number of arguments") - from llvmlab.ui import app - instance = app.App.create_standalone() + instance = llvmlab.ui.app.App.create_standalone() instance.run() +def action_import_users(name, args): + """import users from SVN information""" + + import llvmlab + import ConfigParser + from optparse import OptionParser, OptionGroup + parser = OptionParser("""\ +%%prog %s [options] + +This command imports user information from the llvm.org SVN information. It will +add any users who are not present in the lab.llvm.org database, and import their +name, email, and SVN login information.\ +""" % name) + (opts, args) = parser.parse_args(args) + + if len(args) != 3: + parser.error("invalid number of arguments") + + config_path, svn_mailer_path, svn_htpasswd_path = args + + # Load the app object. + instance = llvmlab.ui.app.App.create_standalone(config_path = config_path) + data = instance.config.data + + # Load the SVN mailer config. + parser = ConfigParser.RawConfigParser() + parser.read(svn_mailer_path) + + # Load the SVN htpasswd file. + file = open(svn_htpasswd_path) + svn_htpasswd = {} + for ln in file: + if ln.strip(): + user,htpasswd,module = ln.split(":") + svn_htpasswd[user] = (htpasswd, module) + file.close() + + # Validate that the authors list and the htpasswd list coincide. + svn_authors = dict((author, parser.get("authors", author)) + for author in parser.options("authors")) + for id in set(svn_authors) - set(svn_htpasswd): + warning("svn mailer authors contains user without htpasswd: %r " % id) + for id in set(svn_htpasswd) - set(svn_authors): + warning("svn contains passwd but no mailer entry: %r " % id) + + # Add user entries for any missing users. + for id in sorted(set(svn_authors) & set(svn_htpasswd)): + name,email = split_name_and_email(svn_authors[id]) + htpasswd = svn_htpasswd[id][0] + passhash = hashlib.sha256( + htpasswd + instance.config['SECRET_KEY']).hexdigest() + + # Lookup the user entry. + user = data.users.get(id) + + # Never allow modifying the admin user. + if user is data.admin_user: + warning("ignore %r, is the admin user!" % id) + continue + + # Create the user if missing. + if user is None: + # Use the users htpasswd (itself) as the initial password. + user = data.users[id] = llvmlab.user.User(id, passhash, name, + email, htpasswd) + note("added user %r" % id) + continue + + # Otherwise, update the users info if necessary. + for kind,new,old in (('name', name, user.name), + ('email', email, user.email), + ('htpasswd', htpasswd, user.htpasswd)): + if new != old: + note("changed %r %s from %r to %r" % ( + id, kind, old, new)) + setattr(user, kind, new) + + # Save the instance data. + instance.save_data() + ### -commands = dict((name[7:], f) for name,f in locals().items() +commands = dict((name[7:].replace("_","-"), f) + for name,f in locals().items() if name.startswith('action_')) def usage(): From daniel at zuster.org Fri Feb 18 10:42:19 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:42:19 -0000 Subject: [llvm-commits] [zorg] r125893 - /zorg/trunk/llvmlab/llvmlab/ui/templates/users.html Message-ID: <20110218164219.113412A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:42:18 2011 New Revision: 125893 URL: http://llvm.org/viewvc/llvm-project?rev=125893&view=rev Log: llvmlab: Sort users lists. Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/users.html Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/users.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/users.html?rev=125893&r1=125892&r2=125893&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/users.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/users.html Fri Feb 18 10:42:18 2011 @@ -13,10 +13,9 @@ Users IDNameEmail -{% for user in config.data.users.values() %} +{% for id,user in config.data.users|dictsort %} - {{ - user.id }} + {{ id }} {{ user.name }} {{ user.email }} From daniel at zuster.org Fri Feb 18 10:42:24 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:42:24 -0000 Subject: [llvm-commits] [zorg] r125895 - /zorg/trunk/llvmlab/llvmlab/ui/templates/index.html Message-ID: <20110218164224.8B7262A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:42:24 2011 New Revision: 125895 URL: http://llvm.org/viewvc/llvm-project?rev=125895&view=rev Log: llvmlab: Sketch a remarkably ugly home page. Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/index.html Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/index.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/index.html?rev=125895&r1=125894&r2=125895&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/index.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/index.html Fri Feb 18 10:42:24 2011 @@ -2,6 +2,32 @@ {% block title %}home{% endblock %} {% block body %} -Ceci n'est pas un laboratoire. +
+
+
login
+
logout
+
users
+{% if session.logged_in %} +
my info
+{% endif %} +
dashboard
+
+
+ +
Welcome to the LLVM Laboratory!
+ +
The LLVM laboratory is a set of machines and software to support +the LLVM project, for use by LLVM developers and +community members.
+ +
Sponsors
+ +Access Softek: a software development and consulting company with a +specialization in compiler development, is pleased to help the LLVM development +effort by hosting the LLVM lab in its Berkeley office. + +For more information about us please take a look at our very out-of-date +website {{ "www.accesssoftek.com"|urlize }} and if you are +an LLVM developer passing through Berkeley, drop in and say hi.
{% endblock %} From daniel at zuster.org Fri Feb 18 10:42:30 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:42:30 -0000 Subject: [llvm-commits] [zorg] r125897 - in /zorg/trunk/llvmlab/llvmlab: data.py ui/frontend/views.py ui/templates/machines.html Message-ID: <20110218164230.B5A932A6C12F@llvm.org> Author: ddunbar Date: Fri Feb 18 10:42:30 2011 New Revision: 125897 URL: http://llvm.org/viewvc/llvm-project?rev=125897&view=rev Log: llvmlab: Add a machines page. Added: zorg/trunk/llvmlab/llvmlab/ui/templates/machines.html Modified: zorg/trunk/llvmlab/llvmlab/data.py zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py Modified: zorg/trunk/llvmlab/llvmlab/data.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/data.py?rev=125897&r1=125896&r2=125897&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/data.py (original) +++ zorg/trunk/llvmlab/llvmlab/data.py Fri Feb 18 10:42:30 2011 @@ -27,11 +27,10 @@ for item in self.machines.values()] } def __init__(self, users, machines): + self.machines = dict((item.id, item) for item in machines) self.users = dict((item.id, item) for item in users) self.admin_user = None - self.machines = dict((item.id, item) for item in machines) - def set_admin_user(self, user): if user.id in self.users: raise ValueError, "database contains admin user %r" % user.id Modified: zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py?rev=125897&r1=125896&r2=125897&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py Fri Feb 18 10:42:30 2011 @@ -16,6 +16,10 @@ def favicon_ico(): return redirect(url_for('.static', filename='favicon.ico')) + at frontend.route('/machines') +def machines(): + return render_template("machines.html") + @frontend.route('/users') def users(): return render_template("users.html") Added: zorg/trunk/llvmlab/llvmlab/ui/templates/machines.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/machines.html?rev=125897&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/machines.html (added) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/machines.html Fri Feb 18 10:42:30 2011 @@ -0,0 +1,27 @@ +{% extends "layout.html" %} +{% block title %}users{% endblock %} +{% block body %} + +{% if not session.logged_in %} + +You must login. + +{% else %} + + + + + + +{% for id,machine in config.data.machines|dictsort %} + + + + + +{% endfor %} +
Machines
ID Hostname Admin
{{ id }} {{ machine.hostname }} {{ machine.admin }}
+ +{% endif %} + +{% endblock %} From daniel at zuster.org Fri Feb 18 10:41:56 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:41:56 -0000 Subject: [llvm-commits] [zorg] r125885 - /zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Message-ID: <20110218164156.90F192A6C12E@llvm.org> Author: ddunbar Date: Fri Feb 18 10:41:56 2011 New Revision: 125885 URL: http://llvm.org/viewvc/llvm-project?rev=125885&view=rev Log: llvmlab: Tweak dashboard. Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125885&r1=125884&r2=125885&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:41:56 2011 @@ -5,10 +5,9 @@
Welcome to the LLVM Lab Dashboard!

-The most recent released revision is
- r123456
-validated at:
- 2011-06-01 10:34
+The most recent released revision is r123456 +validated at: +2011-06-01 10:34 (available below).
From daniel at zuster.org Fri Feb 18 10:42:27 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:42:27 -0000 Subject: [llvm-commits] [zorg] r125896 - /zorg/trunk/llvmlab/llvmlab/machine.py Message-ID: <20110218164227.1AC052A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:42:26 2011 New Revision: 125896 URL: http://llvm.org/viewvc/llvm-project?rev=125896&view=rev Log: llvmlab: Add 'admin' field to Machine records. Modified: zorg/trunk/llvmlab/llvmlab/machine.py Modified: zorg/trunk/llvmlab/llvmlab/machine.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/machine.py?rev=125896&r1=125895&r2=125896&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/machine.py (original) +++ zorg/trunk/llvmlab/llvmlab/machine.py Fri Feb 18 10:42:26 2011 @@ -11,13 +11,15 @@ if version != 0: raise ValueError, "Unknown version" - return Machine(data['id'], data['hostname']) + return Machine(data['id'], data['hostname'], data['admin']) def todata(self): return { 'version' : 0, 'id' : self.id, - 'hostname' : self.hostname } + 'hostname' : self.hostname, + 'admin' : self.admin } - def __init__(self, id, hostname): + def __init__(self, id, hostname, admin): self.id = id self.hostname = hostname + self.admin = admin From daniel at zuster.org Fri Feb 18 10:42:34 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:42:34 -0000 Subject: [llvm-commits] [zorg] r125898 - in /zorg/trunk/llvmlab/llvmlab/ui: frontend/views.py templates/admin.html templates/index.html Message-ID: <20110218164234.201E92A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:42:33 2011 New Revision: 125898 URL: http://llvm.org/viewvc/llvm-project?rev=125898&view=rev Log: llvmlab: Sketch an admin page. Added: zorg/trunk/llvmlab/llvmlab/ui/templates/admin.html Modified: zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py zorg/trunk/llvmlab/llvmlab/ui/templates/index.html Modified: zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py?rev=125898&r1=125897&r2=125898&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py Fri Feb 18 10:42:33 2011 @@ -8,6 +8,9 @@ from flask import current_app frontend = flask.Module(__name__) +### +# Top-level Information + @frontend.route('/') def index(): return render_template("index.html") @@ -16,10 +19,19 @@ def favicon_ico(): return redirect(url_for('.static', filename='favicon.ico')) + at frontend.route('/admin') +def admin(): + return render_template("admin.html") + +### +# Machine Management @frontend.route('/machines') def machines(): return render_template("machines.html") +### +# User Management + @frontend.route('/users') def users(): return render_template("users.html") @@ -32,6 +44,9 @@ return render_template("user.html", user=user) +### +# Session Management + @frontend.route('/login', methods=['GET', 'POST']) def login(): # If this isn't a post request, return the login template. Added: zorg/trunk/llvmlab/llvmlab/ui/templates/admin.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/admin.html?rev=125898&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/admin.html (added) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/admin.html Fri Feb 18 10:42:33 2011 @@ -0,0 +1,9 @@ +{% extends "layout.html" %} +{% block title %}home{% endblock %} +{% block body %} + +
Admin
+ +
Add Machine
+ +{% endblock %} Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/index.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/index.html?rev=125898&r1=125897&r2=125898&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/index.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/index.html Fri Feb 18 10:42:33 2011 @@ -7,10 +7,11 @@
login

logout

users
+
dashboard
{% if session.logged_in %}
my info
+
admin
{% endif %} -
dashboard

From daniel at zuster.org Fri Feb 18 10:42:36 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:42:36 -0000 Subject: [llvm-commits] [zorg] r125899 - in /zorg/trunk/llvmlab/llvmlab: ui/app.py user.py Message-ID: <20110218164236.E3ACB2A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:42:36 2011 New Revision: 125899 URL: http://llvm.org/viewvc/llvm-project?rev=125899&view=rev Log: llvmlab: Start sketching helpers for working with users / access permissions. Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py zorg/trunk/llvmlab/llvmlab/user.py Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125899&r1=125898&r2=125899&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:42:36 2011 @@ -102,3 +102,12 @@ password + self.config["SECRET_KEY"]).hexdigest() user = self.config.data.users.get(username) return user and passhash == user.passhash + + def get_active_user(self): + # Lookup the active user. + id = flask.session.get('active_user', None) + if id is None: + return None + + # Return the appropriate user object. + return self.config.data.users[id] Modified: zorg/trunk/llvmlab/llvmlab/user.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/user.py?rev=125899&r1=125898&r2=125899&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/user.py (original) +++ zorg/trunk/llvmlab/llvmlab/user.py Fri Feb 18 10:42:36 2011 @@ -29,3 +29,11 @@ self.name = name self.email = email self.htpasswd = htpasswd + + def has_lab_access(self): + """has_lab_access() -> bool + + Is this user allowed access to the lab? Users with lab access can + add/modify/remove machines and update other physical lab information. + """ + return True From daniel at zuster.org Fri Feb 18 10:42:40 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:42:40 -0000 Subject: [llvm-commits] [zorg] r125900 - in /zorg/trunk/llvmlab/llvmlab/ui: frontend/views.py templates/add_machine.html templates/machines.html Message-ID: <20110218164240.566652A6C12E@llvm.org> Author: ddunbar Date: Fri Feb 18 10:42:40 2011 New Revision: 125900 URL: http://llvm.org/viewvc/llvm-project?rev=125900&view=rev Log: llvmlab: Add admin page to add a machine. Added: zorg/trunk/llvmlab/llvmlab/ui/templates/add_machine.html Modified: zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py zorg/trunk/llvmlab/llvmlab/ui/templates/machines.html Modified: zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py?rev=125900&r1=125899&r2=125900&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py Fri Feb 18 10:42:40 2011 @@ -6,11 +6,15 @@ from flask import session from flask import url_for from flask import current_app -frontend = flask.Module(__name__) + +import llvmlab +import llvmlab.machine ### # Top-level Information +frontend = flask.Module(__name__) + @frontend.route('/') def index(): return render_template("index.html") @@ -25,6 +29,44 @@ ### # Machine Management + + at frontend.route('/add_machine', methods=['GET', 'POST']) +def add_machine(): + # Check that we have an active user. + user = current_app.get_active_user() + if user is None: + abort(401) + + # Check that the user has authority to access the lab. + if not user.has_lab_access(): + abort(401) + + # If this isn't a post request, return the template. + if request.method != 'POST': + return render_template("add_machine.html", error=None) + + # Validate the entry data. + id = request.form['id'] + hostname = request.form['hostname'] + if id in current_app.config.data.machines: + return render_template("add_machine.html", + error='machine "%s" already exists' % id) + if hostname in set(m.hostname + for m in current_app.config.data.machines.values()): + return render_template("add_machine.html", + error='hostname "%s" already used' % hostname) + + # Add the machine record. + machine = llvmlab.machine.Machine(id, hostname, user.id) + current_app.config.data.machines[machine.id] = machine + flask.flash('Added machine "%s"!' % machine.id) + + # Save the application data. + current_app.save_data() + flask.flash('Saved data!') + + return redirect(url_for("admin")) + @frontend.route('/machines') def machines(): return render_template("machines.html") Added: zorg/trunk/llvmlab/llvmlab/ui/templates/add_machine.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/add_machine.html?rev=125900&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/add_machine.html (added) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/add_machine.html Fri Feb 18 10:42:40 2011 @@ -0,0 +1,17 @@ +{% extends "layout.html" %} +{% block title %}users{% endblock %} +{% block body %} + +
Add Machine
+{% if error %} +
Error: {{ error }} +{% endif %} +
+
+
ID:
+
Hostname:
+
+
+
+ +{% endblock %} Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/machines.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/machines.html?rev=125900&r1=125899&r2=125900&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/machines.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/machines.html Fri Feb 18 10:42:40 2011 @@ -17,7 +17,8 @@ {{ id }} {{ machine.hostname }} - {{ machine.admin }} + {{ + machine.admin }} {% endfor %} From daniel at zuster.org Fri Feb 18 10:42:49 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:42:49 -0000 Subject: [llvm-commits] [zorg] r125903 - /zorg/trunk/llvmlab/llvmlab/ui/templates/index.html Message-ID: <20110218164249.86EA42A6C12E@llvm.org> Author: ddunbar Date: Fri Feb 18 10:42:49 2011 New Revision: 125903 URL: http://llvm.org/viewvc/llvm-project?rev=125903&view=rev Log: llvmlab: Add a link to the machines page. Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/index.html Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/index.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/index.html?rev=125903&r1=125902&r2=125903&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/index.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/index.html Fri Feb 18 10:42:49 2011 @@ -6,6 +6,7 @@

login

logout
+
machines

users

dashboard
{% if session.logged_in %} From daniel at zuster.org Fri Feb 18 10:43:07 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:43:07 -0000 Subject: [llvm-commits] [zorg] r125908 - in /zorg/trunk/llvmlab/llvmlab: ci/summary.py ui/app.py ui/ci/views.py Message-ID: <20110218164307.85CCD2A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:43:07 2011 New Revision: 125908 URL: http://llvm.org/viewvc/llvm-project?rev=125908&view=rev Log: llvmlab: Start sketching a summary object which connects the CI config with the current status information to provide a high-level summary of the build status. Added: zorg/trunk/llvmlab/llvmlab/ci/summary.py Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Added: zorg/trunk/llvmlab/llvmlab/ci/summary.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/summary.py?rev=125908&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/summary.py (added) +++ zorg/trunk/llvmlab/llvmlab/ci/summary.py Fri Feb 18 10:43:07 2011 @@ -0,0 +1,62 @@ +""" +Summary information for the dashboard. + +Connects the active CI configuration with the status information to track the +current high-level status. +""" + +import sys + +class Summary(object): + def __init__(self, config, status): + self.config = config + self.status = status + + def get_current_status(self): + """ + get_current_status() -> ... + + Compute information on the current status. + """ + + # For each configured builder, compute the: + # a. current build(s), + # b. last passing build, + # c. last failing build, + # d. last completed build + info = {} + for builder in self.config.builders: + builds = self.status.builders.get(builder.name) + + current = [] + passing = failing = completed = None + if builds is None: + # FIXME: Logging! + print >>sys.stderr, "warning: no status for '%s'" % ( + builder.name) + info[builder.name] = None + else: + for build in builds[::-1]: + # Check if this is an active build. + if build.start_time is not None and build.end_time is None: + current.append(build) + continue + + # Otherwise, check the status. + if completed is None: + completed = build + + if build.result == 0: + if passing is None: + passing = build + else: + if failing is None: + failing = build + + info[builder.name] = { + 'current' : current, + 'passing' : passing, + 'failing' : failing, + 'completed' : completed } + + return info Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125908&r1=125907&r2=125908&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:43:07 2011 @@ -5,9 +5,10 @@ import llvmlab.data import llvmlab.user +import llvmlab.ci.summary import llvmlab.ci.status -from llvmlab.ui.ci.views import ci as ci_views -from llvmlab.ui.frontend.views import frontend as frontend_views +import llvmlab.ui.ci.views +import llvmlab.ui.frontend.views class App(flask.Flask): @staticmethod @@ -29,12 +30,16 @@ app.load_status(status) # Load the application routes. - app.register_module(ci_views) - app.register_module(frontend_views) + app.register_module(llvmlab.ui.ci.views.ci) + app.register_module(llvmlab.ui.frontend.views.frontend) # Spawn the status monitor thread. app.monitor = app.config.status.start_monitor(app) + # Construct the dashboard summary object. + app.config.summary = llvmlab.ci.summary.Summary( + llvmlab.ui.ci.views.g_config, app.config.status) + return app @staticmethod Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/ci/views.py?rev=125908&r1=125907&r2=125908&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/ci/views.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Fri Feb 18 10:43:07 2011 @@ -32,10 +32,8 @@ "nightly_clang-x86_64-osx10-RA-flto", "nightly_clang-x86_64-osx10-RA-g"]), config.Phase("Validation", 4, "phase4 - validation", - ["clang-x86_64-osx10-RA-stage3", + ["nightly_clang-i386-osx10-RA", "gccTestSuite-clang-x86_64-osx10-RA", - "nightly_clang-x86_64-osx10-RA-stage3-g", - "libcxx-clang-x86_64-osx10-RA", "boost-trunk-clang-x86_64-osx10-RA"])] builders = [ config.Builder("Validated Build"), @@ -54,10 +52,7 @@ config.Builder("nightly_clang-x86_64-osx10-RA-O3"), config.Builder("nightly_clang-x86_64-osx10-RA-flto"), config.Builder("nightly_clang-x86_64-osx10-RA-g"), - config.Builder("clang-x86_64-osx10-RA-stage3"), config.Builder("gccTestSuite-clang-x86_64-osx10-RA"), - config.Builder("nightly_clang-x86_64-osx10-RA-stage3-g"), - config.Builder("libcxx-clang-x86_64-osx10-RA"), config.Builder("boost-trunk-clang-x86_64-osx10-RA")] published_builds = [ config.PublishedBuild("LLVM", "Linux", "i386", "llvm-linux-i386.tgz"), From daniel at zuster.org Fri Feb 18 10:43:10 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:43:10 -0000 Subject: [llvm-commits] [zorg] r125909 - in /zorg/trunk/llvmlab/llvmlab: ci/config.py ui/ci/views.py Message-ID: <20110218164310.B9F9B2A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:43:10 2011 New Revision: 125909 URL: http://llvm.org/viewvc/llvm-project?rev=125909&view=rev Log: llvmlab: Update Config to also include the name of the final builder (generally the last phase, or a validation builder). Modified: zorg/trunk/llvmlab/llvmlab/ci/config.py zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Modified: zorg/trunk/llvmlab/llvmlab/ci/config.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/config.py?rev=125909&r1=125908&r2=125909&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/config.py (original) +++ zorg/trunk/llvmlab/llvmlab/ci/config.py Fri Feb 18 10:43:10 2011 @@ -115,7 +115,8 @@ 'published_builds' : [item.todata() for item in self.published_builds] } - def __init__(self, phases, builders, published_builds): + def __init__(self, phases, builders, published_builds, validation_builder): self.phases = phases self.builders = builders self.published_builds = published_builds + self.validation_builder = validation_builder Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/ci/views.py?rev=125909&r1=125908&r2=125909&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/ci/views.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Fri Feb 18 10:43:10 2011 @@ -69,7 +69,8 @@ "llvm-gcc-4.2-linux-i386.tgz"), config.PublishedBuild("llvm-gcc-4.2", "Linux", "x86_64", "llvm-gcc-4.2-linux-x86_64.tgz")] -g_config = config.Config(phases, builders, published_builds) +g_config = config.Config(phases, builders, published_builds, + 'Validated Build') @ci.route('/') def dashboard(): From daniel at zuster.org Fri Feb 18 10:43:18 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:43:18 -0000 Subject: [llvm-commits] [zorg] r125911 - in /zorg/trunk/llvmlab/llvmlab/ui: ci/views.py templates/dashboard.html templates/latest_release.html Message-ID: <20110218164318.2DD482A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:43:17 2011 New Revision: 125911 URL: http://llvm.org/viewvc/llvm-project?rev=125911&view=rev Log: llvmlab: Move "latest release" information off to a side page, it is too busy for the dashboard. Added: zorg/trunk/llvmlab/llvmlab/ui/templates/latest_release.html Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/ci/views.py?rev=125911&r1=125910&r2=125911&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/ci/views.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Fri Feb 18 10:43:17 2011 @@ -76,6 +76,10 @@ def dashboard(): return render_template("dashboard.html", ci_config=g_config) + at ci.route('/latest_release') +def latest_release(): + return render_template("latest_release.html", ci_config=g_config) + @ci.route('/monitor') def buildbot_monitor(): return render_template("buildbot_monitor.html", Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125911&r1=125910&r2=125911&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:43:17 2011 @@ -15,7 +15,7 @@ final_phase.passing.source_stamp }} validated at: {{ final_phase.passing.end_time }} -(available below). +(available here). {% else %} No release is currently available! {% endif %} @@ -142,37 +142,6 @@ -{# The builds archive table... #} - -
Latest Release
- - -
-The latest released sources are available here: llvm-rNNNNNN. - -
-Binary packages of the latest release: - - - - - - - - - - - {% for build in ci_config.published_builds %} - - - - - - - {% endfor %} -
Product OS Arch Archive
{{ build.product }} {{ build.os }} {{ build.arch }} {{ - build.archive_name }}
-
Example Phase Popups
{% include "dashboard_popup.html" %} Added: zorg/trunk/llvmlab/llvmlab/ui/templates/latest_release.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/latest_release.html?rev=125911&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/latest_release.html (added) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/latest_release.html Fri Feb 18 10:43:17 2011 @@ -0,0 +1,38 @@ +{% extends "layout.html" %} +{% block title %}latest release{% endblock %} +{% block body %} + +{# The builds archive table... #} + +
Latest Release
+ + +FIXME: THIS PAGE IS JUST A PLACEHOLDER, IT IS NOT LIVE! + +
+The latest released sources are available here: llvm-rNNNNNN. + +
+Binary packages of the latest release: + + + + + + + + + + + {% for build in ci_config.published_builds %} + + + + + + + {% endfor %} +
Product OS Arch Archive
{{ build.product }} {{ build.os }} {{ build.arch }} {{ + build.archive_name }}
+ +{% endblock %} From daniel at zuster.org Fri Feb 18 10:43:13 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:43:13 -0000 Subject: [llvm-commits] [zorg] r125910 - /zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Message-ID: <20110218164313.9294F2A6C12E@llvm.org> Author: ddunbar Date: Fri Feb 18 10:43:13 2011 New Revision: 125910 URL: http://llvm.org/viewvc/llvm-project?rev=125910&view=rev Log: llvmlab: Implement live dashboard using the new summary object. Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125910&r1=125909&r2=125910&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:43:13 2011 @@ -2,21 +2,41 @@ {% block title %}dashboard{% endblock %} {% block body %} +{# Get the current summary... #} +{% set summary = config.summary.get_current_status() %} +
Welcome to the LLVM Lab Dashboard!

-The most recent released revision is r123456 +{% set final_phase = summary[ci_config.validation_builder] %} + +{% if final_phase and final_phase.passing %} +The most recent released revision is r{{ + final_phase.passing.source_stamp }} validated at: -2011-06-01 10:34 +{{ final_phase.passing.end_time }} (available below). - -
-The tree is currently: open. +{% else %} +No release is currently available! +{% endif %}
-WARNING! LLVM is currently failing the Living On checks. The tree -will close in 35 minutes! + {% set is_failing = false %} + {% for phase in ci_config.phases %} + {% set phase_info = summary[phase.phase_builder] %} + + {% if (phase_info and phase_info.completed and not is_failing + and phase_info.completed.result != 0) %} + {% set is_failing = true %} + + WARNING! LLVM is currently failing the {{ phase.name }} checks. + The failures started in r{{ phase_info.failing.source_stamp }} at {{ + phase_info.failing.end_time }}. + + {% endif %} + + {% endfor %} @@ -34,16 +54,29 @@ {% endfor %} + {% set is_failing = false %} + {% for phase in ci_config.phases %} + {% set phase_info = summary[phase.phase_builder] %} + + {# First, check if we have no status (no completed builds, or prior phase is + failing). #} + {% if not phase_info or not phase_info.completed or is_failing %} + + {% elif phase_info.completed.result == 0 %} + {% else %} + {% set is_failing = true %} - - + {% endif %} + + {% endfor %}
{# The results table... #} + @@ -55,35 +88,60 @@ - - - - + {% for phase in ci_config.phases %} + {% set phase_info = summary[phase.phase_builder] %} + + {% if phase_info.current %} + + {% else %} + + {% endif %} + + {% endfor %} - - - - + {% for phase in ci_config.phases %} + {% set phase_info = summary[phase.phase_builder] %} + + {% if phase_info.completed %} + + {% else %} + + {% endif %} + + {% endfor %} - - - - + {% for phase in ci_config.phases %} + {% set phase_info = summary[phase.phase_builder] %} + + {% if phase_info.failing and + (not phase_info.passing or + phase_info.failing.number > phase_info.passing.number) %} + + {% else %} + + {% endif %} + + {% endfor %} - - - - + {% for phase in ci_config.phases %} + {% set phase_info = summary[phase.phase_builder] %} + + {% if phase_info.passing %} + + {% else %} + + {% endif %} + + {% endfor %}

Current r123485 r123482 (blocked) (blocked) r{{ phase_info.current[0].source_stamp }} (idle)

Last Completed r123482 r123477 r123457 r123456 r{{ phase_info.completed.source_stamp }} (unknown)

First Failing r123475 r123457 r{{ phase_info.failing.source_stamp }}

Last Working r123482 r123473 r123456 r123456 r{{ phase_info.passing.source_stamp }} (unknown)

- {# The builds archive table... #}
Latest Release
From daniel at zuster.org Fri Feb 18 10:43:22 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:43:22 -0000 Subject: [llvm-commits] [zorg] r125912 - in /zorg/trunk/llvmlab/llvmlab/ui: ci/views.py templates/dashboard.html templates/dashboard_popup.html templates/phase_popup.html Message-ID: <20110218164322.C87BB2A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:43:22 2011 New Revision: 125912 URL: http://llvm.org/viewvc/llvm-project?rev=125912&view=rev Log: llvmlab: Sketch the phase popup. Added: zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html Removed: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard_popup.html Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/ci/views.py?rev=125912&r1=125911&r2=125912&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/ci/views.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Fri Feb 18 10:43:22 2011 @@ -76,6 +76,24 @@ def dashboard(): return render_template("dashboard.html", ci_config=g_config) + at ci.route('/phase//') +def phase_popup(index, source_stamp): + # Validate the phase. + if index >= len(g_config.phases): + abort(404) + + # Get the phase. + phase = g_config.phases[index] + + # Lookup the latest builds associated with this revision. + phased_builds = dict( + (builder, [b for b in current_app.config.status.builders.get(builder,[]) + if b.source_stamp == source_stamp]) + for builder in phase.builder_names) + return render_template("phase_popup.html", ci_config=g_config, + phase = phase, source_stamp = source_stamp, + phased_builds = phased_builds) + @ci.route('/latest_release') def latest_release(): return render_template("latest_release.html", ci_config=g_config) Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125912&r1=125911&r2=125912&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:43:22 2011 @@ -142,8 +142,4 @@ -
Example Phase Popups
- -{% include "dashboard_popup.html" %} - {% endblock %} Removed: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard_popup.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard_popup.html?rev=125911&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard_popup.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard_popup.html (removed) @@ -1,11 +0,0 @@ -{# Fragment template for rendering an individual phase pop-up #} -
Phase 4 - r123456
- - - - - - - - -
Builder Status
clang-i386-darwin10-RA-fnt PASS
clang-x86_64-darwin10-RA-fnt PASS
clang-i386-linux-RA-fnt PASS
clang-x86_64-linux-RA-fnt PASS
Added: zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html?rev=125912&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html (added) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html Fri Feb 18 10:43:22 2011 @@ -0,0 +1,24 @@ +{# Fragment template for rendering an individual phase pop-up #} + +
Phase {{ phase.number }} {{ phase.name }} - r{{ source_stamp }}
+ + + + + {% for name,builds in phased_builds|dictsort %} + + + + + {% endfor %} +
Builder Status
{{ name }} + {% for build in builds %} + {% if build.end_time == None %} + RUNNING + {% elif build.result == 0 %} + PASS + {% else %} + FAIL + {% endif %} + {% endfor %} +
From daniel at zuster.org Fri Feb 18 10:43:25 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:43:25 -0000 Subject: [llvm-commits] [zorg] r125913 - in /zorg/trunk/llvmlab/llvmlab/ui/templates: dashboard.html layout.html Message-ID: <20110218164326.007A72A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:43:25 2011 New Revision: 125913 URL: http://llvm.org/viewvc/llvm-project?rev=125913&view=rev Log: llvmlab: Add dashboard support for linking to "phase popups". - General mechanism stolen from buildbot's console. Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125913&r1=125912&r2=125913&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:43:25 2011 @@ -1,4 +1,44 @@ {% extends "layout.html" %} + +{% macro phase_popup_link(phase, build) %} +{{ caller() }} +{% endmacro %} + +{% block javascript %} +// Handler for phase onclick events. +function show_phase_popup(url, event) { + // Get the popup elements. + var popup = document.getElementById("phase_popup"); + var popup_frame = document.getElementById("phase_popup_frame"); + + // Load the phase popup into the hidden frame. + popup_frame.src = url; +} + +// Handler for page load events inside the hidden iframe we use to load phase +// popups. +function popup_frame_loaded(event) { + var popup = document.getElementById("phase_popup"); + var popup_frame = document.getElementById("phase_popup_frame"); + + // Get the frame contents and put it in the popup div. + var content = popup_frame.contentWindow.document.body.innerHTML; + popup.innerHTML = content; + popup.style.display = "block"; +} + +// On load, set the iframe's onload handler. +window.onload = function() { + var popup_frame = document.getElementById("phase_popup_frame"); + popup_frame.onload = function(event) { popup_frame_loaded(event); }; +} +{% endblock %} + {% block title %}dashboard{% endblock %} {% block body %} @@ -40,9 +80,7 @@ - -
Current Status
- +
Current Status
{# The traffic light... #} @@ -60,14 +98,20 @@ {# First, check if we have no status (no completed builds, or prior phase is failing). #} + - {% elif phase_info.completed.result == 0 %} - + {% else %} - {% set is_failing = true %} - + {% call phase_popup_link(phase, phase_info.completed) %} + {% if phase_info.completed.result == 0 %} + + {% else %} + {% set is_failing = true %} + + {% endif %} + {% endcall %} {% endif %} + {% endfor %} @@ -92,7 +136,11 @@ {% set phase_info = summary[phase.phase_builder] %} {% if phase_info.current %} - + {% else %} {% endif %} @@ -105,7 +153,11 @@ {% set phase_info = summary[phase.phase_builder] %} {% if phase_info.completed %} - + {% else %} {% endif %} @@ -120,7 +172,11 @@ {% if phase_info.failing and (not phase_info.passing or phase_info.failing.number > phase_info.passing.number) %} - + {% else %} {% endif %} @@ -133,7 +189,11 @@ {% set phase_info = summary[phase.phase_builder] %} {% if phase_info.passing %} - + {% else %} {% endif %} @@ -142,4 +202,10 @@
{% if not phase_info or not phase_info.completed or is_failing %} -
r{{ phase_info.current[0].source_stamp }} + {% call phase_popup_link(phase, phase_info.current[0]) %} + r{{ phase_info.current[0].source_stamp }} + {% endcall %} + (idle) r{{ phase_info.completed.source_stamp }} + {% call phase_popup_link(phase, phase_info.completed) %} + r{{ phase_info.completed.source_stamp }} + {% endcall %} + (unknown) r{{ phase_info.failing.source_stamp }} + {% call phase_popup_link(phase, phase_info.failing) %} + r{{ phase_info.failing.source_stamp }} + {% endcall %} + r{{ phase_info.passing.source_stamp }} + {% call phase_popup_link(phase, phase_info.passing) %} + r{{ phase_info.passing.source_stamp }} + {% endcall %} + (unknown)

+{# The div we use to include phase popups. #} +
+{# The iframe we use to load the phase popup source. This is never actually + displayed, just used to load the HTML we insert into the popup div. #} + + {% endblock %} Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html?rev=125913&r1=125912&r2=125913&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html Fri Feb 18 10:43:25 2011 @@ -6,6 +6,9 @@ {{ self.title() }} +
@@ -28,7 +31,7 @@ Administered by {{ config['ADMIN_NAME'] }} <{{ - config['ADMIN_EMAIL'] }}> + config['ADMIN_EMAIL'] }}>
From daniel at zuster.org Fri Feb 18 10:43:31 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:43:31 -0000 Subject: [llvm-commits] [zorg] r125915 - /zorg/trunk/llvmlab/llvmlab/ci/summary.py Message-ID: <20110218164331.9A65C2A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:43:31 2011 New Revision: 125915 URL: http://llvm.org/viewvc/llvm-project?rev=125915&view=rev Log: llvmlab: Fix thinko, summary is supposed to track first failing build after most recent passing build. Modified: zorg/trunk/llvmlab/llvmlab/ci/summary.py Modified: zorg/trunk/llvmlab/llvmlab/ci/summary.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/summary.py?rev=125915&r1=125914&r2=125915&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/summary.py (original) +++ zorg/trunk/llvmlab/llvmlab/ci/summary.py Fri Feb 18 10:43:31 2011 @@ -46,11 +46,12 @@ if completed is None: completed = build - if build.result == 0: - if passing is None: + # Track the (a) most recent passing build and (b) oldest + # failure which happened after a passing build. + if passing is None: + if build.result == 0: passing = build - else: - if failing is None: + else: failing = build info[builder.name] = { From daniel at zuster.org Fri Feb 18 10:43:47 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:43:47 -0000 Subject: [llvm-commits] [zorg] r125919 - /zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Message-ID: <20110218164347.686272A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:43:47 2011 New Revision: 125919 URL: http://llvm.org/viewvc/llvm-project?rev=125919&view=rev Log: llvmlab: Start sketching support for visualizing build times. Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/ci/views.py?rev=125919&r1=125918&r2=125919&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/ci/views.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Fri Feb 18 10:43:47 2011 @@ -1,5 +1,6 @@ import flask from flask import abort +from flask import jsonify from flask import redirect from flask import render_template from flask import request @@ -102,3 +103,39 @@ def buildbot_monitor(): return render_template("buildbot_monitor.html", bb_status=current_app.config.status) + + at ci.route('/times') + at ci.route('/times/') +def phase_timing(index=None): + # Determine what we are timing. + if index is not None: + # Validate the phase. + if index >= len(g_config.phases): + abort(404) + + # Get the phase. + phase = g_config.phases[index] + else: + phase = None + + # Get the list of builders to time. + builder_to_time = [] + if phase is None: + builders_to_time = [p.phase_builder + for p in g_config.phases] + else: + builders_to_time = phase.builder_names + + # Get the builds to report timing information for. + status = current_app.config.status + builders = dict((name, [b for b in status.builders.get(name, []) + if b.end_time is not None]) + for name in builders_to_time) + + # Return the timing data as a json object. + data = [] + for name,builds in builders.items(): + points = [(float(i) / len(builds), b.end_time - b.start_time) + for i,b in enumerate(builds)] + data.append((name, points)) + return flask.jsonify(data = data) From daniel at zuster.org Fri Feb 18 10:43:55 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:43:55 -0000 Subject: [llvm-commits] [zorg] r125921 - in /zorg/trunk/llvmlab/llvmlab/ui: static/green.png static/red.png static/style.css static/white.png static/yellow.png templates/dashboard.html Message-ID: <20110218164355.3AAF42A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:43:55 2011 New Revision: 125921 URL: http://llvm.org/viewvc/llvm-project?rev=125921&view=rev Log: llvmlab: Tidy up look of rev links, mostly by stealing style from buildbot. Removed: zorg/trunk/llvmlab/llvmlab/ui/static/green.png zorg/trunk/llvmlab/llvmlab/ui/static/red.png zorg/trunk/llvmlab/llvmlab/ui/static/white.png zorg/trunk/llvmlab/llvmlab/ui/static/yellow.png Modified: zorg/trunk/llvmlab/llvmlab/ui/static/style.css zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Removed: zorg/trunk/llvmlab/llvmlab/ui/static/green.png URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/static/green.png?rev=125920&view=auto ============================================================================== Binary files zorg/trunk/llvmlab/llvmlab/ui/static/green.png (original) and zorg/trunk/llvmlab/llvmlab/ui/static/green.png (removed) differ Removed: zorg/trunk/llvmlab/llvmlab/ui/static/red.png URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/static/red.png?rev=125920&view=auto ============================================================================== Binary files zorg/trunk/llvmlab/llvmlab/ui/static/red.png (original) and zorg/trunk/llvmlab/llvmlab/ui/static/red.png (removed) differ Modified: zorg/trunk/llvmlab/llvmlab/ui/static/style.css URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/static/style.css?rev=125921&r1=125920&r2=125921&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/static/style.css (original) +++ zorg/trunk/llvmlab/llvmlab/ui/static/style.css Fri Feb 18 10:43:55 2011 @@ -43,3 +43,63 @@ padding: 10px; border: 1px solid #AACBE2; } + +/* Dashboard Features */ + +td.phase-cell { + padding: 4px 4px 4px 4px; + color: #333333; + background-color: #eee; +} + +.phase-cell { + text-align: center; + height: 20px; + padding: 0 2px; + line-height: 0; + white-space: nowrap; +} + +.phase-cell a { + opacity: 0.85; + border-width: 1px; + border-style: solid; + border-radius: 4px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + display: block; + width: 90%; + height: 20px; + line-height: 20px; + margin-left: auto; + margin-right: auto; +} + + +/* Build Status Indicators */ +.success { + color: #FFFFFF; + background-color: #8f8; + border-color: #4F8530; +} +.failure { + color: #FFFFFF; + background-color: #f99; + border-color: #A77272; +} +.warnings { + color: #FFFFFF; + background-color: #ffc343; + border-color: #C29D46; +} +.running { + color: #666666; + background-color: #ff6; + border-color: #C5C56D; +} +.unknown { + border-width: 1px; + border-style: solid; + border-color: #aaa; + background-color: #fff; +} Removed: zorg/trunk/llvmlab/llvmlab/ui/static/white.png URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/static/white.png?rev=125920&view=auto ============================================================================== Binary files zorg/trunk/llvmlab/llvmlab/ui/static/white.png (original) and zorg/trunk/llvmlab/llvmlab/ui/static/white.png (removed) differ Removed: zorg/trunk/llvmlab/llvmlab/ui/static/yellow.png URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/static/yellow.png?rev=125920&view=auto ============================================================================== Binary files zorg/trunk/llvmlab/llvmlab/ui/static/yellow.png (original) and zorg/trunk/llvmlab/llvmlab/ui/static/yellow.png (removed) differ Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125921&r1=125920&r2=125921&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:43:55 2011 @@ -1,14 +1,39 @@ {% extends "layout.html" %} -{% macro phase_popup_link(phase, build) %} +{% macro phase_popup_link(phase, build, kind) %} {{ caller() }} {% endmacro %} +{% macro phase_popup_cell(phase, phase_info, build) %} +{% if not build %} +{% set kind = "unknown" %} +{% elif not build.end_time %} +{% set kind = "running" %} +{% elif build.result == 0 %} +{% set kind = "success" %} +{% elif build == phase_info.failing %} +{% set kind = "failing" %} +{% else %} +{% set kind = "warnings" %} +{% endif %} + + +{% if build %} +{% call phase_popup_link(phase, build, kind) %} +r{{ build.source_stamp }} +{% endcall %} +{% else %} + +{% endif %} + +{% endmacro %} + {% macro timing_popup_link(phase) -%} {% for phase in ci_config.phases %} + {% set phase_info = summary[phase.phase_builder] %} + {{ phase.name }}
(Phase {{ phase.number }}) {% endfor %} @@ -163,20 +190,11 @@ {# First, check if we have no status (no completed builds, or prior phase is failing). #} - {% if not phase_info or not phase_info.completed or is_failing %} - + {{ phase_popup_cell(phase, phase_info, None) }} {% else %} - {% call phase_popup_link(phase, phase_info.completed) %} - {% if phase_info.completed.result == 0 %} - - {% else %} - {% set is_failing = true %} - - {% endif %} - {% endcall %} + {{ phase_popup_cell(phase, phase_info, phase_info.completed) }} {% endif %} - {% endfor %} @@ -202,13 +220,9 @@ {% set phase_info = summary[phase.phase_builder] %} {% if phase_info.current %} - - {% call phase_popup_link(phase, phase_info.current[0]) %} - r{{ phase_info.current[0].source_stamp }} - {% endcall %} - + {{ phase_popup_cell(phase, phase_info, phase_info.current[0]) }} {% else %} - (idle) + (idle) {% endif %} {% endfor %} @@ -219,13 +233,9 @@ {% set phase_info = summary[phase.phase_builder] %} {% if phase_info.completed %} - - {% call phase_popup_link(phase, phase_info.completed) %} - r{{ phase_info.completed.source_stamp }} - {% endcall %} - + {{ phase_popup_cell(phase, phase_info, phase_info.completed) }} {% else %} - (unknown) + (unknown) {% endif %} {% endfor %} @@ -238,13 +248,9 @@ {% if phase_info.failing and (not phase_info.passing or phase_info.failing.number > phase_info.passing.number) %} - - {% call phase_popup_link(phase, phase_info.failing) %} - r{{ phase_info.failing.source_stamp }} - {% endcall %} - + {{ phase_popup_cell(phase, phase_info, phase_info.failing) }} {% else %} - + {% endif %} {% endfor %} @@ -255,13 +261,9 @@ {% set phase_info = summary[phase.phase_builder] %} {% if phase_info.passing %} - - {% call phase_popup_link(phase, phase_info.passing) %} - r{{ phase_info.passing.source_stamp }} - {% endcall %} - + {{ phase_popup_cell(phase, phase_info, phase_info.passing) }} {% else %} - (unknown) + (unknown) {% endif %} {% endfor %} From daniel at zuster.org Fri Feb 18 10:43:43 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:43:43 -0000 Subject: [llvm-commits] [zorg] r125918 - in /zorg/trunk: LICENSE.TXT llvmlab/llvmlab/ui/static/jquery/ llvmlab/llvmlab/ui/static/jquery/1.5/ llvmlab/llvmlab/ui/static/jquery/1.5/LICENSE.txt llvmlab/llvmlab/ui/static/jquery/1.5/jquery.js llvmlab/llvmlab/ui/static/jquery/1.5/jquery.min.js Message-ID: <20110218164344.1C95A2A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:43:43 2011 New Revision: 125918 URL: http://llvm.org/viewvc/llvm-project?rev=125918&view=rev Log: llvmlab: Add jQuery 1.5 as a static resource. Added: zorg/trunk/llvmlab/llvmlab/ui/static/jquery/ zorg/trunk/llvmlab/llvmlab/ui/static/jquery/1.5/ zorg/trunk/llvmlab/llvmlab/ui/static/jquery/1.5/LICENSE.txt zorg/trunk/llvmlab/llvmlab/ui/static/jquery/1.5/jquery.js zorg/trunk/llvmlab/llvmlab/ui/static/jquery/1.5/jquery.min.js Modified: zorg/trunk/LICENSE.TXT Modified: zorg/trunk/LICENSE.TXT URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/LICENSE.TXT?rev=125918&r1=125917&r2=125918&view=diff ============================================================================== --- zorg/trunk/LICENSE.TXT (original) +++ zorg/trunk/LICENSE.TXT Fri Feb 18 10:43:43 2011 @@ -64,3 +64,4 @@ GTestCommand zorg/buildbot/commands/GTestCommand.py sorttable.js zorg/lnt/viewer/resources/sorttable.js External Stats zorg/lnt/external/stats/ +jQuery llvmlab/llvmlab/ui/static/jquery/1.5 Added: zorg/trunk/llvmlab/llvmlab/ui/static/jquery/1.5/LICENSE.txt URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/static/jquery/1.5/LICENSE.txt?rev=125918&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/static/jquery/1.5/LICENSE.txt (added) +++ zorg/trunk/llvmlab/llvmlab/ui/static/jquery/1.5/LICENSE.txt Fri Feb 18 10:43:43 2011 @@ -0,0 +1,20 @@ +Copyright (c) 2011 John Resig, http://jquery.com/ + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Added: zorg/trunk/llvmlab/llvmlab/ui/static/jquery/1.5/jquery.js URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/static/jquery/1.5/jquery.js?rev=125918&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/static/jquery/1.5/jquery.js (added) +++ zorg/trunk/llvmlab/llvmlab/ui/static/jquery/1.5/jquery.js Fri Feb 18 10:43:43 2011 @@ -0,0 +1,8176 @@ +/*! + * jQuery JavaScript Library v1.5 + * http://jquery.com/ + * + * Copyright 2011, John Resig + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * Copyright 2011, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * + * Date: Mon Jan 31 08:31:29 2011 -0500 + */ +(function( window, undefined ) { + +// Use the correct document accordingly with window argument (sandbox) +var document = window.document; +var jQuery = (function() { + +// Define a local copy of jQuery +var jQuery = function( selector, context ) { + // The jQuery object is actually just the init constructor 'enhanced' + return new jQuery.fn.init( selector, context, rootjQuery ); + }, + + // Map over jQuery in case of overwrite + _jQuery = window.jQuery, + + // Map over the $ in case of overwrite + _$ = window.$, + + // A central reference to the root jQuery(document) + rootjQuery, + + // A simple way to check for HTML strings or ID strings + // (both of which we optimize for) + quickExpr = /^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/, + + // Check if a string has a non-whitespace character in it + rnotwhite = /\S/, + + // Used for trimming whitespace + trimLeft = /^\s+/, + trimRight = /\s+$/, + + // Check for digits + rdigit = /\d/, + + // Match a standalone tag + rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/, + + // JSON RegExp + rvalidchars = /^[\],:{}\s]*$/, + rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, + rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, + rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g, + + // Useragent RegExp + rwebkit = /(webkit)[ \/]([\w.]+)/, + ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/, + rmsie = /(msie) ([\w.]+)/, + rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/, + + // Keep a UserAgent string for use with jQuery.browser + userAgent = navigator.userAgent, + + // For matching the engine and version of the browser + browserMatch, + + // Has the ready events already been bound? + readyBound = false, + + // The deferred used on DOM ready + readyList, + + // Promise methods + promiseMethods = "then done fail isResolved isRejected promise".split( " " ), + + // The ready event handler + DOMContentLoaded, + + // Save a reference to some core methods + toString = Object.prototype.toString, + hasOwn = Object.prototype.hasOwnProperty, + push = Array.prototype.push, + slice = Array.prototype.slice, + trim = String.prototype.trim, + indexOf = Array.prototype.indexOf, + + // [[Class]] -> type pairs + class2type = {}; + +jQuery.fn = jQuery.prototype = { + constructor: jQuery, + init: function( selector, context, rootjQuery ) { + var match, elem, ret, doc; + + // Handle $(""), $(null), or $(undefined) + if ( !selector ) { + return this; + } + + // Handle $(DOMElement) + if ( selector.nodeType ) { + this.context = this[0] = selector; + this.length = 1; + return this; + } + + // The body element only exists once, optimize finding it + if ( selector === "body" && !context && document.body ) { + this.context = document; + this[0] = document.body; + this.selector = "body"; + this.length = 1; + return this; + } + + // Handle HTML strings + if ( typeof selector === "string" ) { + // Are we dealing with HTML string or an ID? + match = quickExpr.exec( selector ); + + // Verify a match, and that no context was specified for #id + if ( match && (match[1] || !context) ) { + + // HANDLE: $(html) -> $(array) + if ( match[1] ) { + context = context instanceof jQuery ? context[0] : context; + doc = (context ? context.ownerDocument || context : document); + + // If a single string is passed in and it's a single tag + // just do a createElement and skip the rest + ret = rsingleTag.exec( selector ); + + if ( ret ) { + if ( jQuery.isPlainObject( context ) ) { + selector = [ document.createElement( ret[1] ) ]; + jQuery.fn.attr.call( selector, context, true ); + + } else { + selector = [ doc.createElement( ret[1] ) ]; + } + + } else { + ret = jQuery.buildFragment( [ match[1] ], [ doc ] ); + selector = (ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment).childNodes; + } + + return jQuery.merge( this, selector ); + + // HANDLE: $("#id") + } else { + elem = document.getElementById( match[2] ); + + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document #6963 + if ( elem && elem.parentNode ) { + // Handle the case where IE and Opera return items + // by name instead of ID + if ( elem.id !== match[2] ) { + return rootjQuery.find( selector ); + } + + // Otherwise, we inject the element directly into the jQuery object + this.length = 1; + this[0] = elem; + } + + this.context = document; + this.selector = selector; + return this; + } + + // HANDLE: $(expr, $(...)) + } else if ( !context || context.jquery ) { + return (context || rootjQuery).find( selector ); + + // HANDLE: $(expr, context) + // (which is just equivalent to: $(context).find(expr) + } else { + return this.constructor( context ).find( selector ); + } + + // HANDLE: $(function) + // Shortcut for document ready + } else if ( jQuery.isFunction( selector ) ) { + return rootjQuery.ready( selector ); + } + + if (selector.selector !== undefined) { + this.selector = selector.selector; + this.context = selector.context; + } + + return jQuery.makeArray( selector, this ); + }, + + // Start with an empty selector + selector: "", + + // The current version of jQuery being used + jquery: "1.5", + + // The default length of a jQuery object is 0 + length: 0, + + // The number of elements contained in the matched element set + size: function() { + return this.length; + }, + + toArray: function() { + return slice.call( this, 0 ); + }, + + // Get the Nth element in the matched element set OR + // Get the whole matched element set as a clean array + get: function( num ) { + return num == null ? + + // Return a 'clean' array + this.toArray() : + + // Return just the object + ( num < 0 ? this[ this.length + num ] : this[ num ] ); + }, + + // Take an array of elements and push it onto the stack + // (returning the new matched element set) + pushStack: function( elems, name, selector ) { + // Build a new jQuery matched element set + var ret = this.constructor(); + + if ( jQuery.isArray( elems ) ) { + push.apply( ret, elems ); + + } else { + jQuery.merge( ret, elems ); + } + + // Add the old object onto the stack (as a reference) + ret.prevObject = this; + + ret.context = this.context; + + if ( name === "find" ) { + ret.selector = this.selector + (this.selector ? " " : "") + selector; + } else if ( name ) { + ret.selector = this.selector + "." + name + "(" + selector + ")"; + } + + // Return the newly-formed element set + return ret; + }, + + // Execute a callback for every element in the matched set. + // (You can seed the arguments with an array of args, but this is + // only used internally.) + each: function( callback, args ) { + return jQuery.each( this, callback, args ); + }, + + ready: function( fn ) { + // Attach the listeners + jQuery.bindReady(); + + // Add the callback + readyList.done( fn ); + + return this; + }, + + eq: function( i ) { + return i === -1 ? + this.slice( i ) : + this.slice( i, +i + 1 ); + }, + + first: function() { + return this.eq( 0 ); + }, + + last: function() { + return this.eq( -1 ); + }, + + slice: function() { + return this.pushStack( slice.apply( this, arguments ), + "slice", slice.call(arguments).join(",") ); + }, + + map: function( callback ) { + return this.pushStack( jQuery.map(this, function( elem, i ) { + return callback.call( elem, i, elem ); + })); + }, + + end: function() { + return this.prevObject || this.constructor(null); + }, + + // For internal use only. + // Behaves like an Array's method, not like a jQuery method. + push: push, + sort: [].sort, + splice: [].splice +}; + +// Give the init function the jQuery prototype for later instantiation +jQuery.fn.init.prototype = jQuery.fn; + +jQuery.extend = jQuery.fn.extend = function() { + var options, name, src, copy, copyIsArray, clone, + target = arguments[0] || {}, + i = 1, + length = arguments.length, + deep = false; + + // Handle a deep copy situation + if ( typeof target === "boolean" ) { + deep = target; + target = arguments[1] || {}; + // skip the boolean and the target + i = 2; + } + + // Handle case when target is a string or something (possible in deep copy) + if ( typeof target !== "object" && !jQuery.isFunction(target) ) { + target = {}; + } + + // extend jQuery itself if only one argument is passed + if ( length === i ) { + target = this; + --i; + } + + for ( ; i < length; i++ ) { + // Only deal with non-null/undefined values + if ( (options = arguments[ i ]) != null ) { + // Extend the base object + for ( name in options ) { + src = target[ name ]; + copy = options[ name ]; + + // Prevent never-ending loop + if ( target === copy ) { + continue; + } + + // Recurse if we're merging plain objects or arrays + if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) { + if ( copyIsArray ) { + copyIsArray = false; + clone = src && jQuery.isArray(src) ? src : []; + + } else { + clone = src && jQuery.isPlainObject(src) ? src : {}; + } + + // Never move original objects, clone them + target[ name ] = jQuery.extend( deep, clone, copy ); + + // Don't bring in undefined values + } else if ( copy !== undefined ) { + target[ name ] = copy; + } + } + } + } + + // Return the modified object + return target; +}; + +jQuery.extend({ + noConflict: function( deep ) { + window.$ = _$; + + if ( deep ) { + window.jQuery = _jQuery; + } + + return jQuery; + }, + + // Is the DOM ready to be used? Set to true once it occurs. + isReady: false, + + // A counter to track how many items to wait for before + // the ready event fires. See #6781 + readyWait: 1, + + // Handle when the DOM is ready + ready: function( wait ) { + // A third-party is pushing the ready event forwards + if ( wait === true ) { + jQuery.readyWait--; + } + + // Make sure that the DOM is not already loaded + if ( !jQuery.readyWait || (wait !== true && !jQuery.isReady) ) { + // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). + if ( !document.body ) { + return setTimeout( jQuery.ready, 1 ); + } + + // Remember that the DOM is ready + jQuery.isReady = true; + + // If a normal DOM Ready event fired, decrement, and wait if need be + if ( wait !== true && --jQuery.readyWait > 0 ) { + return; + } + + // If there are functions bound, to execute + readyList.resolveWith( document, [ jQuery ] ); + + // Trigger any bound ready events + if ( jQuery.fn.trigger ) { + jQuery( document ).trigger( "ready" ).unbind( "ready" ); + } + } + }, + + bindReady: function() { + if ( readyBound ) { + return; + } + + readyBound = true; + + // Catch cases where $(document).ready() is called after the + // browser event has already occurred. + if ( document.readyState === "complete" ) { + // Handle it asynchronously to allow scripts the opportunity to delay ready + return setTimeout( jQuery.ready, 1 ); + } + + // Mozilla, Opera and webkit nightlies currently support this event + if ( document.addEventListener ) { + // Use the handy event callback + document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false ); + + // A fallback to window.onload, that will always work + window.addEventListener( "load", jQuery.ready, false ); + + // If IE event model is used + } else if ( document.attachEvent ) { + // ensure firing before onload, + // maybe late but safe also for iframes + document.attachEvent("onreadystatechange", DOMContentLoaded); + + // A fallback to window.onload, that will always work + window.attachEvent( "onload", jQuery.ready ); + + // If IE and not a frame + // continually check to see if the document is ready + var toplevel = false; + + try { + toplevel = window.frameElement == null; + } catch(e) {} + + if ( document.documentElement.doScroll && toplevel ) { + doScrollCheck(); + } + } + }, + + // See test/unit/core.js for details concerning isFunction. + // Since version 1.3, DOM methods and functions like alert + // aren't supported. They return false on IE (#2968). + isFunction: function( obj ) { + return jQuery.type(obj) === "function"; + }, + + isArray: Array.isArray || function( obj ) { + return jQuery.type(obj) === "array"; + }, + + // A crude way of determining if an object is a window + isWindow: function( obj ) { + return obj && typeof obj === "object" && "setInterval" in obj; + }, + + isNaN: function( obj ) { + return obj == null || !rdigit.test( obj ) || isNaN( obj ); + }, + + type: function( obj ) { + return obj == null ? + String( obj ) : + class2type[ toString.call(obj) ] || "object"; + }, + + isPlainObject: function( obj ) { + // Must be an Object. + // Because of IE, we also have to check the presence of the constructor property. + // Make sure that DOM nodes and window objects don't pass through, as well + if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) { + return false; + } + + // Not own constructor property must be Object + if ( obj.constructor && + !hasOwn.call(obj, "constructor") && + !hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) { + return false; + } + + // Own properties are enumerated firstly, so to speed up, + // if last one is own, then all properties are own. + + var key; + for ( key in obj ) {} + + return key === undefined || hasOwn.call( obj, key ); + }, + + isEmptyObject: function( obj ) { + for ( var name in obj ) { + return false; + } + return true; + }, + + error: function( msg ) { + throw msg; + }, + + parseJSON: function( data ) { + if ( typeof data !== "string" || !data ) { + return null; + } + + // Make sure leading/trailing whitespace is removed (IE can't handle it) + data = jQuery.trim( data ); + + // Make sure the incoming data is actual JSON + // Logic borrowed from http://json.org/json2.js + if ( rvalidchars.test(data.replace(rvalidescape, "@") + .replace(rvalidtokens, "]") + .replace(rvalidbraces, "")) ) { + + // Try to use the native JSON parser first + return window.JSON && window.JSON.parse ? + window.JSON.parse( data ) : + (new Function("return " + data))(); + + } else { + jQuery.error( "Invalid JSON: " + data ); + } + }, + + // Cross-browser xml parsing + // (xml & tmp used internally) + parseXML: function( data , xml , tmp ) { + + if ( window.DOMParser ) { // Standard + tmp = new DOMParser(); + xml = tmp.parseFromString( data , "text/xml" ); + } else { // IE + xml = new ActiveXObject( "Microsoft.XMLDOM" ); + xml.async = "false"; + xml.loadXML( data ); + } + + tmp = xml.documentElement; + + if ( ! tmp || ! tmp.nodeName || tmp.nodeName === "parsererror" ) { + jQuery.error( "Invalid XML: " + data ); + } + + return xml; + }, + + noop: function() {}, + + // Evalulates a script in a global context + globalEval: function( data ) { + if ( data && rnotwhite.test(data) ) { + // Inspired by code by Andrea Giammarchi + // http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html + var head = document.getElementsByTagName("head")[0] || document.documentElement, + script = document.createElement("script"); + + script.type = "text/javascript"; + + if ( jQuery.support.scriptEval() ) { + script.appendChild( document.createTextNode( data ) ); + } else { + script.text = data; + } + + // Use insertBefore instead of appendChild to circumvent an IE6 bug. + // This arises when a base node is used (#2709). + head.insertBefore( script, head.firstChild ); + head.removeChild( script ); + } + }, + + nodeName: function( elem, name ) { + return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase(); + }, + + // args is for internal usage only + each: function( object, callback, args ) { + var name, i = 0, + length = object.length, + isObj = length === undefined || jQuery.isFunction(object); + + if ( args ) { + if ( isObj ) { + for ( name in object ) { + if ( callback.apply( object[ name ], args ) === false ) { + break; + } + } + } else { + for ( ; i < length; ) { + if ( callback.apply( object[ i++ ], args ) === false ) { + break; + } + } + } + + // A special, fast, case for the most common use of each + } else { + if ( isObj ) { + for ( name in object ) { + if ( callback.call( object[ name ], name, object[ name ] ) === false ) { + break; + } + } + } else { + for ( var value = object[0]; + i < length && callback.call( value, i, value ) !== false; value = object[++i] ) {} + } + } + + return object; + }, + + // Use native String.trim function wherever possible + trim: trim ? + function( text ) { + return text == null ? + "" : + trim.call( text ); + } : + + // Otherwise use our own trimming functionality + function( text ) { + return text == null ? + "" : + text.toString().replace( trimLeft, "" ).replace( trimRight, "" ); + }, + + // results is for internal usage only + makeArray: function( array, results ) { + var ret = results || []; + + if ( array != null ) { + // The window, strings (and functions) also have 'length' + // The extra typeof function check is to prevent crashes + // in Safari 2 (See: #3039) + // Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930 + var type = jQuery.type(array); + + if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) { + push.call( ret, array ); + } else { + jQuery.merge( ret, array ); + } + } + + return ret; + }, + + inArray: function( elem, array ) { + if ( array.indexOf ) { + return array.indexOf( elem ); + } + + for ( var i = 0, length = array.length; i < length; i++ ) { + if ( array[ i ] === elem ) { + return i; + } + } + + return -1; + }, + + merge: function( first, second ) { + var i = first.length, + j = 0; + + if ( typeof second.length === "number" ) { + for ( var l = second.length; j < l; j++ ) { + first[ i++ ] = second[ j ]; + } + + } else { + while ( second[j] !== undefined ) { + first[ i++ ] = second[ j++ ]; + } + } + + first.length = i; + + return first; + }, + + grep: function( elems, callback, inv ) { + var ret = [], retVal; + inv = !!inv; + + // Go through the array, only saving the items + // that pass the validator function + for ( var i = 0, length = elems.length; i < length; i++ ) { + retVal = !!callback( elems[ i ], i ); + if ( inv !== retVal ) { + ret.push( elems[ i ] ); + } + } + + return ret; + }, + + // arg is for internal usage only + map: function( elems, callback, arg ) { + var ret = [], value; + + // Go through the array, translating each of the items to their + // new value (or values). + for ( var i = 0, length = elems.length; i < length; i++ ) { + value = callback( elems[ i ], i, arg ); + + if ( value != null ) { + ret[ ret.length ] = value; + } + } + + // Flatten any nested arrays + return ret.concat.apply( [], ret ); + }, + + // A global GUID counter for objects + guid: 1, + + proxy: function( fn, proxy, thisObject ) { + if ( arguments.length === 2 ) { + if ( typeof proxy === "string" ) { + thisObject = fn; + fn = thisObject[ proxy ]; + proxy = undefined; + + } else if ( proxy && !jQuery.isFunction( proxy ) ) { + thisObject = proxy; + proxy = undefined; + } + } + + if ( !proxy && fn ) { + proxy = function() { + return fn.apply( thisObject || this, arguments ); + }; + } + + // Set the guid of unique handler to the same of original handler, so it can be removed + if ( fn ) { + proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++; + } + + // So proxy can be declared as an argument + return proxy; + }, + + // Mutifunctional method to get and set values to a collection + // The value/s can be optionally by executed if its a function + access: function( elems, key, value, exec, fn, pass ) { + var length = elems.length; + + // Setting many attributes + if ( typeof key === "object" ) { + for ( var k in key ) { + jQuery.access( elems, k, key[k], exec, fn, value ); + } + return elems; + } + + // Setting one attribute + if ( value !== undefined ) { + // Optionally, function values get executed if exec is true + exec = !pass && exec && jQuery.isFunction(value); + + for ( var i = 0; i < length; i++ ) { + fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass ); + } + + return elems; + } + + // Getting an attribute + return length ? fn( elems[0], key ) : undefined; + }, + + now: function() { + return (new Date()).getTime(); + }, + + // Create a simple deferred (one callbacks list) + _Deferred: function() { + var // callbacks list + callbacks = [], + // stored [ context , args ] + fired, + // to avoid firing when already doing so + firing, + // flag to know if the deferred has been cancelled + cancelled, + // the deferred itself + deferred = { + + // done( f1, f2, ...) + done: function() { + if ( !cancelled ) { + var args = arguments, + i, + length, + elem, + type, + _fired; + if ( fired ) { + _fired = fired; + fired = 0; + } + for ( i = 0, length = args.length; i < length; i++ ) { + elem = args[ i ]; + type = jQuery.type( elem ); + if ( type === "array" ) { + deferred.done.apply( deferred, elem ); + } else if ( type === "function" ) { + callbacks.push( elem ); + } + } + if ( _fired ) { + deferred.resolveWith( _fired[ 0 ], _fired[ 1 ] ); + } + } + return this; + }, + + // resolve with given context and args + resolveWith: function( context, args ) { + if ( !cancelled && !fired && !firing ) { + firing = 1; + try { + while( callbacks[ 0 ] ) { + callbacks.shift().apply( context, args ); + } + } + finally { + fired = [ context, args ]; + firing = 0; + } + } + return this; + }, + + // resolve with this as context and given arguments + resolve: function() { + deferred.resolveWith( jQuery.isFunction( this.promise ) ? this.promise() : this, arguments ); + return this; + }, + + // Has this deferred been resolved? + isResolved: function() { + return !!( firing || fired ); + }, + + // Cancel + cancel: function() { + cancelled = 1; + callbacks = []; + return this; + } + }; + + return deferred; + }, + + // Full fledged deferred (two callbacks list) + Deferred: function( func ) { + var deferred = jQuery._Deferred(), + failDeferred = jQuery._Deferred(), + promise; + // Add errorDeferred methods, then and promise + jQuery.extend( deferred, { + then: function( doneCallbacks, failCallbacks ) { + deferred.done( doneCallbacks ).fail( failCallbacks ); + return this; + }, + fail: failDeferred.done, + rejectWith: failDeferred.resolveWith, + reject: failDeferred.resolve, + isRejected: failDeferred.isResolved, + // Get a promise for this deferred + // If obj is provided, the promise aspect is added to the object + promise: function( obj , i /* internal */ ) { + if ( obj == null ) { + if ( promise ) { + return promise; + } + promise = obj = {}; + } + i = promiseMethods.length; + while( i-- ) { + obj[ promiseMethods[ i ] ] = deferred[ promiseMethods[ i ] ]; + } + return obj; + } + } ); + // Make sure only one callback list will be used + deferred.then( failDeferred.cancel, deferred.cancel ); + // Unexpose cancel + delete deferred.cancel; + // Call given func if any + if ( func ) { + func.call( deferred, deferred ); + } + return deferred; + }, + + // Deferred helper + when: function( object ) { + var args = arguments, + length = args.length, + deferred = length <= 1 && object && jQuery.isFunction( object.promise ) ? + object : + jQuery.Deferred(), + promise = deferred.promise(), + resolveArray; + + if ( length > 1 ) { + resolveArray = new Array( length ); + jQuery.each( args, function( index, element ) { + jQuery.when( element ).then( function( value ) { + resolveArray[ index ] = arguments.length > 1 ? slice.call( arguments, 0 ) : value; + if( ! --length ) { + deferred.resolveWith( promise, resolveArray ); + } + }, deferred.reject ); + } ); + } else if ( deferred !== object ) { + deferred.resolve( object ); + } + return promise; + }, + + // Use of jQuery.browser is frowned upon. + // More details: http://docs.jquery.com/Utilities/jQuery.browser + uaMatch: function( ua ) { + ua = ua.toLowerCase(); + + var match = rwebkit.exec( ua ) || + ropera.exec( ua ) || + rmsie.exec( ua ) || + ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) || + []; + + return { browser: match[1] || "", version: match[2] || "0" }; + }, + + sub: function() { + function jQuerySubclass( selector, context ) { + return new jQuerySubclass.fn.init( selector, context ); + } + jQuery.extend( true, jQuerySubclass, this ); + jQuerySubclass.superclass = this; + jQuerySubclass.fn = jQuerySubclass.prototype = this(); + jQuerySubclass.fn.constructor = jQuerySubclass; + jQuerySubclass.subclass = this.subclass; + jQuerySubclass.fn.init = function init( selector, context ) { + if ( context && context instanceof jQuery && !(context instanceof jQuerySubclass) ) { + context = jQuerySubclass(context); + } + + return jQuery.fn.init.call( this, selector, context, rootjQuerySubclass ); + }; + jQuerySubclass.fn.init.prototype = jQuerySubclass.fn; + var rootjQuerySubclass = jQuerySubclass(document); + return jQuerySubclass; + }, + + browser: {} +}); + +// Create readyList deferred +readyList = jQuery._Deferred(); + +// Populate the class2type map +jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) { + class2type[ "[object " + name + "]" ] = name.toLowerCase(); +}); + +browserMatch = jQuery.uaMatch( userAgent ); +if ( browserMatch.browser ) { + jQuery.browser[ browserMatch.browser ] = true; + jQuery.browser.version = browserMatch.version; +} + +// Deprecated, use jQuery.browser.webkit instead +if ( jQuery.browser.webkit ) { + jQuery.browser.safari = true; +} + +if ( indexOf ) { + jQuery.inArray = function( elem, array ) { + return indexOf.call( array, elem ); + }; +} + +// IE doesn't match non-breaking spaces with \s +if ( rnotwhite.test( "\xA0" ) ) { + trimLeft = /^[\s\xA0]+/; + trimRight = /[\s\xA0]+$/; +} + +// All jQuery objects should point back to these +rootjQuery = jQuery(document); + +// Cleanup functions for the document ready method +if ( document.addEventListener ) { + DOMContentLoaded = function() { + document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false ); + jQuery.ready(); + }; + +} else if ( document.attachEvent ) { + DOMContentLoaded = function() { + // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). + if ( document.readyState === "complete" ) { + document.detachEvent( "onreadystatechange", DOMContentLoaded ); + jQuery.ready(); + } + }; +} + +// The DOM ready check for Internet Explorer +function doScrollCheck() { + if ( jQuery.isReady ) { + return; + } + + try { + // If IE is used, use the trick by Diego Perini + // http://javascript.nwbox.com/IEContentLoaded/ + document.documentElement.doScroll("left"); + } catch(e) { + setTimeout( doScrollCheck, 1 ); + return; + } + + // and execute any waiting functions + jQuery.ready(); +} + +// Expose jQuery to the global object +return (window.jQuery = window.$ = jQuery); + +})(); + + +(function() { + + jQuery.support = {}; + + var div = document.createElement("div"); + + div.style.display = "none"; + div.innerHTML = "
a"; + + var all = div.getElementsByTagName("*"), + a = div.getElementsByTagName("a")[0], + select = document.createElement("select"), + opt = select.appendChild( document.createElement("option") ); + + // Can't get basic test support + if ( !all || !all.length || !a ) { + return; + } + + jQuery.support = { + // IE strips leading whitespace when .innerHTML is used + leadingWhitespace: div.firstChild.nodeType === 3, + + // Make sure that tbody elements aren't automatically inserted + // IE will insert them into empty tables + tbody: !div.getElementsByTagName("tbody").length, + + // Make sure that link elements get serialized correctly by innerHTML + // This requires a wrapper element in IE + htmlSerialize: !!div.getElementsByTagName("link").length, + + // Get the style information from getAttribute + // (IE uses .cssText insted) + style: /red/.test( a.getAttribute("style") ), + + // Make sure that URLs aren't manipulated + // (IE normalizes it by default) + hrefNormalized: a.getAttribute("href") === "/a", + + // Make sure that element opacity exists + // (IE uses filter instead) + // Use a regex to work around a WebKit issue. See #5145 + opacity: /^0.55$/.test( a.style.opacity ), + + // Verify style float existence + // (IE uses styleFloat instead of cssFloat) + cssFloat: !!a.style.cssFloat, + + // Make sure that if no value is specified for a checkbox + // that it defaults to "on". + // (WebKit defaults to "" instead) + checkOn: div.getElementsByTagName("input")[0].value === "on", + + // Make sure that a selected-by-default option has a working selected property. + // (WebKit defaults to false instead of true, IE too, if it's in an optgroup) + optSelected: opt.selected, + + // Will be defined later + deleteExpando: true, + optDisabled: false, + checkClone: false, + _scriptEval: null, + noCloneEvent: true, + boxModel: null, + inlineBlockNeedsLayout: false, + shrinkWrapBlocks: false, + reliableHiddenOffsets: true + }; + + // Make sure that the options inside disabled selects aren't marked as disabled + // (WebKit marks them as diabled) + select.disabled = true; + jQuery.support.optDisabled = !opt.disabled; + + jQuery.support.scriptEval = function() { + if ( jQuery.support._scriptEval === null ) { + var root = document.documentElement, + script = document.createElement("script"), + id = "script" + jQuery.now(); + + script.type = "text/javascript"; + try { + script.appendChild( document.createTextNode( "window." + id + "=1;" ) ); + } catch(e) {} + + root.insertBefore( script, root.firstChild ); + + // Make sure that the execution of code works by injecting a script + // tag with appendChild/createTextNode + // (IE doesn't support this, fails, and uses .text instead) + if ( window[ id ] ) { + jQuery.support._scriptEval = true; + delete window[ id ]; + } else { + jQuery.support._scriptEval = false; + } + + root.removeChild( script ); + // release memory in IE + root = script = id = null; + } + + return jQuery.support._scriptEval; + }; + + // Test to see if it's possible to delete an expando from an element + // Fails in Internet Explorer + try { + delete div.test; + + } catch(e) { + jQuery.support.deleteExpando = false; + } + + if ( div.attachEvent && div.fireEvent ) { + div.attachEvent("onclick", function click() { + // Cloning a node shouldn't copy over any + // bound event handlers (IE does this) + jQuery.support.noCloneEvent = false; + div.detachEvent("onclick", click); + }); + div.cloneNode(true).fireEvent("onclick"); + } + + div = document.createElement("div"); + div.innerHTML = ""; + + var fragment = document.createDocumentFragment(); + fragment.appendChild( div.firstChild ); + + // WebKit doesn't clone checked state correctly in fragments + jQuery.support.checkClone = fragment.cloneNode(true).cloneNode(true).lastChild.checked; + + // Figure out if the W3C box model works as expected + // document.body must exist before we can do this + jQuery(function() { + var div = document.createElement("div"), + body = document.getElementsByTagName("body")[0]; + + // Frameset documents with no body should not run this code + if ( !body ) { + return; + } + + div.style.width = div.style.paddingLeft = "1px"; + body.appendChild( div ); + jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2; + + if ( "zoom" in div.style ) { + // Check if natively block-level elements act like inline-block + // elements when setting their display to 'inline' and giving + // them layout + // (IE < 8 does this) + div.style.display = "inline"; + div.style.zoom = 1; + jQuery.support.inlineBlockNeedsLayout = div.offsetWidth === 2; + + // Check if elements with layout shrink-wrap their children + // (IE 6 does this) + div.style.display = ""; + div.innerHTML = "
"; + jQuery.support.shrinkWrapBlocks = div.offsetWidth !== 2; + } + + div.innerHTML = "
t
"; + var tds = div.getElementsByTagName("td"); + + // Check if table cells still have offsetWidth/Height when they are set + // to display:none and there are still other visible table cells in a + // table row; if so, offsetWidth/Height are not reliable for use when + // determining if an element has been hidden directly using + // display:none (it is still safe to use offsets if a parent element is + // hidden; don safety goggles and see bug #4512 for more information). + // (only IE 8 fails this test) + jQuery.support.reliableHiddenOffsets = tds[0].offsetHeight === 0; + + tds[0].style.display = ""; + tds[1].style.display = "none"; + + // Check if empty table cells still have offsetWidth/Height + // (IE < 8 fail this test) + jQuery.support.reliableHiddenOffsets = jQuery.support.reliableHiddenOffsets && tds[0].offsetHeight === 0; + div.innerHTML = ""; + + body.removeChild( div ).style.display = "none"; + div = tds = null; + }); + + // Technique from Juriy Zaytsev + // http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/ + var eventSupported = function( eventName ) { + var el = document.createElement("div"); + eventName = "on" + eventName; + + // We only care about the case where non-standard event systems + // are used, namely in IE. Short-circuiting here helps us to + // avoid an eval call (in setAttribute) which can cause CSP + // to go haywire. See: https://developer.mozilla.org/en/Security/CSP + if ( !el.attachEvent ) { + return true; + } + + var isSupported = (eventName in el); + if ( !isSupported ) { + el.setAttribute(eventName, "return;"); + isSupported = typeof el[eventName] === "function"; + } + el = null; + + return isSupported; + }; + + jQuery.support.submitBubbles = eventSupported("submit"); + jQuery.support.changeBubbles = eventSupported("change"); + + // release memory in IE + div = all = a = null; +})(); + + + +var rbrace = /^(?:\{.*\}|\[.*\])$/; + +jQuery.extend({ + cache: {}, + + // Please use with caution + uuid: 0, + + // Unique for each copy of jQuery on the page + // Non-digits removed to match rinlinejQuery + expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ), + + // The following elements throw uncatchable exceptions if you + // attempt to add expando properties to them. + noData: { + "embed": true, + // Ban all objects except for Flash (which handle expandos) + "object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000", + "applet": true + }, + + hasData: function( elem ) { + elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ]; + + return !!elem && !jQuery.isEmptyObject(elem); + }, + + data: function( elem, name, data, pvt /* Internal Use Only */ ) { + if ( !jQuery.acceptData( elem ) ) { + return; + } + + var internalKey = jQuery.expando, getByName = typeof name === "string", thisCache, + + // We have to handle DOM nodes and JS objects differently because IE6-7 + // can't GC object references properly across the DOM-JS boundary + isNode = elem.nodeType, + + // Only DOM nodes need the global jQuery cache; JS object data is + // attached directly to the object so GC can occur automatically + cache = isNode ? jQuery.cache : elem, + + // Only defining an ID for JS objects if its cache already exists allows + // the code to shortcut on the same path as a DOM node with no cache + id = isNode ? elem[ jQuery.expando ] : elem[ jQuery.expando ] && jQuery.expando; + + // Avoid doing any more work than we need to when trying to get data on an + // object that has no data at all + if ( (!id || (pvt && id && !cache[ id ][ internalKey ])) && getByName && data === undefined ) { + return; + } + + if ( !id ) { + // Only DOM nodes need a new unique ID for each element since their data + // ends up in the global cache + if ( isNode ) { + elem[ jQuery.expando ] = id = ++jQuery.uuid; + } else { + id = jQuery.expando; + } + } + + if ( !cache[ id ] ) { + cache[ id ] = {}; + } + + // An object can be passed to jQuery.data instead of a key/value pair; this gets + // shallow copied over onto the existing cache + if ( typeof name === "object" ) { + if ( pvt ) { + cache[ id ][ internalKey ] = jQuery.extend(cache[ id ][ internalKey ], name); + } else { + cache[ id ] = jQuery.extend(cache[ id ], name); + } + } + + thisCache = cache[ id ]; + + // Internal jQuery data is stored in a separate object inside the object's data + // cache in order to avoid key collisions between internal data and user-defined + // data + if ( pvt ) { + if ( !thisCache[ internalKey ] ) { + thisCache[ internalKey ] = {}; + } + + thisCache = thisCache[ internalKey ]; + } + + if ( data !== undefined ) { + thisCache[ name ] = data; + } + + // TODO: This is a hack for 1.5 ONLY. It will be removed in 1.6. Users should + // not attempt to inspect the internal events object using jQuery.data, as this + // internal data object is undocumented and subject to change. + if ( name === "events" && !thisCache[name] ) { + return thisCache[ internalKey ] && thisCache[ internalKey ].events; + } + + return getByName ? thisCache[ name ] : thisCache; + }, + + removeData: function( elem, name, pvt /* Internal Use Only */ ) { + if ( !jQuery.acceptData( elem ) ) { + return; + } + + var internalKey = jQuery.expando, isNode = elem.nodeType, + + // See jQuery.data for more information + cache = isNode ? jQuery.cache : elem, + + // See jQuery.data for more information + id = isNode ? elem[ jQuery.expando ] : jQuery.expando; + + // If there is already no cache entry for this object, there is no + // purpose in continuing + if ( !cache[ id ] ) { + return; + } + + if ( name ) { + var thisCache = pvt ? cache[ id ][ internalKey ] : cache[ id ]; + + if ( thisCache ) { + delete thisCache[ name ]; + + // If there is no data left in the cache, we want to continue + // and let the cache object itself get destroyed + if ( !jQuery.isEmptyObject(thisCache) ) { + return; + } + } + } + + // See jQuery.data for more information + if ( pvt ) { + delete cache[ id ][ internalKey ]; + + // Don't destroy the parent cache unless the internal data object + // had been the only thing left in it + if ( !jQuery.isEmptyObject(cache[ id ]) ) { + return; + } + } + + var internalCache = cache[ id ][ internalKey ]; + + // Browsers that fail expando deletion also refuse to delete expandos on + // the window, but it will allow it on all other JS objects; other browsers + // don't care + if ( jQuery.support.deleteExpando || cache != window ) { + delete cache[ id ]; + } else { + cache[ id ] = null; + } + + // We destroyed the entire user cache at once because it's faster than + // iterating through each key, but we need to continue to persist internal + // data if it existed + if ( internalCache ) { + cache[ id ] = {}; + cache[ id ][ internalKey ] = internalCache; + + // Otherwise, we need to eliminate the expando on the node to avoid + // false lookups in the cache for entries that no longer exist + } else if ( isNode ) { + // IE does not allow us to delete expando properties from nodes, + // nor does it have a removeAttribute function on Document nodes; + // we must handle all of these cases + if ( jQuery.support.deleteExpando ) { + delete elem[ jQuery.expando ]; + } else if ( elem.removeAttribute ) { + elem.removeAttribute( jQuery.expando ); + } else { + elem[ jQuery.expando ] = null; + } + } + }, + + // For internal use only. + _data: function( elem, name, data ) { + return jQuery.data( elem, name, data, true ); + }, + + // A method for determining if a DOM node can handle the data expando + acceptData: function( elem ) { + if ( elem.nodeName ) { + var match = jQuery.noData[ elem.nodeName.toLowerCase() ]; + + if ( match ) { + return !(match === true || elem.getAttribute("classid") !== match); + } + } + + return true; + } +}); + +jQuery.fn.extend({ + data: function( key, value ) { + var data = null; + + if ( typeof key === "undefined" ) { + if ( this.length ) { + data = jQuery.data( this[0] ); + + if ( this[0].nodeType === 1 ) { + var attr = this[0].attributes, name; + for ( var i = 0, l = attr.length; i < l; i++ ) { + name = attr[i].name; + + if ( name.indexOf( "data-" ) === 0 ) { + name = name.substr( 5 ); + dataAttr( this[0], name, data[ name ] ); + } + } + } + } + + return data; + + } else if ( typeof key === "object" ) { + return this.each(function() { + jQuery.data( this, key ); + }); + } + + var parts = key.split("."); + parts[1] = parts[1] ? "." + parts[1] : ""; + + if ( value === undefined ) { + data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]); + + // Try to fetch any internally stored data first + if ( data === undefined && this.length ) { + data = jQuery.data( this[0], key ); + data = dataAttr( this[0], key, data ); + } + + return data === undefined && parts[1] ? + this.data( parts[0] ) : + data; + + } else { + return this.each(function() { + var $this = jQuery( this ), + args = [ parts[0], value ]; + + $this.triggerHandler( "setData" + parts[1] + "!", args ); + jQuery.data( this, key, value ); + $this.triggerHandler( "changeData" + parts[1] + "!", args ); + }); + } + }, + + removeData: function( key ) { + return this.each(function() { + jQuery.removeData( this, key ); + }); + } +}); + +function dataAttr( elem, key, data ) { + // If nothing was found internally, try to fetch any + // data from the HTML5 data-* attribute + if ( data === undefined && elem.nodeType === 1 ) { + data = elem.getAttribute( "data-" + key ); + + if ( typeof data === "string" ) { + try { + data = data === "true" ? true : + data === "false" ? false : + data === "null" ? null : + !jQuery.isNaN( data ) ? parseFloat( data ) : + rbrace.test( data ) ? jQuery.parseJSON( data ) : + data; + } catch( e ) {} + + // Make sure we set the data so it isn't changed later + jQuery.data( elem, key, data ); + + } else { + data = undefined; + } + } + + return data; +} + + + + +jQuery.extend({ + queue: function( elem, type, data ) { + if ( !elem ) { + return; + } + + type = (type || "fx") + "queue"; + var q = jQuery._data( elem, type ); + + // Speed up dequeue by getting out quickly if this is just a lookup + if ( !data ) { + return q || []; + } + + if ( !q || jQuery.isArray(data) ) { + q = jQuery._data( elem, type, jQuery.makeArray(data) ); + + } else { + q.push( data ); + } + + return q; + }, + + dequeue: function( elem, type ) { + type = type || "fx"; + + var queue = jQuery.queue( elem, type ), + fn = queue.shift(); + + // If the fx queue is dequeued, always remove the progress sentinel + if ( fn === "inprogress" ) { + fn = queue.shift(); + } + + if ( fn ) { + // Add a progress sentinel to prevent the fx queue from being + // automatically dequeued + if ( type === "fx" ) { + queue.unshift("inprogress"); + } + + fn.call(elem, function() { + jQuery.dequeue(elem, type); + }); + } + + if ( !queue.length ) { + jQuery.removeData( elem, type + "queue", true ); + } + } +}); + +jQuery.fn.extend({ + queue: function( type, data ) { + if ( typeof type !== "string" ) { + data = type; + type = "fx"; + } + + if ( data === undefined ) { + return jQuery.queue( this[0], type ); + } + return this.each(function( i ) { + var queue = jQuery.queue( this, type, data ); + + if ( type === "fx" && queue[0] !== "inprogress" ) { + jQuery.dequeue( this, type ); + } + }); + }, + dequeue: function( type ) { + return this.each(function() { + jQuery.dequeue( this, type ); + }); + }, + + // Based off of the plugin by Clint Helfers, with permission. + // http://blindsignals.com/index.php/2009/07/jquery-delay/ + delay: function( time, type ) { + time = jQuery.fx ? jQuery.fx.speeds[time] || time : time; + type = type || "fx"; + + return this.queue( type, function() { + var elem = this; + setTimeout(function() { + jQuery.dequeue( elem, type ); + }, time ); + }); + }, + + clearQueue: function( type ) { + return this.queue( type || "fx", [] ); + } +}); + + + + +var rclass = /[\n\t\r]/g, + rspaces = /\s+/, + rreturn = /\r/g, + rspecialurl = /^(?:href|src|style)$/, + rtype = /^(?:button|input)$/i, + rfocusable = /^(?:button|input|object|select|textarea)$/i, + rclickable = /^a(?:rea)?$/i, + rradiocheck = /^(?:radio|checkbox)$/i; + +jQuery.props = { + "for": "htmlFor", + "class": "className", + readonly: "readOnly", + maxlength: "maxLength", + cellspacing: "cellSpacing", + rowspan: "rowSpan", + colspan: "colSpan", + tabindex: "tabIndex", + usemap: "useMap", + frameborder: "frameBorder" +}; + +jQuery.fn.extend({ + attr: function( name, value ) { + return jQuery.access( this, name, value, true, jQuery.attr ); + }, + + removeAttr: function( name, fn ) { + return this.each(function(){ + jQuery.attr( this, name, "" ); + if ( this.nodeType === 1 ) { + this.removeAttribute( name ); + } + }); + }, + + addClass: function( value ) { + if ( jQuery.isFunction(value) ) { + return this.each(function(i) { + var self = jQuery(this); + self.addClass( value.call(this, i, self.attr("class")) ); + }); + } + + if ( value && typeof value === "string" ) { + var classNames = (value || "").split( rspaces ); + + for ( var i = 0, l = this.length; i < l; i++ ) { + var elem = this[i]; + + if ( elem.nodeType === 1 ) { + if ( !elem.className ) { + elem.className = value; + + } else { + var className = " " + elem.className + " ", + setClass = elem.className; + + for ( var c = 0, cl = classNames.length; c < cl; c++ ) { + if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) { + setClass += " " + classNames[c]; + } + } + elem.className = jQuery.trim( setClass ); + } + } + } + } + + return this; + }, + + removeClass: function( value ) { + if ( jQuery.isFunction(value) ) { + return this.each(function(i) { + var self = jQuery(this); + self.removeClass( value.call(this, i, self.attr("class")) ); + }); + } + + if ( (value && typeof value === "string") || value === undefined ) { + var classNames = (value || "").split( rspaces ); + + for ( var i = 0, l = this.length; i < l; i++ ) { + var elem = this[i]; + + if ( elem.nodeType === 1 && elem.className ) { + if ( value ) { + var className = (" " + elem.className + " ").replace(rclass, " "); + for ( var c = 0, cl = classNames.length; c < cl; c++ ) { + className = className.replace(" " + classNames[c] + " ", " "); + } + elem.className = jQuery.trim( className ); + + } else { + elem.className = ""; + } + } + } + } + + return this; + }, + + toggleClass: function( value, stateVal ) { + var type = typeof value, + isBool = typeof stateVal === "boolean"; + + if ( jQuery.isFunction( value ) ) { + return this.each(function(i) { + var self = jQuery(this); + self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal ); + }); + } + + return this.each(function() { + if ( type === "string" ) { + // toggle individual class names + var className, + i = 0, + self = jQuery( this ), + state = stateVal, + classNames = value.split( rspaces ); + + while ( (className = classNames[ i++ ]) ) { + // check each className given, space seperated list + state = isBool ? state : !self.hasClass( className ); + self[ state ? "addClass" : "removeClass" ]( className ); + } + + } else if ( type === "undefined" || type === "boolean" ) { + if ( this.className ) { + // store className if set + jQuery._data( this, "__className__", this.className ); + } + + // toggle whole className + this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || ""; + } + }); + }, + + hasClass: function( selector ) { + var className = " " + selector + " "; + for ( var i = 0, l = this.length; i < l; i++ ) { + if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) { + return true; + } + } + + return false; + }, + + val: function( value ) { + if ( !arguments.length ) { + var elem = this[0]; + + if ( elem ) { + if ( jQuery.nodeName( elem, "option" ) ) { + // attributes.value is undefined in Blackberry 4.7 but + // uses .value. See #6932 + var val = elem.attributes.value; + return !val || val.specified ? elem.value : elem.text; + } + + // We need to handle select boxes special + if ( jQuery.nodeName( elem, "select" ) ) { + var index = elem.selectedIndex, + values = [], + options = elem.options, + one = elem.type === "select-one"; + + // Nothing was selected + if ( index < 0 ) { + return null; + } + + // Loop through all the selected options + for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) { + var option = options[ i ]; + + // Don't return options that are disabled or in a disabled optgroup + if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) && + (!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) { + + // Get the specific value for the option + value = jQuery(option).val(); + + // We don't need an array for one selects + if ( one ) { + return value; + } + + // Multi-Selects return an array + values.push( value ); + } + } + + return values; + } + + // Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified + if ( rradiocheck.test( elem.type ) && !jQuery.support.checkOn ) { + return elem.getAttribute("value") === null ? "on" : elem.value; + } + + // Everything else, we just grab the value + return (elem.value || "").replace(rreturn, ""); + + } + + return undefined; + } + + var isFunction = jQuery.isFunction(value); + + return this.each(function(i) { + var self = jQuery(this), val = value; + + if ( this.nodeType !== 1 ) { + return; + } + + if ( isFunction ) { + val = value.call(this, i, self.val()); + } + + // Treat null/undefined as ""; convert numbers to string + if ( val == null ) { + val = ""; + } else if ( typeof val === "number" ) { + val += ""; + } else if ( jQuery.isArray(val) ) { + val = jQuery.map(val, function (value) { + return value == null ? "" : value + ""; + }); + } + + if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) { + this.checked = jQuery.inArray( self.val(), val ) >= 0; + + } else if ( jQuery.nodeName( this, "select" ) ) { + var values = jQuery.makeArray(val); + + jQuery( "option", this ).each(function() { + this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0; + }); + + if ( !values.length ) { + this.selectedIndex = -1; + } + + } else { + this.value = val; + } + }); + } +}); + +jQuery.extend({ + attrFn: { + val: true, + css: true, + html: true, + text: true, + data: true, + width: true, + height: true, + offset: true + }, + + attr: function( elem, name, value, pass ) { + // don't get/set attributes on text, comment and attribute nodes + if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || elem.nodeType === 2 ) { + return undefined; + } + + if ( pass && name in jQuery.attrFn ) { + return jQuery(elem)[name](value); + } + + var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ), + // Whether we are setting (or getting) + set = value !== undefined; + + // Try to normalize/fix the name + name = notxml && jQuery.props[ name ] || name; + + // Only do all the following if this is a node (faster for style) + if ( elem.nodeType === 1 ) { + // These attributes require special treatment + var special = rspecialurl.test( name ); + + // Safari mis-reports the default selected property of an option + // Accessing the parent's selectedIndex property fixes it + if ( name === "selected" && !jQuery.support.optSelected ) { + var parent = elem.parentNode; + if ( parent ) { + parent.selectedIndex; + + // Make sure that it also works with optgroups, see #5701 + if ( parent.parentNode ) { + parent.parentNode.selectedIndex; + } + } + } + + // If applicable, access the attribute via the DOM 0 way + // 'in' checks fail in Blackberry 4.7 #6931 + if ( (name in elem || elem[ name ] !== undefined) && notxml && !special ) { + if ( set ) { + // We can't allow the type property to be changed (since it causes problems in IE) + if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) { + jQuery.error( "type property can't be changed" ); + } + + if ( value === null ) { + if ( elem.nodeType === 1 ) { + elem.removeAttribute( name ); + } + + } else { + elem[ name ] = value; + } + } + + // browsers index elements by id/name on forms, give priority to attributes. + if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) { + return elem.getAttributeNode( name ).nodeValue; + } + + // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set + // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ + if ( name === "tabIndex" ) { + var attributeNode = elem.getAttributeNode( "tabIndex" ); + + return attributeNode && attributeNode.specified ? + attributeNode.value : + rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ? + 0 : + undefined; + } + + return elem[ name ]; + } + + if ( !jQuery.support.style && notxml && name === "style" ) { + if ( set ) { + elem.style.cssText = "" + value; + } + + return elem.style.cssText; + } + + if ( set ) { + // convert the value to a string (all browsers do this but IE) see #1070 + elem.setAttribute( name, "" + value ); + } + + // Ensure that missing attributes return undefined + // Blackberry 4.7 returns "" from getAttribute #6938 + if ( !elem.attributes[ name ] && (elem.hasAttribute && !elem.hasAttribute( name )) ) { + return undefined; + } + + var attr = !jQuery.support.hrefNormalized && notxml && special ? + // Some attributes require a special call on IE + elem.getAttribute( name, 2 ) : + elem.getAttribute( name ); + + // Non-existent attributes return null, we normalize to undefined + return attr === null ? undefined : attr; + } + // Handle everything which isn't a DOM element node + if ( set ) { + elem[ name ] = value; + } + return elem[ name ]; + } +}); + + + + +var rnamespaces = /\.(.*)$/, + rformElems = /^(?:textarea|input|select)$/i, + rperiod = /\./g, + rspace = / /g, + rescape = /[^\w\s.|`]/g, + fcleanup = function( nm ) { + return nm.replace(rescape, "\\$&"); + }, + eventKey = "events"; + +/* + * A number of helper functions used for managing events. + * Many of the ideas behind this code originated from + * Dean Edwards' addEvent library. + */ +jQuery.event = { + + // Bind an event to an element + // Original by Dean Edwards + add: function( elem, types, handler, data ) { + if ( elem.nodeType === 3 || elem.nodeType === 8 ) { + return; + } + + // For whatever reason, IE has trouble passing the window object + // around, causing it to be cloned in the process + if ( jQuery.isWindow( elem ) && ( elem !== window && !elem.frameElement ) ) { + elem = window; + } + + if ( handler === false ) { + handler = returnFalse; + } else if ( !handler ) { + // Fixes bug #7229. Fix recommended by jdalton + return; + } + + var handleObjIn, handleObj; + + if ( handler.handler ) { + handleObjIn = handler; + handler = handleObjIn.handler; + } + + // Make sure that the function being executed has a unique ID + if ( !handler.guid ) { + handler.guid = jQuery.guid++; + } + + // Init the element's event structure + var elemData = jQuery._data( elem ); + + // If no elemData is found then we must be trying to bind to one of the + // banned noData elements + if ( !elemData ) { + return; + } + + var events = elemData[ eventKey ], + eventHandle = elemData.handle; + + if ( typeof events === "function" ) { + // On plain objects events is a fn that holds the the data + // which prevents this data from being JSON serialized + // the function does not need to be called, it just contains the data + eventHandle = events.handle; + events = events.events; + + } else if ( !events ) { + if ( !elem.nodeType ) { + // On plain objects, create a fn that acts as the holder + // of the values to avoid JSON serialization of event data + elemData[ eventKey ] = elemData = function(){}; + } + + elemData.events = events = {}; + } + + if ( !eventHandle ) { + elemData.handle = eventHandle = function() { + // Handle the second event of a trigger and when + // an event is called after a page has unloaded + return typeof jQuery !== "undefined" && !jQuery.event.triggered ? + jQuery.event.handle.apply( eventHandle.elem, arguments ) : + undefined; + }; + } + + // Add elem as a property of the handle function + // This is to prevent a memory leak with non-native events in IE. + eventHandle.elem = elem; + + // Handle multiple events separated by a space + // jQuery(...).bind("mouseover mouseout", fn); + types = types.split(" "); + + var type, i = 0, namespaces; + + while ( (type = types[ i++ ]) ) { + handleObj = handleObjIn ? + jQuery.extend({}, handleObjIn) : + { handler: handler, data: data }; + + // Namespaced event handlers + if ( type.indexOf(".") > -1 ) { + namespaces = type.split("."); + type = namespaces.shift(); + handleObj.namespace = namespaces.slice(0).sort().join("."); + + } else { + namespaces = []; + handleObj.namespace = ""; + } + + handleObj.type = type; + if ( !handleObj.guid ) { + handleObj.guid = handler.guid; + } + + // Get the current list of functions bound to this event + var handlers = events[ type ], + special = jQuery.event.special[ type ] || {}; + + // Init the event handler queue + if ( !handlers ) { + handlers = events[ type ] = []; + + // Check for a special event handler + // Only use addEventListener/attachEvent if the special + // events handler returns false + if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { + // Bind the global event handler to the element + if ( elem.addEventListener ) { + elem.addEventListener( type, eventHandle, false ); + + } else if ( elem.attachEvent ) { + elem.attachEvent( "on" + type, eventHandle ); + } + } + } + + if ( special.add ) { + special.add.call( elem, handleObj ); + + if ( !handleObj.handler.guid ) { + handleObj.handler.guid = handler.guid; + } + } + + // Add the function to the element's handler list + handlers.push( handleObj ); + + // Keep track of which events have been used, for global triggering + jQuery.event.global[ type ] = true; + } + + // Nullify elem to prevent memory leaks in IE + elem = null; + }, + + global: {}, + + // Detach an event or set of events from an element + remove: function( elem, types, handler, pos ) { + // don't do events on text and comment nodes + if ( elem.nodeType === 3 || elem.nodeType === 8 ) { + return; + } + + if ( handler === false ) { + handler = returnFalse; + } + + var ret, type, fn, j, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType, + elemData = jQuery.hasData( elem ) && jQuery._data( elem ), + events = elemData && elemData[ eventKey ]; + + if ( !elemData || !events ) { + return; + } + + if ( typeof events === "function" ) { + elemData = events; + events = events.events; + } + + // types is actually an event object here + if ( types && types.type ) { + handler = types.handler; + types = types.type; + } + + // Unbind all events for the element + if ( !types || typeof types === "string" && types.charAt(0) === "." ) { + types = types || ""; + + for ( type in events ) { + jQuery.event.remove( elem, type + types ); + } + + return; + } + + // Handle multiple events separated by a space + // jQuery(...).unbind("mouseover mouseout", fn); + types = types.split(" "); + + while ( (type = types[ i++ ]) ) { + origType = type; + handleObj = null; + all = type.indexOf(".") < 0; + namespaces = []; + + if ( !all ) { + // Namespaced event handlers + namespaces = type.split("."); + type = namespaces.shift(); + + namespace = new RegExp("(^|\\.)" + + jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)"); + } + + eventType = events[ type ]; + + if ( !eventType ) { + continue; + } + + if ( !handler ) { + for ( j = 0; j < eventType.length; j++ ) { + handleObj = eventType[ j ]; + + if ( all || namespace.test( handleObj.namespace ) ) { + jQuery.event.remove( elem, origType, handleObj.handler, j ); + eventType.splice( j--, 1 ); + } + } + + continue; + } + + special = jQuery.event.special[ type ] || {}; + + for ( j = pos || 0; j < eventType.length; j++ ) { + handleObj = eventType[ j ]; + + if ( handler.guid === handleObj.guid ) { + // remove the given handler for the given type + if ( all || namespace.test( handleObj.namespace ) ) { + if ( pos == null ) { + eventType.splice( j--, 1 ); + } + + if ( special.remove ) { + special.remove.call( elem, handleObj ); + } + } + + if ( pos != null ) { + break; + } + } + } + + // remove generic event handler if no more handlers exist + if ( eventType.length === 0 || pos != null && eventType.length === 1 ) { + if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) { + jQuery.removeEvent( elem, type, elemData.handle ); + } + + ret = null; + delete events[ type ]; + } + } + + // Remove the expando if it's no longer used + if ( jQuery.isEmptyObject( events ) ) { + var handle = elemData.handle; + if ( handle ) { + handle.elem = null; + } + + delete elemData.events; + delete elemData.handle; + + if ( typeof elemData === "function" ) { + jQuery.removeData( elem, eventKey, true ); + + } else if ( jQuery.isEmptyObject( elemData ) ) { + jQuery.removeData( elem, undefined, true ); + } + } + }, + + // bubbling is internal + trigger: function( event, data, elem /*, bubbling */ ) { + // Event object or event type + var type = event.type || event, + bubbling = arguments[3]; + + if ( !bubbling ) { + event = typeof event === "object" ? + // jQuery.Event object + event[ jQuery.expando ] ? event : + // Object literal + jQuery.extend( jQuery.Event(type), event ) : + // Just the event type (string) + jQuery.Event(type); + + if ( type.indexOf("!") >= 0 ) { + event.type = type = type.slice(0, -1); + event.exclusive = true; + } + + // Handle a global trigger + if ( !elem ) { + // Don't bubble custom events when global (to avoid too much overhead) + event.stopPropagation(); + + // Only trigger if we've ever bound an event for it + if ( jQuery.event.global[ type ] ) { + // XXX This code smells terrible. event.js should not be directly + // inspecting the data cache + jQuery.each( jQuery.cache, function() { + // internalKey variable is just used to make it easier to find + // and potentially change this stuff later; currently it just + // points to jQuery.expando + var internalKey = jQuery.expando, + internalCache = this[ internalKey ]; + if ( internalCache && internalCache.events && internalCache.events[type] ) { + jQuery.event.trigger( event, data, internalCache.handle.elem ); + } + }); + } + } + + // Handle triggering a single element + + // don't do events on text and comment nodes + if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) { + return undefined; + } + + // Clean up in case it is reused + event.result = undefined; + event.target = elem; + + // Clone the incoming data, if any + data = jQuery.makeArray( data ); + data.unshift( event ); + } + + event.currentTarget = elem; + + // Trigger the event, it is assumed that "handle" is a function + var handle = elem.nodeType ? + jQuery._data( elem, "handle" ) : + (jQuery._data( elem, eventKey ) || {}).handle; + + if ( handle ) { + handle.apply( elem, data ); + } + + var parent = elem.parentNode || elem.ownerDocument; + + // Trigger an inline bound script + try { + if ( !(elem && elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()]) ) { + if ( elem[ "on" + type ] && elem[ "on" + type ].apply( elem, data ) === false ) { + event.result = false; + event.preventDefault(); + } + } + + // prevent IE from throwing an error for some elements with some event types, see #3533 + } catch (inlineError) {} + + if ( !event.isPropagationStopped() && parent ) { + jQuery.event.trigger( event, data, parent, true ); + + } else if ( !event.isDefaultPrevented() ) { + var old, + target = event.target, + targetType = type.replace( rnamespaces, "" ), + isClick = jQuery.nodeName( target, "a" ) && targetType === "click", + special = jQuery.event.special[ targetType ] || {}; + + if ( (!special._default || special._default.call( elem, event ) === false) && + !isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) { + + try { + if ( target[ targetType ] ) { + // Make sure that we don't accidentally re-trigger the onFOO events + old = target[ "on" + targetType ]; + + if ( old ) { + target[ "on" + targetType ] = null; + } + + jQuery.event.triggered = true; + target[ targetType ](); + } + + // prevent IE from throwing an error for some elements with some event types, see #3533 + } catch (triggerError) {} + + if ( old ) { + target[ "on" + targetType ] = old; + } + + jQuery.event.triggered = false; + } + } + }, + + handle: function( event ) { + var all, handlers, namespaces, namespace_re, events, + namespace_sort = [], + args = jQuery.makeArray( arguments ); + + event = args[0] = jQuery.event.fix( event || window.event ); + event.currentTarget = this; + + // Namespaced event handlers + all = event.type.indexOf(".") < 0 && !event.exclusive; + + if ( !all ) { + namespaces = event.type.split("."); + event.type = namespaces.shift(); + namespace_sort = namespaces.slice(0).sort(); + namespace_re = new RegExp("(^|\\.)" + namespace_sort.join("\\.(?:.*\\.)?") + "(\\.|$)"); + } + + event.namespace = event.namespace || namespace_sort.join("."); + + events = jQuery._data(this, eventKey); + + if ( typeof events === "function" ) { + events = events.events; + } + + handlers = (events || {})[ event.type ]; + + if ( events && handlers ) { + // Clone the handlers to prevent manipulation + handlers = handlers.slice(0); + + for ( var j = 0, l = handlers.length; j < l; j++ ) { + var handleObj = handlers[ j ]; + + // Filter the functions by class + if ( all || namespace_re.test( handleObj.namespace ) ) { + // Pass in a reference to the handler function itself + // So that we can later remove it + event.handler = handleObj.handler; + event.data = handleObj.data; + event.handleObj = handleObj; + + var ret = handleObj.handler.apply( this, args ); + + if ( ret !== undefined ) { + event.result = ret; + if ( ret === false ) { + event.preventDefault(); + event.stopPropagation(); + } + } + + if ( event.isImmediatePropagationStopped() ) { + break; + } + } + } + } + + return event.result; + }, + + props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "), + + fix: function( event ) { + if ( event[ jQuery.expando ] ) { + return event; + } + + // store a copy of the original event object + // and "clone" to set read-only properties + var originalEvent = event; + event = jQuery.Event( originalEvent ); + + for ( var i = this.props.length, prop; i; ) { + prop = this.props[ --i ]; + event[ prop ] = originalEvent[ prop ]; + } + + // Fix target property, if necessary + if ( !event.target ) { + // Fixes #1925 where srcElement might not be defined either + event.target = event.srcElement || document; + } + + // check if target is a textnode (safari) + if ( event.target.nodeType === 3 ) { + event.target = event.target.parentNode; + } + + // Add relatedTarget, if necessary + if ( !event.relatedTarget && event.fromElement ) { + event.relatedTarget = event.fromElement === event.target ? event.toElement : event.fromElement; + } + + // Calculate pageX/Y if missing and clientX/Y available + if ( event.pageX == null && event.clientX != null ) { + var doc = document.documentElement, + body = document.body; + + event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0); + event.pageY = event.clientY + (doc && doc.scrollTop || body && body.scrollTop || 0) - (doc && doc.clientTop || body && body.clientTop || 0); + } + + // Add which for key events + if ( event.which == null && (event.charCode != null || event.keyCode != null) ) { + event.which = event.charCode != null ? event.charCode : event.keyCode; + } + + // Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs) + if ( !event.metaKey && event.ctrlKey ) { + event.metaKey = event.ctrlKey; + } + + // Add which for click: 1 === left; 2 === middle; 3 === right + // Note: button is not normalized, so don't use it + if ( !event.which && event.button !== undefined ) { + event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) )); + } + + return event; + }, + + // Deprecated, use jQuery.guid instead + guid: 1E8, + + // Deprecated, use jQuery.proxy instead + proxy: jQuery.proxy, + + special: { + ready: { + // Make sure the ready event is setup + setup: jQuery.bindReady, + teardown: jQuery.noop + }, + + live: { + add: function( handleObj ) { + jQuery.event.add( this, + liveConvert( handleObj.origType, handleObj.selector ), + jQuery.extend({}, handleObj, {handler: liveHandler, guid: handleObj.handler.guid}) ); + }, + + remove: function( handleObj ) { + jQuery.event.remove( this, liveConvert( handleObj.origType, handleObj.selector ), handleObj ); + } + }, + + beforeunload: { + setup: function( data, namespaces, eventHandle ) { + // We only want to do this special case on windows + if ( jQuery.isWindow( this ) ) { + this.onbeforeunload = eventHandle; + } + }, + + teardown: function( namespaces, eventHandle ) { + if ( this.onbeforeunload === eventHandle ) { + this.onbeforeunload = null; + } + } + } + } +}; + +jQuery.removeEvent = document.removeEventListener ? + function( elem, type, handle ) { + if ( elem.removeEventListener ) { + elem.removeEventListener( type, handle, false ); + } + } : + function( elem, type, handle ) { + if ( elem.detachEvent ) { + elem.detachEvent( "on" + type, handle ); + } + }; + +jQuery.Event = function( src ) { + // Allow instantiation without the 'new' keyword + if ( !this.preventDefault ) { + return new jQuery.Event( src ); + } + + // Event object + if ( src && src.type ) { + this.originalEvent = src; + this.type = src.type; + + // Events bubbling up the document may have been marked as prevented + // by a handler lower down the tree; reflect the correct value. + this.isDefaultPrevented = (src.defaultPrevented || src.returnValue === false || + src.getPreventDefault && src.getPreventDefault()) ? returnTrue : returnFalse; + + // Event type + } else { + this.type = src; + } + + // timeStamp is buggy for some events on Firefox(#3843) + // So we won't rely on the native value + this.timeStamp = jQuery.now(); + + // Mark it as fixed + this[ jQuery.expando ] = true; +}; + +function returnFalse() { + return false; +} +function returnTrue() { + return true; +} + +// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding +// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html +jQuery.Event.prototype = { + preventDefault: function() { + this.isDefaultPrevented = returnTrue; + + var e = this.originalEvent; + if ( !e ) { + return; + } + + // if preventDefault exists run it on the original event + if ( e.preventDefault ) { + e.preventDefault(); + + // otherwise set the returnValue property of the original event to false (IE) + } else { + e.returnValue = false; + } + }, + stopPropagation: function() { + this.isPropagationStopped = returnTrue; + + var e = this.originalEvent; + if ( !e ) { + return; + } + // if stopPropagation exists run it on the original event + if ( e.stopPropagation ) { + e.stopPropagation(); + } + // otherwise set the cancelBubble property of the original event to true (IE) + e.cancelBubble = true; + }, + stopImmediatePropagation: function() { + this.isImmediatePropagationStopped = returnTrue; + this.stopPropagation(); + }, + isDefaultPrevented: returnFalse, + isPropagationStopped: returnFalse, + isImmediatePropagationStopped: returnFalse +}; + +// Checks if an event happened on an element within another element +// Used in jQuery.event.special.mouseenter and mouseleave handlers +var withinElement = function( event ) { + // Check if mouse(over|out) are still within the same parent element + var parent = event.relatedTarget; + + // Firefox sometimes assigns relatedTarget a XUL element + // which we cannot access the parentNode property of + try { + // Traverse up the tree + while ( parent && parent !== this ) { + parent = parent.parentNode; + } + + if ( parent !== this ) { + // set the correct event type + event.type = event.data; + + // handle event if we actually just moused on to a non sub-element + jQuery.event.handle.apply( this, arguments ); + } + + // assuming we've left the element since we most likely mousedover a xul element + } catch(e) { } +}, + +// In case of event delegation, we only need to rename the event.type, +// liveHandler will take care of the rest. +delegate = function( event ) { + event.type = event.data; + jQuery.event.handle.apply( this, arguments ); +}; + +// Create mouseenter and mouseleave events +jQuery.each({ + mouseenter: "mouseover", + mouseleave: "mouseout" +}, function( orig, fix ) { + jQuery.event.special[ orig ] = { + setup: function( data ) { + jQuery.event.add( this, fix, data && data.selector ? delegate : withinElement, orig ); + }, + teardown: function( data ) { + jQuery.event.remove( this, fix, data && data.selector ? delegate : withinElement ); + } + }; +}); + +// submit delegation +if ( !jQuery.support.submitBubbles ) { + + jQuery.event.special.submit = { + setup: function( data, namespaces ) { + if ( this.nodeName && this.nodeName.toLowerCase() !== "form" ) { + jQuery.event.add(this, "click.specialSubmit", function( e ) { + var elem = e.target, + type = elem.type; + + if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) { + e.liveFired = undefined; + return trigger( "submit", this, arguments ); + } + }); + + jQuery.event.add(this, "keypress.specialSubmit", function( e ) { + var elem = e.target, + type = elem.type; + + if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) { + e.liveFired = undefined; + return trigger( "submit", this, arguments ); + } + }); + + } else { + return false; + } + }, + + teardown: function( namespaces ) { + jQuery.event.remove( this, ".specialSubmit" ); + } + }; + +} + +// change delegation, happens here so we have bind. +if ( !jQuery.support.changeBubbles ) { + + var changeFilters, + + getVal = function( elem ) { + var type = elem.type, val = elem.value; + + if ( type === "radio" || type === "checkbox" ) { + val = elem.checked; + + } else if ( type === "select-multiple" ) { + val = elem.selectedIndex > -1 ? + jQuery.map( elem.options, function( elem ) { + return elem.selected; + }).join("-") : + ""; + + } else if ( elem.nodeName.toLowerCase() === "select" ) { + val = elem.selectedIndex; + } + + return val; + }, + + testChange = function testChange( e ) { + var elem = e.target, data, val; + + if ( !rformElems.test( elem.nodeName ) || elem.readOnly ) { + return; + } + + data = jQuery._data( elem, "_change_data" ); + val = getVal(elem); + + // the current data will be also retrieved by beforeactivate + if ( e.type !== "focusout" || elem.type !== "radio" ) { + jQuery._data( elem, "_change_data", val ); + } + + if ( data === undefined || val === data ) { + return; + } + + if ( data != null || val ) { + e.type = "change"; + e.liveFired = undefined; + return jQuery.event.trigger( e, arguments[1], elem ); + } + }; + + jQuery.event.special.change = { + filters: { + focusout: testChange, + + beforedeactivate: testChange, + + click: function( e ) { + var elem = e.target, type = elem.type; + + if ( type === "radio" || type === "checkbox" || elem.nodeName.toLowerCase() === "select" ) { + return testChange.call( this, e ); + } + }, + + // Change has to be called before submit + // Keydown will be called before keypress, which is used in submit-event delegation + keydown: function( e ) { + var elem = e.target, type = elem.type; + + if ( (e.keyCode === 13 && elem.nodeName.toLowerCase() !== "textarea") || + (e.keyCode === 32 && (type === "checkbox" || type === "radio")) || + type === "select-multiple" ) { + return testChange.call( this, e ); + } + }, + + // Beforeactivate happens also before the previous element is blurred + // with this event you can't trigger a change event, but you can store + // information + beforeactivate: function( e ) { + var elem = e.target; + jQuery._data( elem, "_change_data", getVal(elem) ); + } + }, + + setup: function( data, namespaces ) { + if ( this.type === "file" ) { + return false; + } + + for ( var type in changeFilters ) { + jQuery.event.add( this, type + ".specialChange", changeFilters[type] ); + } + + return rformElems.test( this.nodeName ); + }, + + teardown: function( namespaces ) { + jQuery.event.remove( this, ".specialChange" ); + + return rformElems.test( this.nodeName ); + } + }; + + changeFilters = jQuery.event.special.change.filters; + + // Handle when the input is .focus()'d + changeFilters.focus = changeFilters.beforeactivate; +} + +function trigger( type, elem, args ) { + args[0].type = type; + return jQuery.event.handle.apply( elem, args ); +} + +// Create "bubbling" focus and blur events +if ( document.addEventListener ) { + jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { + jQuery.event.special[ fix ] = { + setup: function() { + this.addEventListener( orig, handler, true ); + }, + teardown: function() { + this.removeEventListener( orig, handler, true ); + } + }; + + function handler( e ) { + e = jQuery.event.fix( e ); + e.type = fix; + return jQuery.event.handle.call( this, e ); + } + }); +} + +jQuery.each(["bind", "one"], function( i, name ) { + jQuery.fn[ name ] = function( type, data, fn ) { + // Handle object literals + if ( typeof type === "object" ) { + for ( var key in type ) { + this[ name ](key, data, type[key], fn); + } + return this; + } + + if ( jQuery.isFunction( data ) || data === false ) { + fn = data; + data = undefined; + } + + var handler = name === "one" ? jQuery.proxy( fn, function( event ) { + jQuery( this ).unbind( event, handler ); + return fn.apply( this, arguments ); + }) : fn; + + if ( type === "unload" && name !== "one" ) { + this.one( type, data, fn ); + + } else { + for ( var i = 0, l = this.length; i < l; i++ ) { + jQuery.event.add( this[i], type, handler, data ); + } + } + + return this; + }; +}); + +jQuery.fn.extend({ + unbind: function( type, fn ) { + // Handle object literals + if ( typeof type === "object" && !type.preventDefault ) { + for ( var key in type ) { + this.unbind(key, type[key]); + } + + } else { + for ( var i = 0, l = this.length; i < l; i++ ) { + jQuery.event.remove( this[i], type, fn ); + } + } + + return this; + }, + + delegate: function( selector, types, data, fn ) { + return this.live( types, data, fn, selector ); + }, + + undelegate: function( selector, types, fn ) { + if ( arguments.length === 0 ) { + return this.unbind( "live" ); + + } else { + return this.die( types, null, fn, selector ); + } + }, + + trigger: function( type, data ) { + return this.each(function() { + jQuery.event.trigger( type, data, this ); + }); + }, + + triggerHandler: function( type, data ) { + if ( this[0] ) { + var event = jQuery.Event( type ); + event.preventDefault(); + event.stopPropagation(); + jQuery.event.trigger( event, data, this[0] ); + return event.result; + } + }, + + toggle: function( fn ) { + // Save reference to arguments for access in closure + var args = arguments, + i = 1; + + // link all the functions, so any of them can unbind this click handler + while ( i < args.length ) { + jQuery.proxy( fn, args[ i++ ] ); + } + + return this.click( jQuery.proxy( fn, function( event ) { + // Figure out which function to execute + var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i; + jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 ); + + // Make sure that clicks stop + event.preventDefault(); + + // and execute the function + return args[ lastToggle ].apply( this, arguments ) || false; + })); + }, + + hover: function( fnOver, fnOut ) { + return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver ); + } +}); + +var liveMap = { + focus: "focusin", + blur: "focusout", + mouseenter: "mouseover", + mouseleave: "mouseout" +}; + +jQuery.each(["live", "die"], function( i, name ) { + jQuery.fn[ name ] = function( types, data, fn, origSelector /* Internal Use Only */ ) { + var type, i = 0, match, namespaces, preType, + selector = origSelector || this.selector, + context = origSelector ? this : jQuery( this.context ); + + if ( typeof types === "object" && !types.preventDefault ) { + for ( var key in types ) { + context[ name ]( key, data, types[key], selector ); + } + + return this; + } + + if ( jQuery.isFunction( data ) ) { + fn = data; + data = undefined; + } + + types = (types || "").split(" "); + + while ( (type = types[ i++ ]) != null ) { + match = rnamespaces.exec( type ); + namespaces = ""; + + if ( match ) { + namespaces = match[0]; + type = type.replace( rnamespaces, "" ); + } + + if ( type === "hover" ) { + types.push( "mouseenter" + namespaces, "mouseleave" + namespaces ); + continue; + } + + preType = type; + + if ( type === "focus" || type === "blur" ) { + types.push( liveMap[ type ] + namespaces ); + type = type + namespaces; + + } else { + type = (liveMap[ type ] || type) + namespaces; + } + + if ( name === "live" ) { + // bind live handler + for ( var j = 0, l = context.length; j < l; j++ ) { + jQuery.event.add( context[j], "live." + liveConvert( type, selector ), + { data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } ); + } + + } else { + // unbind live handler + context.unbind( "live." + liveConvert( type, selector ), fn ); + } + } + + return this; + }; +}); + +function liveHandler( event ) { + var stop, maxLevel, related, match, handleObj, elem, j, i, l, data, close, namespace, ret, + elems = [], + selectors = [], + events = jQuery._data( this, eventKey ); + + if ( typeof events === "function" ) { + events = events.events; + } + + // Make sure we avoid non-left-click bubbling in Firefox (#3861) and disabled elements in IE (#6911) + if ( event.liveFired === this || !events || !events.live || event.target.disabled || event.button && event.type === "click" ) { + return; + } + + if ( event.namespace ) { + namespace = new RegExp("(^|\\.)" + event.namespace.split(".").join("\\.(?:.*\\.)?") + "(\\.|$)"); + } + + event.liveFired = this; + + var live = events.live.slice(0); + + for ( j = 0; j < live.length; j++ ) { + handleObj = live[j]; + + if ( handleObj.origType.replace( rnamespaces, "" ) === event.type ) { + selectors.push( handleObj.selector ); + + } else { + live.splice( j--, 1 ); + } + } + + match = jQuery( event.target ).closest( selectors, event.currentTarget ); + + for ( i = 0, l = match.length; i < l; i++ ) { + close = match[i]; + + for ( j = 0; j < live.length; j++ ) { + handleObj = live[j]; + + if ( close.selector === handleObj.selector && (!namespace || namespace.test( handleObj.namespace )) ) { + elem = close.elem; + related = null; + + // Those two events require additional checking + if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) { + event.type = handleObj.preType; + related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0]; + } + + if ( !related || related !== elem ) { + elems.push({ elem: elem, handleObj: handleObj, level: close.level }); + } + } + } + } + + for ( i = 0, l = elems.length; i < l; i++ ) { + match = elems[i]; + + if ( maxLevel && match.level > maxLevel ) { + break; + } + + event.currentTarget = match.elem; + event.data = match.handleObj.data; + event.handleObj = match.handleObj; + + ret = match.handleObj.origHandler.apply( match.elem, arguments ); + + if ( ret === false || event.isPropagationStopped() ) { + maxLevel = match.level; + + if ( ret === false ) { + stop = false; + } + if ( event.isImmediatePropagationStopped() ) { + break; + } + } + } + + return stop; +} + +function liveConvert( type, selector ) { + return (type && type !== "*" ? type + "." : "") + selector.replace(rperiod, "`").replace(rspace, "&"); +} + +jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " + + "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " + + "change select submit keydown keypress keyup error").split(" "), function( i, name ) { + + // Handle event binding + jQuery.fn[ name ] = function( data, fn ) { + if ( fn == null ) { + fn = data; + data = null; + } + + return arguments.length > 0 ? + this.bind( name, data, fn ) : + this.trigger( name ); + }; + + if ( jQuery.attrFn ) { + jQuery.attrFn[ name ] = true; + } +}); + + +/*! + * Sizzle CSS Selector Engine + * Copyright 2011, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * More information: http://sizzlejs.com/ + */ +(function(){ + +var chunker = /((?:$(?:\([^()]+$|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g, + done = 0, + toString = Object.prototype.toString, + hasDuplicate = false, + baseHasDuplicate = true; + +// Here we check if the JavaScript engine is using some sort of +// optimization where it does not always call our comparision +// function. If that is the case, discard the hasDuplicate value. +// Thus far that includes Google Chrome. +[0, 0].sort(function() { + baseHasDuplicate = false; + return 0; +}); + +var Sizzle = function( selector, context, results, seed ) { + results = results || []; + context = context || document; + + var origContext = context; + + if ( context.nodeType !== 1 && context.nodeType !== 9 ) { + return []; + } + + if ( !selector || typeof selector !== "string" ) { + return results; + } + + var m, set, checkSet, extra, ret, cur, pop, i, + prune = true, + contextXML = Sizzle.isXML( context ), + parts = [], + soFar = selector; + + // Reset the position of the chunker regexp (start from head) + do { + chunker.exec( "" ); + m = chunker.exec( soFar ); + + if ( m ) { + soFar = m[3]; + + parts.push( m[1] ); + + if ( m[2] ) { + extra = m[3]; + break; + } + } + } while ( m ); + + if ( parts.length > 1 && origPOS.exec( selector ) ) { + + if ( parts.length === 2 && Expr.relative[ parts[0] ] ) { + set = posProcess( parts[0] + parts[1], context ); + + } else { + set = Expr.relative[ parts[0] ] ? + [ context ] : + Sizzle( parts.shift(), context ); + + while ( parts.length ) { + selector = parts.shift(); + + if ( Expr.relative[ selector ] ) { + selector += parts.shift(); + } + + set = posProcess( selector, set ); + } + } + + } else { + // Take a shortcut and set the context if the root selector is an ID + // (but not if it'll be faster if the inner selector is an ID) + if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML && + Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) { + + ret = Sizzle.find( parts.shift(), context, contextXML ); + context = ret.expr ? + Sizzle.filter( ret.expr, ret.set )[0] : + ret.set[0]; + } + + if ( context ) { + ret = seed ? + { expr: parts.pop(), set: makeArray(seed) } : + Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML ); + + set = ret.expr ? + Sizzle.filter( ret.expr, ret.set ) : + ret.set; + + if ( parts.length > 0 ) { + checkSet = makeArray( set ); + + } else { + prune = false; + } + + while ( parts.length ) { + cur = parts.pop(); + pop = cur; + + if ( !Expr.relative[ cur ] ) { + cur = ""; + } else { + pop = parts.pop(); + } + + if ( pop == null ) { + pop = context; + } + + Expr.relative[ cur ]( checkSet, pop, contextXML ); + } + + } else { + checkSet = parts = []; + } + } + + if ( !checkSet ) { + checkSet = set; + } + + if ( !checkSet ) { + Sizzle.error( cur || selector ); + } + + if ( toString.call(checkSet) === "[object Array]" ) { + if ( !prune ) { + results.push.apply( results, checkSet ); + + } else if ( context && context.nodeType === 1 ) { + for ( i = 0; checkSet[i] != null; i++ ) { + if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) { + results.push( set[i] ); + } + } + + } else { + for ( i = 0; checkSet[i] != null; i++ ) { + if ( checkSet[i] && checkSet[i].nodeType === 1 ) { + results.push( set[i] ); + } + } + } + + } else { + makeArray( checkSet, results ); + } + + if ( extra ) { + Sizzle( extra, origContext, results, seed ); + Sizzle.uniqueSort( results ); + } + + return results; +}; + +Sizzle.uniqueSort = function( results ) { + if ( sortOrder ) { + hasDuplicate = baseHasDuplicate; + results.sort( sortOrder ); + + if ( hasDuplicate ) { + for ( var i = 1; i < results.length; i++ ) { + if ( results[i] === results[ i - 1 ] ) { + results.splice( i--, 1 ); + } + } + } + } + + return results; +}; + +Sizzle.matches = function( expr, set ) { + return Sizzle( expr, null, null, set ); +}; + +Sizzle.matchesSelector = function( node, expr ) { + return Sizzle( expr, null, null, [node] ).length > 0; +}; + +Sizzle.find = function( expr, context, isXML ) { + var set; + + if ( !expr ) { + return []; + } + + for ( var i = 0, l = Expr.order.length; i < l; i++ ) { + var match, + type = Expr.order[i]; + + if ( (match = Expr.leftMatch[ type ].exec( expr )) ) { + var left = match[1]; + match.splice( 1, 1 ); + + if ( left.substr( left.length - 1 ) !== "\\" ) { + match[1] = (match[1] || "").replace(/\\/g, ""); + set = Expr.find[ type ]( match, context, isXML ); + + if ( set != null ) { + expr = expr.replace( Expr.match[ type ], "" ); + break; + } + } + } + } + + if ( !set ) { + set = typeof context.getElementsByTagName !== "undefined" ? + context.getElementsByTagName( "*" ) : + []; + } + + return { set: set, expr: expr }; +}; + +Sizzle.filter = function( expr, set, inplace, not ) { + var match, anyFound, + old = expr, + result = [], + curLoop = set, + isXMLFilter = set && set[0] && Sizzle.isXML( set[0] ); + + while ( expr && set.length ) { + for ( var type in Expr.filter ) { + if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) { + var found, item, + filter = Expr.filter[ type ], + left = match[1]; + + anyFound = false; + + match.splice(1,1); + + if ( left.substr( left.length - 1 ) === "\\" ) { + continue; + } + + if ( curLoop === result ) { + result = []; + } + + if ( Expr.preFilter[ type ] ) { + match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter ); + + if ( !match ) { + anyFound = found = true; + + } else if ( match === true ) { + continue; + } + } + + if ( match ) { + for ( var i = 0; (item = curLoop[i]) != null; i++ ) { + if ( item ) { + found = filter( item, match, i, curLoop ); + var pass = not ^ !!found; + + if ( inplace && found != null ) { + if ( pass ) { + anyFound = true; + + } else { + curLoop[i] = false; + } + + } else if ( pass ) { + result.push( item ); + anyFound = true; + } + } + } + } + + if ( found !== undefined ) { + if ( !inplace ) { + curLoop = result; + } + + expr = expr.replace( Expr.match[ type ], "" ); + + if ( !anyFound ) { + return []; + } + + break; + } + } + } + + // Improper expression + if ( expr === old ) { + if ( anyFound == null ) { + Sizzle.error( expr ); + + } else { + break; + } + } + + old = expr; + } + + return curLoop; +}; + +Sizzle.error = function( msg ) { + throw "Syntax error, unrecognized expression: " + msg; +}; + +var Expr = Sizzle.selectors = { + order: [ "ID", "NAME", "TAG" ], + + match: { + ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/, + CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/, + NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/, + ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/, + TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/, + CHILD: /:(only|nth|last|first)-child(?:$\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*$)?/, + POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:$(\d*)$)?(?=[^\-]|$)/, + PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:$(['"]?)((?:\([^$]+\)|[^]*)+)\2\))?/ + }, + + leftMatch: {}, + + attrMap: { + "class": "className", + "for": "htmlFor" + }, + + attrHandle: { + href: function( elem ) { + return elem.getAttribute( "href" ); + } + }, + + relative: { + "+": function(checkSet, part){ + var isPartStr = typeof part === "string", + isTag = isPartStr && !/\W/.test( part ), + isPartStrNotTag = isPartStr && !isTag; + + if ( isTag ) { + part = part.toLowerCase(); + } + + for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) { + if ( (elem = checkSet[i]) ) { + while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {} + + checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ? + elem || false : + elem === part; + } + } + + if ( isPartStrNotTag ) { + Sizzle.filter( part, checkSet, true ); + } + }, + + ">": function( checkSet, part ) { + var elem, + isPartStr = typeof part === "string", + i = 0, + l = checkSet.length; + + if ( isPartStr && !/\W/.test( part ) ) { + part = part.toLowerCase(); + + for ( ; i < l; i++ ) { + elem = checkSet[i]; + + if ( elem ) { + var parent = elem.parentNode; + checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false; + } + } + + } else { + for ( ; i < l; i++ ) { + elem = checkSet[i]; + + if ( elem ) { + checkSet[i] = isPartStr ? + elem.parentNode : + elem.parentNode === part; + } + } + + if ( isPartStr ) { + Sizzle.filter( part, checkSet, true ); + } + } + }, + + "": function(checkSet, part, isXML){ + var nodeCheck, + doneName = done++, + checkFn = dirCheck; + + if ( typeof part === "string" && !/\W/.test(part) ) { + part = part.toLowerCase(); + nodeCheck = part; + checkFn = dirNodeCheck; + } + + checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML ); + }, + + "~": function( checkSet, part, isXML ) { + var nodeCheck, + doneName = done++, + checkFn = dirCheck; + + if ( typeof part === "string" && !/\W/.test( part ) ) { + part = part.toLowerCase(); + nodeCheck = part; + checkFn = dirNodeCheck; + } + + checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML ); + } + }, + + find: { + ID: function( match, context, isXML ) { + if ( typeof context.getElementById !== "undefined" && !isXML ) { + var m = context.getElementById(match[1]); + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document #6963 + return m && m.parentNode ? [m] : []; + } + }, + + NAME: function( match, context ) { + if ( typeof context.getElementsByName !== "undefined" ) { + var ret = [], + results = context.getElementsByName( match[1] ); + + for ( var i = 0, l = results.length; i < l; i++ ) { + if ( results[i].getAttribute("name") === match[1] ) { + ret.push( results[i] ); + } + } + + return ret.length === 0 ? null : ret; + } + }, + + TAG: function( match, context ) { + if ( typeof context.getElementsByTagName !== "undefined" ) { + return context.getElementsByTagName( match[1] ); + } + } + }, + preFilter: { + CLASS: function( match, curLoop, inplace, result, not, isXML ) { + match = " " + match[1].replace(/\\/g, "") + " "; + + if ( isXML ) { + return match; + } + + for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) { + if ( elem ) { + if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n\r]/g, " ").indexOf(match) >= 0) ) { + if ( !inplace ) { + result.push( elem ); + } + + } else if ( inplace ) { + curLoop[i] = false; + } + } + } + + return false; + }, + + ID: function( match ) { + return match[1].replace(/\\/g, ""); + }, + + TAG: function( match, curLoop ) { + return match[1].toLowerCase(); + }, + + CHILD: function( match ) { + if ( match[1] === "nth" ) { + if ( !match[2] ) { + Sizzle.error( match[0] ); + } + + match[2] = match[2].replace(/^\+|\s*/g, ''); + + // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6' + var test = /(-?)(\d*)(?:n([+\-]?\d*))?/.exec( + match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" || + !/\D/.test( match[2] ) && "0n+" + match[2] || match[2]); + + // calculate the numbers (first)n+(last) including if they are negative + match[2] = (test[1] + (test[2] || 1)) - 0; + match[3] = test[3] - 0; + } + else if ( match[2] ) { + Sizzle.error( match[0] ); + } + + // TODO: Move to normal caching system + match[0] = done++; + + return match; + }, + + ATTR: function( match, curLoop, inplace, result, not, isXML ) { + var name = match[1] = match[1].replace(/\\/g, ""); + + if ( !isXML && Expr.attrMap[name] ) { + match[1] = Expr.attrMap[name]; + } + + // Handle if an un-quoted value was used + match[4] = ( match[4] || match[5] || "" ).replace(/\\/g, ""); + + if ( match[2] === "~=" ) { + match[4] = " " + match[4] + " "; + } + + return match; + }, + + PSEUDO: function( match, curLoop, inplace, result, not ) { + if ( match[1] === "not" ) { + // If we're dealing with a complex expression, or a simple one + if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) { + match[3] = Sizzle(match[3], null, null, curLoop); + + } else { + var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not); + + if ( !inplace ) { + result.push.apply( result, ret ); + } + + return false; + } + + } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) { + return true; + } + + return match; + }, + + POS: function( match ) { + match.unshift( true ); + + return match; + } + }, + + filters: { + enabled: function( elem ) { + return elem.disabled === false && elem.type !== "hidden"; + }, + + disabled: function( elem ) { + return elem.disabled === true; + }, + + checked: function( elem ) { + return elem.checked === true; + }, + + selected: function( elem ) { + // Accessing this property makes selected-by-default + // options in Safari work properly + elem.parentNode.selectedIndex; + + return elem.selected === true; + }, + + parent: function( elem ) { + return !!elem.firstChild; + }, + + empty: function( elem ) { + return !elem.firstChild; + }, + + has: function( elem, i, match ) { + return !!Sizzle( match[3], elem ).length; + }, + + header: function( elem ) { + return (/h\d/i).test( elem.nodeName ); + }, + + text: function( elem ) { + return "text" === elem.type; + }, + radio: function( elem ) { + return "radio" === elem.type; + }, + + checkbox: function( elem ) { + return "checkbox" === elem.type; + }, + + file: function( elem ) { + return "file" === elem.type; + }, + password: function( elem ) { + return "password" === elem.type; + }, + + submit: function( elem ) { + return "submit" === elem.type; + }, + + image: function( elem ) { + return "image" === elem.type; + }, + + reset: function( elem ) { + return "reset" === elem.type; + }, + + button: function( elem ) { + return "button" === elem.type || elem.nodeName.toLowerCase() === "button"; + }, + + input: function( elem ) { + return (/input|select|textarea|button/i).test( elem.nodeName ); + } + }, + setFilters: { + first: function( elem, i ) { + return i === 0; + }, + + last: function( elem, i, match, array ) { + return i === array.length - 1; + }, + + even: function( elem, i ) { + return i % 2 === 0; + }, + + odd: function( elem, i ) { + return i % 2 === 1; + }, + + lt: function( elem, i, match ) { + return i < match[3] - 0; + }, + + gt: function( elem, i, match ) { + return i > match[3] - 0; + }, + + nth: function( elem, i, match ) { + return match[3] - 0 === i; + }, + + eq: function( elem, i, match ) { + return match[3] - 0 === i; + } + }, + filter: { + PSEUDO: function( elem, match, i, array ) { + var name = match[1], + filter = Expr.filters[ name ]; + + if ( filter ) { + return filter( elem, i, match, array ); + + } else if ( name === "contains" ) { + return (elem.textContent || elem.innerText || Sizzle.getText([ elem ]) || "").indexOf(match[3]) >= 0; + + } else if ( name === "not" ) { + var not = match[3]; + + for ( var j = 0, l = not.length; j < l; j++ ) { + if ( not[j] === elem ) { + return false; + } + } + + return true; + + } else { + Sizzle.error( name ); + } + }, + + CHILD: function( elem, match ) { + var type = match[1], + node = elem; + + switch ( type ) { + case "only": + case "first": + while ( (node = node.previousSibling) ) { + if ( node.nodeType === 1 ) { + return false; + } + } + + if ( type === "first" ) { + return true; + } + + node = elem; + + case "last": + while ( (node = node.nextSibling) ) { + if ( node.nodeType === 1 ) { + return false; + } + } + + return true; + + case "nth": + var first = match[2], + last = match[3]; + + if ( first === 1 && last === 0 ) { + return true; + } + + var doneName = match[0], + parent = elem.parentNode; + + if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) { + var count = 0; + + for ( node = parent.firstChild; node; node = node.nextSibling ) { + if ( node.nodeType === 1 ) { + node.nodeIndex = ++count; + } + } + + parent.sizcache = doneName; + } + + var diff = elem.nodeIndex - last; + + if ( first === 0 ) { + return diff === 0; + + } else { + return ( diff % first === 0 && diff / first >= 0 ); + } + } + }, + + ID: function( elem, match ) { + return elem.nodeType === 1 && elem.getAttribute("id") === match; + }, + + TAG: function( elem, match ) { + return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match; + }, + + CLASS: function( elem, match ) { + return (" " + (elem.className || elem.getAttribute("class")) + " ") + .indexOf( match ) > -1; + }, + + ATTR: function( elem, match ) { + var name = match[1], + result = Expr.attrHandle[ name ] ? + Expr.attrHandle[ name ]( elem ) : + elem[ name ] != null ? + elem[ name ] : + elem.getAttribute( name ), + value = result + "", + type = match[2], + check = match[4]; + + return result == null ? + type === "!=" : + type === "=" ? + value === check : + type === "*=" ? + value.indexOf(check) >= 0 : + type === "~=" ? + (" " + value + " ").indexOf(check) >= 0 : + !check ? + value && result !== false : + type === "!=" ? + value !== check : + type === "^=" ? + value.indexOf(check) === 0 : + type === "$=" ? + value.substr(value.length - check.length) === check : + type === "|=" ? + value === check || value.substr(0, check.length + 1) === check + "-" : + false; + }, + + POS: function( elem, match, i, array ) { + var name = match[2], + filter = Expr.setFilters[ name ]; + + if ( filter ) { + return filter( elem, i, match, array ); + } + } + } +}; + +var origPOS = Expr.match.POS, + fescape = function(all, num){ + return "\\" + (num - 0 + 1); + }; + +for ( var type in Expr.match ) { + Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^$]*$)/.source) ); + Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) ); +} + +var makeArray = function( array, results ) { + array = Array.prototype.slice.call( array, 0 ); + + if ( results ) { + results.push.apply( results, array ); + return results; + } + + return array; +}; + +// Perform a simple check to determine if the browser is capable of +// converting a NodeList to an array using builtin methods. +// Also verifies that the returned array holds DOM nodes +// (which is not the case in the Blackberry browser) +try { + Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType; + +// Provide a fallback method if it does not work +} catch( e ) { + makeArray = function( array, results ) { + var i = 0, + ret = results || []; + + if ( toString.call(array) === "[object Array]" ) { + Array.prototype.push.apply( ret, array ); + + } else { + if ( typeof array.length === "number" ) { + for ( var l = array.length; i < l; i++ ) { + ret.push( array[i] ); + } + + } else { + for ( ; array[i]; i++ ) { + ret.push( array[i] ); + } + } + } + + return ret; + }; +} + +var sortOrder, siblingCheck; + +if ( document.documentElement.compareDocumentPosition ) { + sortOrder = function( a, b ) { + if ( a === b ) { + hasDuplicate = true; + return 0; + } + + if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) { + return a.compareDocumentPosition ? -1 : 1; + } + + return a.compareDocumentPosition(b) & 4 ? -1 : 1; + }; + +} else { + sortOrder = function( a, b ) { + var al, bl, + ap = [], + bp = [], + aup = a.parentNode, + bup = b.parentNode, + cur = aup; + + // The nodes are identical, we can exit early + if ( a === b ) { + hasDuplicate = true; + return 0; + + // If the nodes are siblings (or identical) we can do a quick check + } else if ( aup === bup ) { + return siblingCheck( a, b ); + + // If no parents were found then the nodes are disconnected + } else if ( !aup ) { + return -1; + + } else if ( !bup ) { + return 1; + } + + // Otherwise they're somewhere else in the tree so we need + // to build up a full list of the parentNodes for comparison + while ( cur ) { + ap.unshift( cur ); + cur = cur.parentNode; + } + + cur = bup; + + while ( cur ) { + bp.unshift( cur ); + cur = cur.parentNode; + } + + al = ap.length; + bl = bp.length; + + // Start walking down the tree looking for a discrepancy + for ( var i = 0; i < al && i < bl; i++ ) { + if ( ap[i] !== bp[i] ) { + return siblingCheck( ap[i], bp[i] ); + } + } + + // We ended someplace up the tree so do a sibling check + return i === al ? + siblingCheck( a, bp[i], -1 ) : + siblingCheck( ap[i], b, 1 ); + }; + + siblingCheck = function( a, b, ret ) { + if ( a === b ) { + return ret; + } + + var cur = a.nextSibling; + + while ( cur ) { + if ( cur === b ) { + return -1; + } + + cur = cur.nextSibling; + } + + return 1; + }; +} + +// Utility function for retreiving the text value of an array of DOM nodes +Sizzle.getText = function( elems ) { + var ret = "", elem; + + for ( var i = 0; elems[i]; i++ ) { + elem = elems[i]; + + // Get the text from text nodes and CDATA nodes + if ( elem.nodeType === 3 || elem.nodeType === 4 ) { + ret += elem.nodeValue; + + // Traverse everything else, except comment nodes + } else if ( elem.nodeType !== 8 ) { + ret += Sizzle.getText( elem.childNodes ); + } + } + + return ret; +}; + +// Check to see if the browser returns elements by name when +// querying by getElementById (and provide a workaround) +(function(){ + // We're going to inject a fake input element with a specified name + var form = document.createElement("div"), + id = "script" + (new Date()).getTime(), + root = document.documentElement; + + form.innerHTML = ""; + + // Inject it into the root element, check its status, and remove it quickly + root.insertBefore( form, root.firstChild ); + + // The workaround has to do additional checks after a getElementById + // Which slows things down for other browsers (hence the branching) + if ( document.getElementById( id ) ) { + Expr.find.ID = function( match, context, isXML ) { + if ( typeof context.getElementById !== "undefined" && !isXML ) { + var m = context.getElementById(match[1]); + + return m ? + m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? + [m] : + undefined : + []; + } + }; + + Expr.filter.ID = function( elem, match ) { + var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id"); + + return elem.nodeType === 1 && node && node.nodeValue === match; + }; + } + + root.removeChild( form ); + + // release memory in IE + root = form = null; +})(); + +(function(){ + // Check to see if the browser returns only elements + // when doing getElementsByTagName("*") + + // Create a fake element + var div = document.createElement("div"); + div.appendChild( document.createComment("") ); + + // Make sure no comments are found + if ( div.getElementsByTagName("*").length > 0 ) { + Expr.find.TAG = function( match, context ) { + var results = context.getElementsByTagName( match[1] ); + + // Filter out possible comments + if ( match[1] === "*" ) { + var tmp = []; + + for ( var i = 0; results[i]; i++ ) { + if ( results[i].nodeType === 1 ) { + tmp.push( results[i] ); + } + } + + results = tmp; + } + + return results; + }; + } + + // Check to see if an attribute returns normalized href attributes + div.innerHTML = ""; + + if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" && + div.firstChild.getAttribute("href") !== "#" ) { + + Expr.attrHandle.href = function( elem ) { + return elem.getAttribute( "href", 2 ); + }; + } + + // release memory in IE + div = null; +})(); + +if ( document.querySelectorAll ) { + (function(){ + var oldSizzle = Sizzle, + div = document.createElement("div"), + id = "__sizzle__"; + + div.innerHTML = "
"; + + // Safari can't handle uppercase or unicode characters when + // in quirks mode. + if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) { + return; + } + + Sizzle = function( query, context, extra, seed ) { + context = context || document; + + // Only use querySelectorAll on non-XML documents + // (ID selectors don't work in non-HTML documents) + if ( !seed && !Sizzle.isXML(context) ) { + // See if we find a selector to speed up + var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec( query ); + + if ( match && (context.nodeType === 1 || context.nodeType === 9) ) { + // Speed-up: Sizzle("TAG") + if ( match[1] ) { + return makeArray( context.getElementsByTagName( query ), extra ); + + // Speed-up: Sizzle(".CLASS") + } else if ( match[2] && Expr.find.CLASS && context.getElementsByClassName ) { + return makeArray( context.getElementsByClassName( match[2] ), extra ); + } + } + + if ( context.nodeType === 9 ) { + // Speed-up: Sizzle("body") + // The body element only exists once, optimize finding it + if ( query === "body" && context.body ) { + return makeArray( [ context.body ], extra ); + + // Speed-up: Sizzle("#ID") + } else if ( match && match[3] ) { + var elem = context.getElementById( match[3] ); + + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document #6963 + if ( elem && elem.parentNode ) { + // Handle the case where IE and Opera return items + // by name instead of ID + if ( elem.id === match[3] ) { + return makeArray( [ elem ], extra ); + } + + } else { + return makeArray( [], extra ); + } + } + + try { + return makeArray( context.querySelectorAll(query), extra ); + } catch(qsaError) {} + + // qSA works strangely on Element-rooted queries + // We can work around this by specifying an extra ID on the root + // and working up from there (Thanks to Andrew Dupont for the technique) + // IE 8 doesn't work on object elements + } else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) { + var old = context.getAttribute( "id" ), + nid = old || id, + hasParent = context.parentNode, + relativeHierarchySelector = /^\s*[+~]/.test( query ); + + if ( !old ) { + context.setAttribute( "id", nid ); + } else { + nid = nid.replace( /'/g, "\\$&" ); + } + if ( relativeHierarchySelector && hasParent ) { + context = context.parentNode; + } + + try { + if ( !relativeHierarchySelector || hasParent ) { + return makeArray( context.querySelectorAll( "[id='" + nid + "'] " + query ), extra ); + } + + } catch(pseudoError) { + } finally { + if ( !old ) { + context.removeAttribute( "id" ); + } + } + } + } + + return oldSizzle(query, context, extra, seed); + }; + + for ( var prop in oldSizzle ) { + Sizzle[ prop ] = oldSizzle[ prop ]; + } + + // release memory in IE + div = null; + })(); +} + +(function(){ + var html = document.documentElement, + matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector, + pseudoWorks = false; + + try { + // This should fail with an exception + // Gecko does not error, returns false instead + matches.call( document.documentElement, "[test!='']:sizzle" ); + + } catch( pseudoError ) { + pseudoWorks = true; + } + + if ( matches ) { + Sizzle.matchesSelector = function( node, expr ) { + // Make sure that attribute selectors are quoted + expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']"); + + if ( !Sizzle.isXML( node ) ) { + try { + if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) { + return matches.call( node, expr ); + } + } catch(e) {} + } + + return Sizzle(expr, null, null, [node]).length > 0; + }; + } +})(); + +(function(){ + var div = document.createElement("div"); + + div.innerHTML = "
"; + + // Opera can't find a second classname (in 9.6) + // Also, make sure that getElementsByClassName actually exists + if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) { + return; + } + + // Safari caches class attributes, doesn't catch changes (in 3.2) + div.lastChild.className = "e"; + + if ( div.getElementsByClassName("e").length === 1 ) { + return; + } + + Expr.order.splice(1, 0, "CLASS"); + Expr.find.CLASS = function( match, context, isXML ) { + if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) { + return context.getElementsByClassName(match[1]); + } + }; + + // release memory in IE + div = null; +})(); + +function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { + for ( var i = 0, l = checkSet.length; i < l; i++ ) { + var elem = checkSet[i]; + + if ( elem ) { + var match = false; + + elem = elem[dir]; + + while ( elem ) { + if ( elem.sizcache === doneName ) { + match = checkSet[elem.sizset]; + break; + } + + if ( elem.nodeType === 1 && !isXML ){ + elem.sizcache = doneName; + elem.sizset = i; + } + + if ( elem.nodeName.toLowerCase() === cur ) { + match = elem; + break; + } + + elem = elem[dir]; + } + + checkSet[i] = match; + } + } +} + +function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { + for ( var i = 0, l = checkSet.length; i < l; i++ ) { + var elem = checkSet[i]; + + if ( elem ) { + var match = false; + + elem = elem[dir]; + + while ( elem ) { + if ( elem.sizcache === doneName ) { + match = checkSet[elem.sizset]; + break; + } + + if ( elem.nodeType === 1 ) { + if ( !isXML ) { + elem.sizcache = doneName; + elem.sizset = i; + } + + if ( typeof cur !== "string" ) { + if ( elem === cur ) { + match = true; + break; + } + + } else if ( Sizzle.filter( cur, [elem] ).length > 0 ) { + match = elem; + break; + } + } + + elem = elem[dir]; + } + + checkSet[i] = match; + } + } +} + +if ( document.documentElement.contains ) { + Sizzle.contains = function( a, b ) { + return a !== b && (a.contains ? a.contains(b) : true); + }; + +} else if ( document.documentElement.compareDocumentPosition ) { + Sizzle.contains = function( a, b ) { + return !!(a.compareDocumentPosition(b) & 16); + }; + +} else { + Sizzle.contains = function() { + return false; + }; +} + +Sizzle.isXML = function( elem ) { + // documentElement is verified for cases where it doesn't yet exist + // (such as loading iframes in IE - #4833) + var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement; + + return documentElement ? documentElement.nodeName !== "HTML" : false; +}; + +var posProcess = function( selector, context ) { + var match, + tmpSet = [], + later = "", + root = context.nodeType ? [context] : context; + + // Position selectors must be done after the filter + // And so must :not(positional) so we move all PSEUDOs to the end + while ( (match = Expr.match.PSEUDO.exec( selector )) ) { + later += match[0]; + selector = selector.replace( Expr.match.PSEUDO, "" ); + } + + selector = Expr.relative[selector] ? selector + "*" : selector; + + for ( var i = 0, l = root.length; i < l; i++ ) { + Sizzle( selector, root[i], tmpSet ); + } + + return Sizzle.filter( later, tmpSet ); +}; + +// EXPOSE +jQuery.find = Sizzle; +jQuery.expr = Sizzle.selectors; +jQuery.expr[":"] = jQuery.expr.filters; +jQuery.unique = Sizzle.uniqueSort; +jQuery.text = Sizzle.getText; +jQuery.isXMLDoc = Sizzle.isXML; +jQuery.contains = Sizzle.contains; + + +})(); + + +var runtil = /Until$/, + rparentsprev = /^(?:parents|prevUntil|prevAll)/, + // Note: This RegExp should be improved, or likely pulled from Sizzle + rmultiselector = /,/, + isSimple = /^.[^:#\[\.,]*$/, + slice = Array.prototype.slice, + POS = jQuery.expr.match.POS, + // methods guaranteed to produce a unique set when starting from a unique set + guaranteedUnique = { + children: true, + contents: true, + next: true, + prev: true + }; + +jQuery.fn.extend({ + find: function( selector ) { + var ret = this.pushStack( "", "find", selector ), + length = 0; + + for ( var i = 0, l = this.length; i < l; i++ ) { + length = ret.length; + jQuery.find( selector, this[i], ret ); + + if ( i > 0 ) { + // Make sure that the results are unique + for ( var n = length; n < ret.length; n++ ) { + for ( var r = 0; r < length; r++ ) { + if ( ret[r] === ret[n] ) { + ret.splice(n--, 1); + break; + } + } + } + } + } + + return ret; + }, + + has: function( target ) { + var targets = jQuery( target ); + return this.filter(function() { + for ( var i = 0, l = targets.length; i < l; i++ ) { + if ( jQuery.contains( this, targets[i] ) ) { + return true; + } + } + }); + }, + + not: function( selector ) { + return this.pushStack( winnow(this, selector, false), "not", selector); + }, + + filter: function( selector ) { + return this.pushStack( winnow(this, selector, true), "filter", selector ); + }, + + is: function( selector ) { + return !!selector && jQuery.filter( selector, this ).length > 0; + }, + + closest: function( selectors, context ) { + var ret = [], i, l, cur = this[0]; + + if ( jQuery.isArray( selectors ) ) { + var match, selector, + matches = {}, + level = 1; + + if ( cur && selectors.length ) { + for ( i = 0, l = selectors.length; i < l; i++ ) { + selector = selectors[i]; + + if ( !matches[selector] ) { + matches[selector] = jQuery.expr.match.POS.test( selector ) ? + jQuery( selector, context || this.context ) : + selector; + } + } + + while ( cur && cur.ownerDocument && cur !== context ) { + for ( selector in matches ) { + match = matches[selector]; + + if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) { + ret.push({ selector: selector, elem: cur, level: level }); + } + } + + cur = cur.parentNode; + level++; + } + } + + return ret; + } + + var pos = POS.test( selectors ) ? + jQuery( selectors, context || this.context ) : null; + + for ( i = 0, l = this.length; i < l; i++ ) { + cur = this[i]; + + while ( cur ) { + if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) { + ret.push( cur ); + break; + + } else { + cur = cur.parentNode; + if ( !cur || !cur.ownerDocument || cur === context ) { + break; + } + } + } + } + + ret = ret.length > 1 ? jQuery.unique(ret) : ret; + + return this.pushStack( ret, "closest", selectors ); + }, + + // Determine the position of an element within + // the matched set of elements + index: function( elem ) { + if ( !elem || typeof elem === "string" ) { + return jQuery.inArray( this[0], + // If it receives a string, the selector is used + // If it receives nothing, the siblings are used + elem ? jQuery( elem ) : this.parent().children() ); + } + // Locate the position of the desired element + return jQuery.inArray( + // If it receives a jQuery object, the first element is used + elem.jquery ? elem[0] : elem, this ); + }, + + add: function( selector, context ) { + var set = typeof selector === "string" ? + jQuery( selector, context ) : + jQuery.makeArray( selector ), + all = jQuery.merge( this.get(), set ); + + return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ? + all : + jQuery.unique( all ) ); + }, + + andSelf: function() { + return this.add( this.prevObject ); + } +}); + +// A painfully simple check to see if an element is disconnected +// from a document (should be improved, where feasible). +function isDisconnected( node ) { + return !node || !node.parentNode || node.parentNode.nodeType === 11; +} + +jQuery.each({ + parent: function( elem ) { + var parent = elem.parentNode; + return parent && parent.nodeType !== 11 ? parent : null; + }, + parents: function( elem ) { + return jQuery.dir( elem, "parentNode" ); + }, + parentsUntil: function( elem, i, until ) { + return jQuery.dir( elem, "parentNode", until ); + }, + next: function( elem ) { + return jQuery.nth( elem, 2, "nextSibling" ); + }, + prev: function( elem ) { + return jQuery.nth( elem, 2, "previousSibling" ); + }, + nextAll: function( elem ) { + return jQuery.dir( elem, "nextSibling" ); + }, + prevAll: function( elem ) { + return jQuery.dir( elem, "previousSibling" ); + }, + nextUntil: function( elem, i, until ) { + return jQuery.dir( elem, "nextSibling", until ); + }, + prevUntil: function( elem, i, until ) { + return jQuery.dir( elem, "previousSibling", until ); + }, + siblings: function( elem ) { + return jQuery.sibling( elem.parentNode.firstChild, elem ); + }, + children: function( elem ) { + return jQuery.sibling( elem.firstChild ); + }, + contents: function( elem ) { + return jQuery.nodeName( elem, "iframe" ) ? + elem.contentDocument || elem.contentWindow.document : + jQuery.makeArray( elem.childNodes ); + } +}, function( name, fn ) { + jQuery.fn[ name ] = function( until, selector ) { + var ret = jQuery.map( this, fn, until ), + // The variable 'args' was introduced in + // https://github.com/jquery/jquery/commit/52a0238 + // to work around a bug in Chrome 10 (Dev) and should be removed when the bug is fixed. + // http://code.google.com/p/v8/issues/detail?id=1050 + args = slice.call(arguments); + + if ( !runtil.test( name ) ) { + selector = until; + } + + if ( selector && typeof selector === "string" ) { + ret = jQuery.filter( selector, ret ); + } + + ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret; + + if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) { + ret = ret.reverse(); + } + + return this.pushStack( ret, name, args.join(",") ); + }; +}); + +jQuery.extend({ + filter: function( expr, elems, not ) { + if ( not ) { + expr = ":not(" + expr + ")"; + } + + return elems.length === 1 ? + jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] : + jQuery.find.matches(expr, elems); + }, + + dir: function( elem, dir, until ) { + var matched = [], + cur = elem[ dir ]; + + while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) { + if ( cur.nodeType === 1 ) { + matched.push( cur ); + } + cur = cur[dir]; + } + return matched; + }, + + nth: function( cur, result, dir, elem ) { + result = result || 1; + var num = 0; + + for ( ; cur; cur = cur[dir] ) { + if ( cur.nodeType === 1 && ++num === result ) { + break; + } + } + + return cur; + }, + + sibling: function( n, elem ) { + var r = []; + + for ( ; n; n = n.nextSibling ) { + if ( n.nodeType === 1 && n !== elem ) { + r.push( n ); + } + } + + return r; + } +}); + +// Implement the identical functionality for filter and not +function winnow( elements, qualifier, keep ) { + if ( jQuery.isFunction( qualifier ) ) { + return jQuery.grep(elements, function( elem, i ) { + var retVal = !!qualifier.call( elem, i, elem ); + return retVal === keep; + }); + + } else if ( qualifier.nodeType ) { + return jQuery.grep(elements, function( elem, i ) { + return (elem === qualifier) === keep; + }); + + } else if ( typeof qualifier === "string" ) { + var filtered = jQuery.grep(elements, function( elem ) { + return elem.nodeType === 1; + }); + + if ( isSimple.test( qualifier ) ) { + return jQuery.filter(qualifier, filtered, !keep); + } else { + qualifier = jQuery.filter( qualifier, filtered ); + } + } + + return jQuery.grep(elements, function( elem, i ) { + return (jQuery.inArray( elem, qualifier ) >= 0) === keep; + }); +} + + + + +var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g, + rleadingWhitespace = /^\s+/, + rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig, + rtagName = /<([\w:]+)/, + rtbody = /", "" ], + legend: [ 1, "
", "
" ], + thead: [ 1, "", "
" ], + tr: [ 2, "", "
" ], + td: [ 3, "", "
" ], + col: [ 2, "", "
" ], + area: [ 1, "", "" ], + _default: [ 0, "", "" ] + }; + +wrapMap.optgroup = wrapMap.option; +wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; +wrapMap.th = wrapMap.td; + +// IE can't serialize and + +{% endblock %} + {% block javascript %} // Handler for phase onclick events. function show_phase_popup(url, event) { @@ -20,6 +39,51 @@ popup_frame.src = url; } +// Handler for timing onclick events. +function show_timing_popup(url, event) { + // Get the popup elements. + var popup = document.getElementById("timing_popup"); + var popup_legend = document.getElementById("timing_popup_legend"); + + // Get the timing data from the server. + $.getJSON(url, {}, function(data) { + var builds = data.data; + + // Create the timing graph if necessary. + var graph = window.timing_graph_object; + if (graph) { + graph.clearPlots(); + } else { + graph = window.timing_graph_object = new Graph2D("timing_graph"); + graph.clearColor = [1, 1, 1]; + graph.xAxis.format = graph.xAxis.formats.normal; + } + + // Add the plots and build the legend. + var legend = ""; + legend += ""; + for (var i = 0, e = builds.length; i != e; ++i) { + var item = builds[i]; + var name = item[0]; + var points = item[1]; + var color = item[2]; + var hex_color = item[3]; + graph.addPlot(points, new Graph2D_LinePlotStyle(1, color)); + + legend += ""; + legend += ""; + } + legend += "
Legend
" + name + "
"; + popup_legend.innerHTML = legend; + + graph.draw(); +// popup.innerHTML = data.data; + + // Show the timing popup. + popup.style.display = "block"; + }); +} + // Handler for page load events inside the hidden iframe we use to load phase // popups. function popup_frame_loaded(event) { @@ -80,7 +144,8 @@ -
Current Status
+
Current Status ({% + call timing_popup_link(None) %}T{% endcall %})
{# The traffic light... #} @@ -126,7 +191,8 @@ {% for phase in ci_config.phases %} - + {% endfor %} @@ -208,4 +274,10 @@ displayed, just used to load the HTML we insert into the popup div. #} +{# The div we use to include timing popups. #} +
+ +
+
+ {% endblock %} Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html?rev=125920&r1=125919&r2=125920&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/layout.html Fri Feb 18 10:43:51 2011 @@ -6,6 +6,7 @@ {{ self.title() }} + {% block head %}{% endblock %} Modified: zorg/trunk/llvmlab/llvmlab/util.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/util.py?rev=125920&r1=125919&r2=125920&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/util.py (original) +++ zorg/trunk/llvmlab/llvmlab/util.py Fri Feb 18 10:43:51 2011 @@ -1,12 +1,20 @@ -__all__ = [] - -def sorted(items): - items = list(items) - items.sort() - return items +import colorsys class simple_repr_mixin(object): def __repr__(self): return "%s(%s)" % (self.__class__.__name__, ", ".join("%s=%r" % (k,v) for k,v in sorted(self.__dict__.items()))) + +def sorted(items): + items = list(items) + items.sort() + return items + +def make_dark_color(h): + h = h % 1. + s = 0.95 + v = 0.8 + return colorsys.hsv_to_rgb(h,0.9+s*.1,v) + +__all__ = [] From daniel at zuster.org Fri Feb 18 10:43:58 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:43:58 -0000 Subject: [llvm-commits] [zorg] r125922 - in /zorg/trunk/llvmlab/llvmlab/ui/templates: dashboard.html phase_popup.html Message-ID: <20110218164358.4B1692A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:43:58 2011 New Revision: 125922 URL: http://llvm.org/viewvc/llvm-project?rev=125922&view=rev Log: llvmlab: Link phase popup builder names to buildbot builder page and individual build status to build page. Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125922&r1=125921&r2=125922&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:43:58 2011 @@ -13,7 +13,7 @@ {% macro phase_popup_cell(phase, phase_info, build) %} {% if not build %} {% set kind = "unknown" %} -{% elif not build.end_time %} +{% elif build.end_time == None %} {% set kind = "running" %} {% elif build.result == 0 %} {% set kind = "success" %} @@ -202,6 +202,7 @@
+
Recent Activity
{# The results table... #}
Result Type Phase {{ phase.number }} Phase {{ phase.number }} ({% + call timing_popup_link(phase) %}T{% endcall %})

Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html?rev=125922&r1=125921&r2=125922&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html Fri Feb 18 10:43:58 2011 @@ -7,16 +7,25 @@ {% for name,builds in phased_builds|dictsort %} - - + From daniel at zuster.org Fri Feb 18 10:44:07 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:44:07 -0000 Subject: [llvm-commits] [zorg] r125925 - /zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Message-ID: <20110218164407.B07D32A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:44:07 2011 New Revision: 125925 URL: http://llvm.org/viewvc/llvm-project?rev=125925&view=rev Log: llvmlab: Drop link to release page now, since it isn't live yet. Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125925&r1=125924&r2=125925&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:44:07 2011 @@ -143,8 +143,8 @@ The most recent released revision is r{{ final_phase.passing.source_stamp }} validated at: -{{ final_phase.passing.end_time|asusertime }} -(available here). +{{ final_phase.passing.end_time|asusertime }}. {% else %} No release is currently available! {% endif %} From daniel at zuster.org Fri Feb 18 10:44:04 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:44:04 -0000 Subject: [llvm-commits] [zorg] r125924 - in /zorg/trunk/llvmlab/llvmlab/ui/templates: dashboard.html phase_popup.html Message-ID: <20110218164404.A33B12A6C12E@llvm.org> Author: ddunbar Date: Fri Feb 18 10:44:04 2011 New Revision: 125924 URL: http://llvm.org/viewvc/llvm-project?rev=125924&view=rev Log: llvmlab: Fix typo. Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125924&r1=125923&r2=125924&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:44:04 2011 @@ -18,7 +18,7 @@ {% elif build.result == 0 %} {% set kind = "success" %} {% elif build == phase_info.failing %} -{% set kind = "failing" %} +{% set kind = "failure" %} {% else %} {% set kind = "warnings" %} {% endif %} Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html?rev=125924&r1=125923&r2=125924&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html Fri Feb 18 10:44:04 2011 @@ -22,7 +22,7 @@ {% set kind = "success" %} {% set text = "PASS" %} {% else %} - {% set kind = "failing" %} + {% set kind = "failure" %} {% set text = "FAIL" %} {% endif %} From daniel at zuster.org Fri Feb 18 10:44:10 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:44:10 -0000 Subject: [llvm-commits] [zorg] r125926 - in /zorg/trunk/llvmlab/llvmlab/ui: static/style.css templates/dashboard.html Message-ID: <20110218164410.C8FF82A6C12F@llvm.org> Author: ddunbar Date: Fri Feb 18 10:44:10 2011 New Revision: 125926 URL: http://llvm.org/viewvc/llvm-project?rev=125926&view=rev Log: llvmlab: Sketch some support for help popups into the dashboard. Modified: zorg/trunk/llvmlab/llvmlab/ui/static/style.css zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Modified: zorg/trunk/llvmlab/llvmlab/ui/static/style.css URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/static/style.css?rev=125926&r1=125925&r2=125926&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/static/style.css (original) +++ zorg/trunk/llvmlab/llvmlab/ui/static/style.css Fri Feb 18 10:44:10 2011 @@ -46,6 +46,12 @@ /* Dashboard Features */ +a.help-link { + padding: 0px; + font-size: 75%; + vertical-align: super; +} + td.phase-cell { padding: 4px 4px 4px 4px; color: #333333; Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125926&r1=125925&r2=125926&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:44:10 2011 @@ -1,8 +1,24 @@ {% extends "layout.html" %} +{% macro help_link(key) %} +? +{% endmacro %} + +{% macro help_text(text) %} +? +{% endmacro %} + {% macro phase_popup_link(phase, build, kind) %} here). {% else %} No release is currently available! @@ -161,7 +161,7 @@ WARNING! LLVM is currently failing the {{ phase.name }} checks. The failures started in r{{ phase_info.failing.source_stamp }} at {{ - phase_info.failing.end_time }}. + phase_info.failing.end_time|asusertime }}. {% endif %} @@ -271,12 +271,16 @@
{{ name }} + {{ + name }} {% for build in builds %} {% if build.end_time == None %} - RUNNING + {% set kind = "running" %} + {% set text = "RUNNING" %} {% elif build.result == 0 %} - PASS + {% set kind = "success" %} + {% set text = "PASS" %} {% else %} - FAIL + {% set kind = "failing" %} + {% set text = "FAIL" %} {% endif %} + + {{ text }} + {% endfor %}

+
+ {# The div we use to include phase popups. #}
{# The iframe we use to load the phase popup source. This is never actually displayed, just used to load the HTML we insert into the popup div. #} +
+ {# The div we use to include timing popups. #}
Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html?rev=125923&r1=125922&r2=125923&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/phase_popup.html Fri Feb 18 10:44:01 2011 @@ -1,6 +1,10 @@ {# Fragment template for rendering an individual phase pop-up #} -
Phase {{ phase.number }} {{ phase.name }} - r{{ source_stamp }}
+
{{ phase.name }} + (Phase {{ phase.number }}) - + r{{ source_stamp }}
From daniel at zuster.org Fri Feb 18 10:44:20 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:44:20 -0000 Subject: [llvm-commits] [zorg] r125929 - in /zorg/trunk/llvmlab/llvmlab: llvmlabtool/lab.cfg.sample llvmlabtool/main.py ui/app.py Message-ID: <20110218164420.EB27E2A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:44:20 2011 New Revision: 125929 URL: http://llvm.org/viewvc/llvm-project?rev=125929&view=rev Log: llvmlab: Update config to only point to install directory (instead of individual files in it). Modified: zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py zorg/trunk/llvmlab/llvmlab/ui/app.py Modified: zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample?rev=125929&r1=125928&r2=125929&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample (original) +++ zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample Fri Feb 18 10:44:20 2011 @@ -20,11 +20,6 @@ # Secret key for this server instance. SECRET_KEY = %(secret_key)r -# Path to the managed data file. -DATA_PATH = %(data_path)r - -# Path to the buildbot status file. -STATUS_PATH = %(status_path)r - -# Path to the error log. -ERROR_LOG_PATH = %(error_log_path)r +# Path to the installation directory (which stores data files, status, logs, +# etc.). +INSTALL_PATH = %(install_path)r Modified: zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py?rev=125929&r1=125928&r2=125929&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py (original) +++ zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py Fri Feb 18 10:44:20 2011 @@ -36,8 +36,6 @@ import llvmlab from optparse import OptionParser, OptionGroup parser = OptionParser("%%prog %s [options] " % name) - parser.add_option("-f", "--force", dest="force", action="store_true", - help="overwrite existing files") group = OptionGroup(parser, "CONFIG OPTIONS") group.add_option("", "--admin-login", dest="admin_login", @@ -64,28 +62,17 @@ if len(args) != 1: parser.error("invalid number of arguments") - basepath, = args - basepath = os.path.abspath(basepath) - cfg_path = os.path.join(basepath, 'lab.cfg') - data_path = os.path.join(basepath, 'lab-data.json') - status_path = os.path.join(basepath, 'lab-status.json') - error_log_path = os.path.join(basepath, 'error.log') - - if not os.path.exists(basepath): - try: - os.mkdir(basepath) - except: - parser.error("unable to create directory: %r" % basepath) - elif not os.path.isdir(basepath): - parser.error("%r exists but is not a directory" % basepath) - - if not opts.force: - if os.path.exists(cfg_path): - parser.error("%r exists (use --force to override)" % cfg_path) - if os.path.exists(data_path): - parser.error("%r exists (use --force to override)" % data_path) - if os.path.exists(status_path): - parser.error("%r exists (use --force to override)" % status_path) + install_path, = args + install_path = os.path.abspath(install_path) + cfg_path = os.path.join(install_path, 'lab.cfg') + + # Create the install directory. + if os.path.exists(install_path): + parser.error("refusing to install: %r exists" % install_path) + try: + os.mkdir(install_path) + except: + parser.error("unable to create directory: %r" % install_path) # Construct the config file. sample_cfg_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), @@ -100,9 +87,7 @@ cfg_options['admin_passhash'] = hashlib.sha256( opts.admin_password + secret_key).hexdigest() cfg_options['secret_key'] = secret_key - cfg_options['data_path'] = data_path - cfg_options['status_path'] = status_path - cfg_options['error_log_path'] = error_log_path + cfg_options['install_path'] = install_path cfg_data = sample_cfg_data % cfg_options # Write the initial config file. Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125929&r1=125928&r2=125929&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:44:20 2011 @@ -27,9 +27,12 @@ app.load_config(config, config_path) # Configure error logging. - handler = logging.FileHandler(app.config['ERROR_LOG_PATH']) - handler.setLevel(logging.WARNING) - app.logger.addHandler(handler) + install_path = app.config["INSTALL_PATH"] + if install_path: + error_log_path = os.path.join(install_path, "error.log") + handler = logging.FileHandler(error_log_path) + handler.setLevel(logging.WARNING) + app.logger.addHandler(handler) # Configure error emails, if requested. if app.config['MAIL_ERRORS']: @@ -78,8 +81,7 @@ "EMAIL_RELAY_SERVER" : "localhost", "MAIL_ERRORS" : False, "SECRET_KEY" : secret_key, - "DATA_PATH" : None, - "STATUS_PATH" : None } + "INSTALL_PATH" : None } # Construct an empty test database. data = llvmlab.data.Data(users = [], machines = []) @@ -111,7 +113,8 @@ def load_data(self, data = None): if data is None: - data_path = self.config["DATA_PATH"] + install_path = self.config["INSTALL_PATH"] + data_path = os.path.join(install_path, "lab-data.json") data_file = open(data_path, "rb") data_object = flask.json.load(data_file) data_file.close() @@ -130,14 +133,17 @@ self.config.data = data def save_data(self): - file = open(self.config["DATA_PATH"], 'w') + install_path = self.config["INSTALL_PATH"] + data_path = os.path.join(install_path, "lab-data.json") + file = open(data_path, 'w') flask.json.dump(self.config.data.todata(), file, indent=2) print >>file file.close() def load_status(self, status = None): if status is None: - data_path = self.config["STATUS_PATH"] + install_path = self.config["INSTALL_PATH"] + data_path = os.path.join(install_path, "lab-status.json") data_file = open(data_path, "rb") data_object = flask.json.load(data_file) data_file.close() @@ -148,7 +154,9 @@ self.config.status = status def save_status(self): - file = open(self.config["STATUS_PATH"], 'w') + install_path = self.config["INSTALL_PATH"] + data_path = os.path.join(install_path, "lab-status.json") + file = open(data_path, 'w') flask.json.dump(self.config.status.todata(), file, indent=2) print >>file file.close() From daniel at zuster.org Fri Feb 18 10:44:24 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:44:24 -0000 Subject: [llvm-commits] [zorg] r125930 - in /zorg/trunk/llvmlab/llvmlab: llvmlabtool/lab.cfg.sample llvmlabtool/main.py ui/app.py Message-ID: <20110218164424.1879A2A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:44:23 2011 New Revision: 125930 URL: http://llvm.org/viewvc/llvm-project?rev=125930&view=rev Log: llvmlab: Sketch support for dashboard plugins, to support site specific customization. Modified: zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py zorg/trunk/llvmlab/llvmlab/ui/app.py Modified: zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample?rev=125930&r1=125929&r2=125930&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample (original) +++ zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample Fri Feb 18 10:44:23 2011 @@ -23,3 +23,6 @@ # Path to the installation directory (which stores data files, status, logs, # etc.). INSTALL_PATH = %(install_path)r + +# Name of the plugin module to import (optional). +PLUGIN_MODULE = %(plugin_module)r Modified: zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py?rev=125930&r1=125929&r2=125930&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py (original) +++ zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py Fri Feb 18 10:44:23 2011 @@ -51,6 +51,9 @@ group.add_option("", "--master-url", dest="master_url", help="URL for the buildbot master [%default]", default='http://lab.llvm.org:8013') + group.add_option("", "--plugin-module", dest="plugin_module", + help="name of the dashboard plugin to load [%default]", + default=None) group.add_option("", "--debug-server", dest="debug_server", help="run server in debug mode [%default]", @@ -88,6 +91,7 @@ opts.admin_password + secret_key).hexdigest() cfg_options['secret_key'] = secret_key cfg_options['install_path'] = install_path + cfg_options['plugin_module'] = opts.plugin_module cfg_data = sample_cfg_data % cfg_options # Write the initial config file. Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125930&r1=125929&r2=125930&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:44:23 2011 @@ -23,6 +23,9 @@ # Construct the application. app = App(__name__) + # Register additional filters. + llvmlab.ui.filters.register(app) + # Load the application configuration. app.load_config(config, config_path) @@ -59,9 +62,12 @@ app.config.summary = llvmlab.ci.summary.Summary( llvmlab.ui.ci.views.g_config, app.config.status) - # Register additional filters. - llvmlab.ui.filters.register(app) - + # Load any dashboard plugins. + plugins_module = app.config["PLUGIN_MODULE"] + if plugins_module: + module = __import__(plugins_module, fromlist=['__name__']) + module.register(app) + return app @staticmethod From daniel at zuster.org Fri Feb 18 10:44:28 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:44:28 -0000 Subject: [llvm-commits] [zorg] r125931 - /zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Message-ID: <20110218164428.0C5D82A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:44:27 2011 New Revision: 125931 URL: http://llvm.org/viewvc/llvm-project?rev=125931&view=rev Log: llvmlab/dashboard: Move to using the phase config object via the app. Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/ci/views.py?rev=125931&r1=125930&r2=125931&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/ci/views.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Fri Feb 18 10:44:27 2011 @@ -76,29 +76,34 @@ @ci.route('/') def dashboard(): - return render_template("dashboard.html", ci_config=g_config) + return render_template("dashboard.html", + ci_config=current_app.config.summary.config) @ci.route('/phase//') def phase_popup(index, source_stamp): + cfg = current_app.config.summary.config + # Validate the phase. - if index >= len(g_config.phases): + if index >= len(cfg.phases): abort(404) # Get the phase. - phase = g_config.phases[index] + phase = cfg.phases[index] # Lookup the latest builds associated with this revision. phased_builds = dict( (builder, [b for b in current_app.config.status.builders.get(builder,[]) if b.source_stamp == source_stamp]) for builder in phase.builder_names) - return render_template("phase_popup.html", ci_config=g_config, + return render_template("phase_popup.html", + ci_config=current_app.config.summary.config, phase = phase, source_stamp = source_stamp, phased_builds = phased_builds) @ci.route('/latest_release') def latest_release(): - return render_template("latest_release.html", ci_config=g_config) + return render_template("latest_release.html", + ci_config=current_app.config.summary.config) @ci.route('/monitor') def buildbot_monitor(): @@ -108,14 +113,16 @@ @ci.route('/times') @ci.route('/times/') def phase_timing(index=None): + cfg = current_app.config.summary.config + # Determine what we are timing. if index is not None: # Validate the phase. - if index >= len(g_config.phases): + if index >= len(cfg.phases): abort(404) # Get the phase. - phase = g_config.phases[index] + phase = cfg.phases[index] else: phase = None @@ -123,7 +130,7 @@ builder_to_time = [] if phase is None: builders_to_time = [p.phase_builder - for p in g_config.phases] + for p in cfg.phases] else: builders_to_time = phase.builder_names From daniel at zuster.org Fri Feb 18 10:44:38 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:44:38 -0000 Subject: [llvm-commits] [zorg] r125932 - /zorg/trunk/llvmlab/llvmlab/ui/app.py Message-ID: <20110218164438.E82802A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:44:38 2011 New Revision: 125932 URL: http://llvm.org/viewvc/llvm-project?rev=125932&view=rev Log: llvmlab: Drop the hard coded phase config, the expectation is that a specific installation will load the appropriate dashboard config via a plugin. Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125932&r1=125931&r2=125932&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:44:38 2011 @@ -55,18 +55,17 @@ app.register_module(llvmlab.ui.ci.views.ci) app.register_module(llvmlab.ui.frontend.views.frontend) - # Spawn the status monitor thread. - app.monitor = app.config.status.start_monitor(app) - - # Construct the dashboard summary object. - app.config.summary = llvmlab.ci.summary.Summary( - llvmlab.ui.ci.views.g_config, app.config.status) + # Clear the dashboard summary object. + app.config.summary = None # Load any dashboard plugins. plugins_module = app.config["PLUGIN_MODULE"] if plugins_module: module = __import__(plugins_module, fromlist=['__name__']) module.register(app) + + # Spawn the status monitor thread. + app.monitor = app.config.status.start_monitor(app) return app From daniel at zuster.org Fri Feb 18 10:44:48 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:44:48 -0000 Subject: [llvm-commits] [zorg] r125933 - /zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Message-ID: <20110218164448.4ECFD2A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:44:48 2011 New Revision: 125933 URL: http://llvm.org/viewvc/llvm-project?rev=125933&view=rev Log: llvmlab: Drop the hard coded phase config, the expectation is that a specific installation will load the appropriate dashboard config via a plugin. Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/ci/views.py?rev=125933&r1=125932&r2=125933&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/ci/views.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Fri Feb 18 10:44:48 2011 @@ -10,69 +10,6 @@ ci = flask.Module(__name__, url_prefix='/ci') from llvmlab import util -from llvmlab.ci import config - -# Hard-coded current configuration. -# -# FIXME: Figure out how to get as much of this as possible dynamically. One -# problem is how do we deal with changes to the CI infrastructure? Should we -# load a config object per-revision, and try to be smart about caching it unless -# things change? Can we report results across changing configs? -phases = [ - config.Phase("Sanity", 1, "phase1 - sanity", - ["clang-x86_64-osx10-gcc42-RA"]), - config.Phase("Living On", 2, "phase2 - living", - ["clang-x86_64-osx10-DA", - "clang-x86_64-osx10-RA", - "nightly_clang-x86_64-osx10-gcc42-RA"]), - config.Phase("Tree Health", 3, "phase3 - tree health", - ["nightly_clang-x86_64-osx10-DA", - "nightly_clang-x86_64-osx10-RA", - "nightly_clang-x86_64-osx10-RA-O0", - "nightly_clang-x86_64-osx10-RA-Os", - "nightly_clang-x86_64-osx10-RA-O3", - "nightly_clang-x86_64-osx10-RA-flto", - "nightly_clang-x86_64-osx10-RA-g"]), - config.Phase("Validation", 4, "phase4 - validation", - ["nightly_clang-i386-osx10-RA", - "gccTestSuite-clang-x86_64-osx10-RA", - "boost-trunk-clang-x86_64-osx10-RA"])] -builders = [ - config.Builder("Validated Build"), - config.Builder("phase1 - sanity"), - config.Builder("phase2 - living"), - config.Builder("phase3 - tree health"), - config.Builder("phase4 - validation"), - config.Builder("clang-x86_64-osx10-gcc42-RA"), - config.Builder("clang-x86_64-osx10-DA"), - config.Builder("clang-x86_64-osx10-RA"), - config.Builder("nightly_clang-x86_64-osx10-gcc42-RA"), - config.Builder("nightly_clang-x86_64-osx10-DA"), - config.Builder("nightly_clang-x86_64-osx10-RA"), - config.Builder("nightly_clang-x86_64-osx10-RA-O0"), - config.Builder("nightly_clang-x86_64-osx10-RA-Os"), - config.Builder("nightly_clang-x86_64-osx10-RA-O3"), - config.Builder("nightly_clang-x86_64-osx10-RA-flto"), - config.Builder("nightly_clang-x86_64-osx10-RA-g"), - config.Builder("gccTestSuite-clang-x86_64-osx10-RA"), - config.Builder("boost-trunk-clang-x86_64-osx10-RA")] -published_builds = [ - config.PublishedBuild("LLVM", "Linux", "i386", "llvm-linux-i386.tgz"), - config.PublishedBuild("LLVM", "Mac OS X (SnowLeopard)", "x86_64", - "llvm-darwin10-x86_64.tgz"), - - config.PublishedBuild("Clang", "Linux", "i386", "clang-linux-i386.tgz"), - config.PublishedBuild("Clang", "Linux", "x86_64", "clang-linux-x86_64.tgz"), - config.PublishedBuild("Clang", "Mac OS X (SnowLeopard)", "x86_64", - "clang-darwin10-x86_64.tgz"), - config.PublishedBuild("Clang", "Windows", "i386", "clang-windows-i386.tgz"), - - config.PublishedBuild("llvm-gcc-4.2", "Linux", "i386", - "llvm-gcc-4.2-linux-i386.tgz"), - config.PublishedBuild("llvm-gcc-4.2", "Linux", "x86_64", - "llvm-gcc-4.2-linux-x86_64.tgz")] -g_config = config.Config(phases, builders, published_builds, - 'Validated Build') @ci.route('/') def dashboard(): From daniel at zuster.org Fri Feb 18 10:44:50 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:44:50 -0000 Subject: [llvm-commits] [zorg] r125934 - /zorg/trunk/llvmlab/llvmlab/ui/app.py Message-ID: <20110218164450.E6DF22A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:44:50 2011 New Revision: 125934 URL: http://llvm.org/viewvc/llvm-project?rev=125934&view=rev Log: llvmlab: Fix some refactos that broke the pitiful two tests I have written. Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125934&r1=125933&r2=125934&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:44:50 2011 @@ -86,13 +86,14 @@ "EMAIL_RELAY_SERVER" : "localhost", "MAIL_ERRORS" : False, "SECRET_KEY" : secret_key, - "INSTALL_PATH" : None } + "INSTALL_PATH" : None, + "PLUGIN_MODULE" : None } # Construct an empty test database. data = llvmlab.data.Data(users = [], machines = []) # Construct an empty status file. - data = llvmlab.ci.status.Status(None, {}) + status = llvmlab.ci.status.Status(None, {}) return App.create_standalone(config, data, status) From daniel at zuster.org Fri Feb 18 10:44:53 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:44:53 -0000 Subject: [llvm-commits] [zorg] r125935 - /zorg/trunk/llvmlab/setup.py Message-ID: <20110218164453.2C2F62A6C12E@llvm.org> Author: ddunbar Date: Fri Feb 18 10:44:53 2011 New Revision: 125935 URL: http://llvm.org/viewvc/llvm-project?rev=125935&view=rev Log: llvmlab: Make sure setup.py installs the appropriate files. Modified: zorg/trunk/llvmlab/setup.py Modified: zorg/trunk/llvmlab/setup.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/setup.py?rev=125935&r1=125934&r2=125935&view=diff ============================================================================== --- zorg/trunk/llvmlab/setup.py (original) +++ zorg/trunk/llvmlab/setup.py Fri Feb 18 10:44:53 2011 @@ -34,6 +34,14 @@ 'Topic :: Software Development :: Testing', ], + # Additional resource extensions we use. + package_data = { 'llvmlab.llvmlabtool' : ['lab.cfg.sample'], + 'llvmlab.ui' : ['static/*.ico', + 'static/*.css', + 'static/*.js', + 'static/jquery/1.5/*.js', + 'templates/*.html' ] }, + zip_safe = False, packages = find_packages(), entry_points = { From daniel at zuster.org Fri Feb 18 10:44:56 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:44:56 -0000 Subject: [llvm-commits] [zorg] r125936 - in /zorg/trunk/llvmlab: llvmlab/llvmlabtool/app.wsgi.sample llvmlab/llvmlabtool/main.py setup.py Message-ID: <20110218164456.53C232A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:44:56 2011 New Revision: 125936 URL: http://llvm.org/viewvc/llvm-project?rev=125936&view=rev Log: llvmlab create: Auto generated a .wsgi file suitable for use with Apache. Added: zorg/trunk/llvmlab/llvmlab/llvmlabtool/app.wsgi.sample Modified: zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py zorg/trunk/llvmlab/setup.py Added: zorg/trunk/llvmlab/llvmlab/llvmlabtool/app.wsgi.sample URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/llvmlabtool/app.wsgi.sample?rev=125936&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/llvmlabtool/app.wsgi.sample (added) +++ zorg/trunk/llvmlab/llvmlab/llvmlabtool/app.wsgi.sample Fri Feb 18 10:44:56 2011 @@ -0,0 +1,10 @@ +#!/usr/bin/env python2.6 +# -*- Python -*- +%(site_import_string)s +import llvmlab.ui.app +application = llvmlab.ui.app.App.create_standalone( + config_path = %(lab_config_path)r) + +if __name__ == "__main__": + import werkzeug + werkzeug.run_simple('localhost', 5000, application) Modified: zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py?rev=125936&r1=125935&r2=125936&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py (original) +++ zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py Fri Feb 18 10:44:56 2011 @@ -68,6 +68,7 @@ install_path, = args install_path = os.path.abspath(install_path) cfg_path = os.path.join(install_path, 'lab.cfg') + app_path = os.path.join(install_path, 'app.wsgi') # Create the install directory. if os.path.exists(install_path): @@ -99,6 +100,28 @@ cfg_file.write(cfg_data) cfg_file.close() + # Construct the WSGI app file. + app_wsgi_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), + "app.wsgi.sample") + app_wsgi_file = open(app_wsgi_path, "rb") + app_wsgi_data = app_wsgi_file.read() + app_wsgi_file.close() + + # Fill in the sample WSGI app. + virtual_env = os.environ.get('VIRTUAL_ENV') + if virtual_env: + site_import_string = """ +import site +site.addsitedir(%r)\n""" % virtual_env + else: + site_import_string = "" + + app_data = app_wsgi_data % { 'site_import_string' : site_import_string, + 'lab_config_path' : cfg_path } + app_file = open(app_path, 'w') + app_file.write(app_data) + app_file.close() + # Construct the initial database and status files. data = llvmlab.data.Data(users = [], machines = []) status = llvmlab.ci.status.Status(opts.master_url, {}) Modified: zorg/trunk/llvmlab/setup.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/setup.py?rev=125936&r1=125935&r2=125936&view=diff ============================================================================== --- zorg/trunk/llvmlab/setup.py (original) +++ zorg/trunk/llvmlab/setup.py Fri Feb 18 10:44:56 2011 @@ -35,7 +35,7 @@ ], # Additional resource extensions we use. - package_data = { 'llvmlab.llvmlabtool' : ['lab.cfg.sample'], + package_data = { 'llvmlab.llvmlabtool' : ['*.sample'], 'llvmlab.ui' : ['static/*.ico', 'static/*.css', 'static/*.js', From daniel at zuster.org Fri Feb 18 10:45:03 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:45:03 -0000 Subject: [llvm-commits] [zorg] r125938 - /zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Message-ID: <20110218164503.3EA932A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:45:03 2011 New Revision: 125938 URL: http://llvm.org/viewvc/llvm-project?rev=125938&view=rev Log: llvmlab/dashboard: Tweak popups to include links to close them. Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125938&r1=125937&r2=125938&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:45:03 2011 @@ -26,6 +26,13 @@ target="_blank">{{ caller() }} {% endmacro %} +{% macro close_popup_link(kind) %} +{{ caller() }} +{% endmacro %} + {% macro phase_popup_cell(phase, phase_info, build) %} {% if not build %} {% set kind = "unknown" %} @@ -71,10 +78,18 @@ {% block javascript %} function show_content_in_popup(kind, content, event) { + var popup_holder = document.getElementById(kind + "_popup_holder"); var popup = document.getElementById(kind + "_popup"); popup.innerHTML = content; - popup.style.display = "block"; + popup_holder.style.display = "block"; +} + +function close_popup(kind) { + var popup_holder = document.getElementById(kind + "_popup_holder"); + var popup = document.getElementById(kind + "_popup"); + popup.innerHTML = ""; + popup_holder.style.display = "none"; } // Handler for phase onclick events. @@ -298,28 +313,31 @@

Builder Status
-
- {# The div we use to include help popups. #} -
+
+ {% call close_popup_link("help") %}(close) {% endcall %} +
+
{# The iframe we use to load the help source. This is never actually displayed, just used to load the HTML we insert into the popup div. #} -
- {# The div we use to include phase popups. #} -
+
+ {% call close_popup_link("phase") %}(close) {% endcall %} +
+
{# The iframe we use to load the phase popup source. This is never actually displayed, just used to load the HTML we insert into the popup div. #} -
- {# The div we use to include timing popups. #} -
- -
+
+ {% call close_popup_link("help") %}(close) {% endcall %} +
+ +
+

{% endblock %} From daniel at zuster.org Fri Feb 18 10:45:00 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:45:00 -0000 Subject: [llvm-commits] [zorg] r125937 - in /zorg/trunk/llvmlab/llvmlab: ci/config.py ui/ci/views.py ui/templates/dashboard.html ui/templates/phase_description.html Message-ID: <20110218164500.37FC92A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:45:00 2011 New Revision: 125937 URL: http://llvm.org/viewvc/llvm-project?rev=125937&view=rev Log: llvmlab: Add help links to access phase descriptions. Added: zorg/trunk/llvmlab/llvmlab/ui/templates/phase_description.html Modified: zorg/trunk/llvmlab/llvmlab/ci/config.py zorg/trunk/llvmlab/llvmlab/ui/ci/views.py zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Modified: zorg/trunk/llvmlab/llvmlab/ci/config.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/config.py?rev=125937&r1=125936&r2=125937&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/config.py (original) +++ zorg/trunk/llvmlab/llvmlab/ci/config.py Fri Feb 18 10:45:00 2011 @@ -17,21 +17,23 @@ raise ValueError, "Unknown version" return Phase(data['name'], data['number'], - data['phase_builder'], data['builder_names']) + data['phase_builder'], data['builder_names'], + data['description']) def todata(self): return { 'version' : 0, 'name' : self.name, 'number' : self.number, 'phase_builder' : self.phase_builder, - 'builder_names' : self.builder_names} + 'builder_names' : self.builder_names, + 'description' : self.description} - def __init__(self, name, number, phase_builder, builder_names): + def __init__(self, name, number, phase_builder, builder_names, description): self.name = name self.number = number self.phase_builder = phase_builder self.builder_names = builder_names - + self.description = description class Builder(util.simple_repr_mixin): """ Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/ci/views.py?rev=125937&r1=125936&r2=125937&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/ci/views.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Fri Feb 18 10:45:00 2011 @@ -47,6 +47,18 @@ return render_template("buildbot_monitor.html", bb_status=current_app.config.status) + at ci.route('/phase_description/') +def phase_description(index): + cfg = current_app.config.summary.config + + # Validate the phase. + if index >= len(cfg.phases): + abort(404) + + # Get the phase. + phase = cfg.phases[index] + return render_template("phase_description.html", phase=phase) + @ci.route('/times') @ci.route('/times/') def phase_timing(index=None): Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125937&r1=125936&r2=125937&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:45:00 2011 @@ -1,8 +1,8 @@ {% extends "layout.html" %} -{% macro help_link(key) %} +{% macro help_link(url) %} ? @@ -205,7 +205,9 @@ {% for phase in ci_config.phases %} {% set phase_info = summary[phase.phase_builder] %} - {{ phase.name }}
(Phase {{ phase.number }}) + {{ phase.name }}{{ + help_link(url_for('phase_description', index=loop.index0)) }} +
(Phase {{ phase.number }}) {% endfor %} Added: zorg/trunk/llvmlab/llvmlab/ui/templates/phase_description.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/phase_description.html?rev=125937&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/phase_description.html (added) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/phase_description.html Fri Feb 18 10:45:00 2011 @@ -0,0 +1,5 @@ +{# Fragment template for rendering a phase description. #} + +
+{{ phase.description }} +
From daniel at zuster.org Fri Feb 18 10:45:06 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:45:06 -0000 Subject: [llvm-commits] [zorg] r125939 - in /zorg/trunk/llvmlab/llvmlab/ui: static/style.css templates/dashboard.html Message-ID: <20110218164506.7F2EC2A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:45:06 2011 New Revision: 125939 URL: http://llvm.org/viewvc/llvm-project?rev=125939&view=rev Log: llvmlab: Tweak popups to show up near the mouse, again stealing methods from buildbot. Modified: zorg/trunk/llvmlab/llvmlab/ui/static/style.css zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Modified: zorg/trunk/llvmlab/llvmlab/ui/static/style.css URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/static/style.css?rev=125939&r1=125938&r2=125939&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/static/style.css (original) +++ zorg/trunk/llvmlab/llvmlab/ui/static/style.css Fri Feb 18 10:45:06 2011 @@ -44,6 +44,27 @@ border: 1px solid #AACBE2; } +div.popup { + border-radius: 7px; + -webkit-border-radius: 7px; + -moz-border-radius: 7px; + position: absolute; + background-color: #FFFFFF; + padding: 4px 4px 4px 4px; + float: left; + display: none; + border-width: 1px; + border-style: solid; +} + +div.popup_inner { + border-radius: 3px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + background-color: #F0F3EF; + padding: 4px 4px 4px 4px; +} + /* Dashboard Features */ a.help-link { Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125939&r1=125938&r2=125939&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:45:06 2011 @@ -10,7 +10,7 @@ {% macro help_text(text) %} ? @@ -77,7 +77,7 @@ {% endblock %} {% block javascript %} -function show_content_in_popup(kind, content, event) { +function show_content_in_popup(kind, content) { var popup_holder = document.getElementById(kind + "_popup_holder"); var popup = document.getElementById(kind + "_popup"); @@ -85,15 +85,27 @@ popup_holder.style.display = "block"; } +// Handler for popup close onclick events. function close_popup(kind) { var popup_holder = document.getElementById(kind + "_popup_holder"); var popup = document.getElementById(kind + "_popup"); - popup.innerHTML = ""; popup_holder.style.display = "none"; } +// Handler for help onclick events. +function show_help_popup(text, event) { + // Update the popup location. + update_popup_location("help", event); + + // Update the help txt. + show_content_in_popup("help", text); +} + // Handler for phase onclick events. function show_popup(kind, url, event) { + // Update the popup location. + update_popup_location(kind, event); + // Get the popup elements. var popup = document.getElementById(kind + "_popup"); var popup_frame = document.getElementById(kind + "_popup_frame"); @@ -102,10 +114,36 @@ popup_frame.src = url; } +// Helper for moving popups around. +function update_popup_location(kind, event) { + var popup_holder = document.getElementById(kind + "_popup_holder"); + var popup = document.getElementById(kind + "_popup"); + + // Find the current curson position. + var cx = (window.event ? window.event.clientX : event.pageX); + var cy = (window.event ? window.event.clientY : event.pageY); + + // Offset the popup to not hide the local content. + cx = cx + document.body.scrollLeft + 15; + cy = cy + document.body.scrollTop + 10; + + // Move the div (hidden) under the cursor. + popup_holder.style.left = parseInt(cx) + 'px'; + popup_holder.style.top = parseInt(cy) + 'px'; + + // Close all current the popups. + document.getElementById("help_popup_holder").style.display = "none"; + document.getElementById("phase_popup_holder").style.display = "none"; + document.getElementById("timing_popup_holder").style.display = "none"; +} + // Handler for timing onclick events. function show_timing_popup(url, event) { + // Update the popup location. + update_popup_location("timing", event); + // Get the popup elements. - var popup = document.getElementById("timing_popup"); + var popup_holder = document.getElementById("timing_popup_holder"); var popup_legend = document.getElementById("timing_popup_legend"); // Get the timing data from the server. @@ -142,7 +180,7 @@ graph.draw(); // Show the timing popup. - popup.style.display = "block"; + popup_holder.style.display = "block"; }); } @@ -152,7 +190,7 @@ // Get the frame contents and put it in the popup div. var content = popup_frame.contentWindow.document.body.innerHTML; - show_content_in_popup(kind, content, event); + show_content_in_popup(kind, content); } // On load, set the iframe's onload handler. @@ -314,8 +352,9 @@ {# The div we use to include help popups. #} -
+
{% call close_popup_link("help") %}(close) {% endcall %} +

{# The iframe we use to load the help source. This is never actually @@ -323,17 +362,18 @@ {# The div we use to include phase popups. #} -
+
{% call close_popup_link("phase") %}(close) {% endcall %} -
+

{# The iframe we use to load the phase popup source. This is never actually displayed, just used to load the HTML we insert into the popup div. #} {# The div we use to include timing popups. #} -
- {% call close_popup_link("help") %}(close) {% endcall %} +
+ {% call close_popup_link("timing") %}(close) {% endcall %} +

From daniel at zuster.org Fri Feb 18 10:45:09 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:45:09 -0000 Subject: [llvm-commits] [zorg] r125940 - /zorg/trunk/lnt/lnt/viewer/js/View2D.js Message-ID: <20110218164509.44AB52A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:45:09 2011 New Revision: 125940 URL: http://llvm.org/viewvc/llvm-project?rev=125940&view=rev Log: View2D: Arbitrarily limit the view scale to avoid excessive scaling which freaks the browser out. Modified: zorg/trunk/lnt/lnt/viewer/js/View2D.js Modified: zorg/trunk/lnt/lnt/viewer/js/View2D.js URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/viewer/js/View2D.js?rev=125940&r1=125939&r2=125940&view=diff ============================================================================== --- zorg/trunk/lnt/lnt/viewer/js/View2D.js (original) +++ zorg/trunk/lnt/lnt/viewer/js/View2D.js Fri Feb 18 10:45:09 2011 @@ -282,6 +282,11 @@ var zoom = 1.0 + .03 * factor; this.viewData.location = vec2_mulN(this.viewData.location, zoom); this.viewData.scale = vec2_mulN(this.viewData.scale, zoom); + + // Arbitrary limit min and max scales for now, ideally would be derived + // based on the view contents. + this.viewData.scale = vec2_clampN(this.viewData.scale, 10e-6, 10e6); + this.refresh(); } event.stop(); From respindola at mozilla.com Fri Feb 18 08:41:43 2011 From: respindola at mozilla.com (=?ISO-8859-1?Q?Rafael_=C1vila_de_Esp=EDndola?=) Date: Fri, 18 Feb 2011 09:41:43 -0500 Subject: [llvm-commits] [PATCH] Expose Type::getName() to the C bindings In-Reply-To: <4D5DD0A1.7030800@mozilla.com> References: <4D5DD0A1.7030800@mozilla.com> Message-ID: <4D5E8527.7000608@mozilla.com> On 11-02-17 8:51 PM, Patrick Walton wrote: > Hi everyone, > > Currently, the LLVM C bindings allow names for types to be registered. > However, a consumer can't get those names back out again. This patch > adds an API for it. Patch is OK. Do you need me to commit it? > Thanks, > Patrick Cheers, Rafael From daniel at zuster.org Fri Feb 18 10:41:53 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:41:53 -0000 Subject: [llvm-commits] [zorg] r125884 - /zorg/trunk/llvmlab/llvmlab/ci/status.py Message-ID: <20110218164153.D21762A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:41:53 2011 New Revision: 125884 URL: http://llvm.org/viewvc/llvm-project?rev=125884&view=rev Log: llvmlab: Sketch status object for tracking the overall build status. Added: zorg/trunk/llvmlab/llvmlab/ci/status.py Added: zorg/trunk/llvmlab/llvmlab/ci/status.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/status.py?rev=125884&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/status.py (added) +++ zorg/trunk/llvmlab/llvmlab/ci/status.py Fri Feb 18 10:41:53 2011 @@ -0,0 +1,51 @@ +""" +Status information for the CI infrastructure, for use by the dashboard. +""" + +from llvmlab import util + +class BuildStatus(util.simple_repr_mixin): + @staticmethod + def fromdata(data): + version = data['version'] + if version != 0: + raise ValueError, "Unknown version" + + return BuildStatus(data['name'], data['number'], data['source_stamp'], + data['result'], data['start_time'], data['end_time']) + + def todata(self): + return { 'version' : 0, + 'name' : self.name, + 'number' : self.number, + 'source_stamp' : self.source_stamp, + 'result' : self.result, + 'start_time' : self.start_time, + 'end_time' : self.end_time } + + def __init__(self, name, number, source_stamp, + result, start_time, end_time): + self.name = name + self.number = number + self.source_stamp = source_stamp + self.result = result + self.start_time = start_time + self.end_time = end_time + +class Status(util.simple_repr_mixin): + @staticmethod + def fromdata(data): + version = data['version'] + if version != 0: + raise ValueError, "Unknown version" + + return Status([BuildStatus.fromdata(item) + for item in data['builds']]) + + def todata(self): + return { 'version' : 0, + 'builds' : [item.todata() + for item in self.builds] } + + def __init__(self, builds): + self.builds = builds From daniel at zuster.org Fri Feb 18 10:42:02 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:42:02 -0000 Subject: [llvm-commits] [zorg] r125887 - /zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py Message-ID: <20110218164202.9A27D2A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:42:02 2011 New Revision: 125887 URL: http://llvm.org/viewvc/llvm-project?rev=125887&view=rev Log: llvmlab.ci.buildbot.statusclient: Add support for serialization the client itself and a simple testing tool. Modified: zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py Modified: zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py?rev=125887&r1=125886&r2=125887&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py (original) +++ zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py Fri Feb 18 10:42:02 2011 @@ -10,6 +10,24 @@ Currently, the client primarily is worried about tracking builders. """ + @staticmethod + def fromdata(data): + version = data['version'] + if version != 0: + raise ValueError, "Unknown version" + + sc = StatusClient(data['master_url'], data['builders_poll_rate']) + sc.builders = set(data['builders']) + sc.last_builders_poll = data['last_builders_poll'] + return sc + + def todata(self): + return { 'version' : 0, + 'master_url' : self.master_url, + 'builders_poll_rate' : self.builders_poll_rate, + 'builders' : list(self.builders), + 'last_builders_poll' : self.last_builders_poll} + def __init__(self, master_url, builders_poll_rate = 60.0): self.master_url = master_url @@ -33,8 +51,6 @@ path += '?' + urllib2.urlencode(arguments) url = self.master_url + path - print url - request = urllib2.urlopen(url) data = request.read() request.close() @@ -57,6 +73,7 @@ # Pull the builder names. # # FIXME: BuildBot should provide a more efficient query for this. + yield ('poll_builders',) builders = self.get_json_result(('builders',)) builder_names = set(builders.keys()) @@ -68,10 +85,54 @@ self.builders = builder_names self.last_builders_poll = time.time() +### + +def main(): + import os + import sys + from optparse import OptionParser, OptionGroup + parser = OptionParser("""\ +%%prog [options] + +A simple tool for testing the BuildBot StatusClient. +""") + opts, args = parser.parse_args() + if len(args) != 2: + parser.error("invalid arguments") + + path,master_url = args + + # Load the static client object if it exists. + sc = None + if os.path.exists(path): + file = open(path) + object = json.load(file) + file.close() + + sc = StatusClient.fromdata(object) + + # Check that this instance matches what the user requested. + if (sc.master_url != master_url): + sc = None + + # Create a new client instance if necessary. + if sc is None: + sc = StatusClient(master_url) + + # Now wait for events and print them + try: + while 1: + for event in sc.pull_events(): + print time.time(), event + time.sleep(.1) + except KeyboardInterrupt: + print "(interrupted, stopping)" + + # Save the current instance. + file = open(path, "w") + json.dump(sc.todata(), file) + file.close() + if __name__ == '__main__': - sc = StatusClient("http://lab.llvm.org:8013") - while 1: - for event in sc.pull_events(): - print time.time(), event - time.sleep(.1) + main() From daniel at zuster.org Fri Feb 18 10:41:59 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:41:59 -0000 Subject: [llvm-commits] [zorg] r125886 - in /zorg/trunk/llvmlab/llvmlab/ci/buildbot: ./ __init__.py statusclient.py Message-ID: <20110218164159.A92822A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:41:59 2011 New Revision: 125886 URL: http://llvm.org/viewvc/llvm-project?rev=125886&view=rev Log: llvmlab: Start sketching a buildbot.statusclient module which provides support for event trigger based on buildbot events (via JSON API). Added: zorg/trunk/llvmlab/llvmlab/ci/buildbot/ zorg/trunk/llvmlab/llvmlab/ci/buildbot/__init__.py zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py Added: zorg/trunk/llvmlab/llvmlab/ci/buildbot/__init__.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/buildbot/__init__.py?rev=125886&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/buildbot/__init__.py (added) +++ zorg/trunk/llvmlab/llvmlab/ci/buildbot/__init__.py Fri Feb 18 10:41:59 2011 @@ -0,0 +1,5 @@ +""" +Utilities for working with BuildBot. +""" + +__all__ = [] Added: zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py?rev=125886&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py (added) +++ zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py Fri Feb 18 10:41:59 2011 @@ -0,0 +1,77 @@ +import time +import urllib2 +from flask import json + +class StatusClient(object): + """ + StatusClient object for watching a buildbot master and dispatching signals + on changes. + + Currently, the client primarily is worried about tracking builders. + """ + + def __init__(self, master_url, + builders_poll_rate = 60.0): + self.master_url = master_url + self.builders = set() + + # Normalize the master URL. + if self.master_url.endswith('/'): + self.master_url += '/' + + # Set poll rates (how frequently we are willing to recontact the + # master). + self.builders_poll_rate = float(builders_poll_rate) + + # Set last poll times so we will repoll on startup. + self.last_builders_poll = -1 + + def get_json_result(self, query_items, arguments=None): + path = '/json/' + ','.join(urllib2.quote(item) + for item in query_items) + if arguments is not None: + path += '?' + urllib2.urlencode(arguments) + + url = self.master_url + path + print url + + request = urllib2.urlopen(url) + data = request.read() + request.close() + + obj = json.loads(data) + return obj + + def pull_events(self): + current_time = time.time() + + # Update the builders set, but not all the time (there is no short query + # for this in the buildbot JSON interface). + if current_time - self.last_builders_poll >= self.builders_poll_rate: + for event in self.pull_builders(): + yield event + + yield 1 + + def pull_builders(self): + # Pull the builder names. + # + # FIXME: BuildBot should provide a more efficient query for this. + builders = self.get_json_result(('builders',)) + builder_names = set(builders.keys()) + + for name in builder_names - self.builders: + yield ('added_builder', name) + for name in self.builders - builder_names: + yield ('removed_builder', name) + + self.builders = builder_names + self.last_builders_poll = time.time() + +if __name__ == '__main__': + sc = StatusClient("http://lab.llvm.org:8013") + while 1: + for event in sc.pull_events(): + print time.time(), event + time.sleep(.1) + From daniel at zuster.org Fri Feb 18 10:42:05 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:42:05 -0000 Subject: [llvm-commits] [zorg] r125888 - /zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py Message-ID: <20110218164205.50AB92A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:42:05 2011 New Revision: 125888 URL: http://llvm.org/viewvc/llvm-project?rev=125888&view=rev Log: llvmlab.ci.buildbot.statusclient: Add support for tracking build add/remove events. Modified: zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py Modified: zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py?rev=125888&r1=125887&r2=125888&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py (original) +++ zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py Fri Feb 18 10:42:05 2011 @@ -18,7 +18,10 @@ sc = StatusClient(data['master_url'], data['builders_poll_rate']) sc.builders = set(data['builders']) + sc.builds = dict((name, set(items)) + for name, items in data['builds']) sc.last_builders_poll = data['last_builders_poll'] + sc.last_builder_poll = data['last_builder_poll'] return sc def todata(self): @@ -26,26 +29,34 @@ 'master_url' : self.master_url, 'builders_poll_rate' : self.builders_poll_rate, 'builders' : list(self.builders), - 'last_builders_poll' : self.last_builders_poll} + 'builds' : [(name, list(items)) + for name,items in self.builds.items()], + 'last_builders_poll' : self.last_builders_poll, + 'last_builder_poll' : self.last_builder_poll } def __init__(self, master_url, - builders_poll_rate = 60.0): - self.master_url = master_url - self.builders = set() - + builders_poll_rate = 60.0, + builder_poll_rate = 5.0): # Normalize the master URL. + self.master_url = master_url if self.master_url.endswith('/'): self.master_url += '/' + # Initialize the data we track. + self.builders = set() + self.builds = {} + # Set poll rates (how frequently we are willing to recontact the # master). self.builders_poll_rate = float(builders_poll_rate) + self.builder_poll_rate = float(builder_poll_rate) # Set last poll times so we will repoll on startup. self.last_builders_poll = -1 + self.last_builder_poll = {} def get_json_result(self, query_items, arguments=None): - path = '/json/' + ','.join(urllib2.quote(item) + path = '/json/' + '/'.join(urllib2.quote(item) for item in query_items) if arguments is not None: path += '?' + urllib2.urlencode(arguments) @@ -67,7 +78,31 @@ for event in self.pull_builders(): yield event - yield 1 + # Update the current builds for each known builder. + for builder in self.builders: + last_poll = self.last_builder_poll.get(builder, -1) + if current_time - last_poll >= self.builder_poll_rate: + for event in self.pull_builder(builder): + yield event + + def add_builder(self, name): + yield ('added_builder', name) + self.builders.add(name) + self.last_builder_poll[name] = -1 + self.builds[name] = set() + + def remove_builder(self, name): + yield ('removed_builder', name) + self.builders.remove(name) + self.last_builder_poll.pop(name) + self.builds.pop(name) + + def add_build(self, name, id): + yield ('add_build', name, id) + self.builds[name].add(id) + def remove_build(self, name, id): + yield ('remove_build', name, id) + self.builds[name].remove(id) def pull_builders(self): # Pull the builder names. @@ -78,13 +113,29 @@ builder_names = set(builders.keys()) for name in builder_names - self.builders: - yield ('added_builder', name) + for event in self.add_builder(name): + yield event for name in self.builders - builder_names: - yield ('removed_builder', name) + for event in self.remove_builder(name): + yield event - self.builders = builder_names self.last_builders_poll = time.time() + def pull_builder(self, name): + # Pull the builder data. + yield ('poll_builder', name) + builder = self.get_json_result(('builders', name)) + builds = set(builder['cachedBuilds']) + + for id in builds - self.builds[name]: + for event in self.add_build(name, id): + yield event + for id in self.builds[name] - builds: + for event in self.remove_build(name, id): + yield event + + self.last_builder_poll[name] = time.time() + ### def main(): @@ -124,7 +175,7 @@ while 1: for event in sc.pull_events(): print time.time(), event - time.sleep(.1) + time.sleep(.1) except KeyboardInterrupt: print "(interrupted, stopping)" From daniel at zuster.org Fri Feb 18 10:42:21 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:42:21 -0000 Subject: [llvm-commits] [zorg] r125894 - /zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py Message-ID: <20110218164221.D34842A6C12F@llvm.org> Author: ddunbar Date: Fri Feb 18 10:42:21 2011 New Revision: 125894 URL: http://llvm.org/viewvc/llvm-project?rev=125894&view=rev Log: llvmlab.ci.buildbot.statusclient: Record the builder_poll_rate. Modified: zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py Modified: zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py?rev=125894&r1=125893&r2=125894&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py (original) +++ zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py Fri Feb 18 10:42:21 2011 @@ -16,7 +16,8 @@ if version != 0: raise ValueError, "Unknown version" - sc = StatusClient(data['master_url'], data['builders_poll_rate']) + sc = StatusClient(data['master_url'], data['builders_poll_rate'], + data['builder_poll_rate']) sc.builders = set(data['builders']) sc.builds = dict((name, set(items)) for name, items in data['builds']) @@ -27,6 +28,7 @@ def todata(self): return { 'version' : 0, 'master_url' : self.master_url, + 'builder_poll_rate' : self.builder_poll_rate, 'builders_poll_rate' : self.builders_poll_rate, 'builders' : list(self.builders), 'builds' : [(name, list(items)) From daniel at zuster.org Fri Feb 18 10:42:43 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:42:43 -0000 Subject: [llvm-commits] [zorg] r125901 - /zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py Message-ID: <20110218164243.865912A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:42:43 2011 New Revision: 125901 URL: http://llvm.org/viewvc/llvm-project?rev=125901&view=rev Log: llvmlab.ci.buildbot.statusclient: Factor out a BuilderInfo object. Modified: zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py Modified: zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py?rev=125901&r1=125900&r2=125901&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py (original) +++ zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py Fri Feb 18 10:42:43 2011 @@ -2,6 +2,31 @@ import urllib2 from flask import json +class BuilderInfo(object): + """ + BuilderInfo object for tracking per-builder status information being + monitored. + """ + + @staticmethod + def fromdata(data): + version = data['version'] + if version != 0: + raise ValueError, "Unknown version" + + return BuilderInfo(data['name'], set(data['builds']), data['last_poll']) + + def todata(self): + return { 'version' : 0, + 'name' : self.name, + 'builds' : list(self.builds), + 'last_poll' : self.last_poll } + + def __init__(self, name, builds, last_poll): + self.name = name + self.builds = builds + self.last_poll = last_poll + class StatusClient(object): """ StatusClient object for watching a buildbot master and dispatching signals @@ -18,11 +43,10 @@ sc = StatusClient(data['master_url'], data['builders_poll_rate'], data['builder_poll_rate']) - sc.builders = set(data['builders']) - sc.builds = dict((name, set(items)) - for name, items in data['builds']) + builders = [BuilderInfo.fromdata(b) + for b in data['builders']] + sc.builders = dict((b.name, b) for b in builders) sc.last_builders_poll = data['last_builders_poll'] - sc.last_builder_poll = data['last_builder_poll'] return sc def todata(self): @@ -30,11 +54,9 @@ 'master_url' : self.master_url, 'builder_poll_rate' : self.builder_poll_rate, 'builders_poll_rate' : self.builders_poll_rate, - 'builders' : list(self.builders), - 'builds' : [(name, list(items)) - for name,items in self.builds.items()], - 'last_builders_poll' : self.last_builders_poll, - 'last_builder_poll' : self.last_builder_poll } + 'builders' : [b.todata() + for b in self.builders.values()], + 'last_builders_poll' : self.last_builders_poll } def __init__(self, master_url, builders_poll_rate = 60.0, @@ -45,17 +67,15 @@ self.master_url += '/' # Initialize the data we track. - self.builders = set() - self.builds = {} + self.builders = {} # Set poll rates (how frequently we are willing to recontact the # master). self.builders_poll_rate = float(builders_poll_rate) self.builder_poll_rate = float(builder_poll_rate) - # Set last poll times so we will repoll on startup. + # Set last poll time so we will repoll on startup. self.last_builders_poll = -1 - self.last_builder_poll = {} def get_json_result(self, query_items, arguments=None): path = '/json/' + '/'.join(urllib2.quote(item) @@ -81,62 +101,43 @@ yield event # Update the current builds for each known builder. - for builder in self.builders: - last_poll = self.last_builder_poll.get(builder, -1) - if current_time - last_poll >= self.builder_poll_rate: + for builder in self.builders.values(): + if current_time - builder.last_poll >= self.builder_poll_rate: for event in self.pull_builder(builder): yield event - def add_builder(self, name): - yield ('added_builder', name) - self.builders.add(name) - self.last_builder_poll[name] = -1 - self.builds[name] = set() - - def remove_builder(self, name): - yield ('removed_builder', name) - self.builders.remove(name) - self.last_builder_poll.pop(name) - self.builds.pop(name) - - def add_build(self, name, id): - yield ('add_build', name, id) - self.builds[name].add(id) - def remove_build(self, name, id): - yield ('remove_build', name, id) - self.builds[name].remove(id) - def pull_builders(self): # Pull the builder names. # # FIXME: BuildBot should provide a more efficient query for this. yield ('poll_builders',) - builders = self.get_json_result(('builders',)) - builder_names = set(builders.keys()) - - for name in builder_names - self.builders: - for event in self.add_builder(name): - yield event - for name in self.builders - builder_names: - for event in self.remove_builder(name): - yield event + res = self.get_json_result(('builders',)) + builder_names = set(res.keys()) + current_builders = set(self.builders) + + for name in builder_names - current_builders: + yield ('added_builder', name) + self.builders[name] = BuilderInfo(name, set(), -1) + for name in current_builders - builder_names: + yield ('removed_builder', name) + self.builders.remove(name) self.last_builders_poll = time.time() - def pull_builder(self, name): + def pull_builder(self, builder): # Pull the builder data. - yield ('poll_builder', name) - builder = self.get_json_result(('builders', name)) - builds = set(builder['cachedBuilds']) - - for id in builds - self.builds[name]: - for event in self.add_build(name, id): - yield event - for id in self.builds[name] - builds: - for event in self.remove_build(name, id): - yield event + yield ('poll_builder', builder.name) + res = self.get_json_result(('builders', builder.name)) + builds = set(res['cachedBuilds']) + + for id in builds - builder.builds: + yield ('add_build', builder.name, id) + builder.builds.add(id) + for id in builder.builds - builds: + yield ('remove_build', builder.name, id) + builder.builds.remove(id) - self.last_builder_poll[name] = time.time() + builder.last_poll = time.time() ### From daniel at zuster.org Fri Feb 18 10:42:46 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:42:46 -0000 Subject: [llvm-commits] [zorg] r125902 - /zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py Message-ID: <20110218164246.A18752A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:42:46 2011 New Revision: 125902 URL: http://llvm.org/viewvc/llvm-project?rev=125902&view=rev Log: llvmlab.ci.buildbot.statusclient: Change to only monitoring changes to the last build number, instead of the set of cached builds. Modified: zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py Modified: zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py?rev=125902&r1=125901&r2=125902&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py (original) +++ zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py Fri Feb 18 10:42:46 2011 @@ -14,17 +14,21 @@ if version != 0: raise ValueError, "Unknown version" - return BuilderInfo(data['name'], set(data['builds']), data['last_poll']) + return BuilderInfo(data['name'], data['last_build_number'], + set(data['active_builds']), data['last_poll']) def todata(self): return { 'version' : 0, 'name' : self.name, - 'builds' : list(self.builds), + 'last_build_number' : self.last_build_number, + 'active_builds' : list(self.active_builds), 'last_poll' : self.last_poll } - def __init__(self, name, builds, last_poll): + def __init__(self, name, last_build_number = None, + active_builds = set(), last_poll = -1): self.name = name - self.builds = builds + self.last_build_number = last_build_number + self.active_builds = active_builds self.last_poll = last_poll class StatusClient(object): @@ -110,14 +114,14 @@ # Pull the builder names. # # FIXME: BuildBot should provide a more efficient query for this. - yield ('poll_builders',) + #yield ('poll_builders',) res = self.get_json_result(('builders',)) builder_names = set(res.keys()) current_builders = set(self.builders) for name in builder_names - current_builders: yield ('added_builder', name) - self.builders[name] = BuilderInfo(name, set(), -1) + self.builders[name] = BuilderInfo(name) for name in current_builders - builder_names: yield ('removed_builder', name) self.builders.remove(name) @@ -126,16 +130,45 @@ def pull_builder(self, builder): # Pull the builder data. - yield ('poll_builder', builder.name) - res = self.get_json_result(('builders', builder.name)) - builds = set(res['cachedBuilds']) + #yield ('poll_builder', builder.name) - for id in builds - builder.builds: + # Get the latest build number. + res = self.get_json_result(('builders', builder.name, 'builds', '-1')) + number = res['number'] + + # Check if we need to start or reset the state. + if (builder.last_build_number is None or + number < builder.last_build_number): + # Send a reset event. + yield ('reset_builder', builder.name) + builder.last_build_number = number - 1 + + # Add any potentially active builds. + for id in range(builder.last_build_number + 1, number + 1): yield ('add_build', builder.name, id) - builder.builds.add(id) - for id in builder.builds - builds: - yield ('remove_build', builder.name, id) - builder.builds.remove(id) + builder.active_builds.add(id) + + # Update the latest build number. + builder.last_build_number = number + + # Analyze the active builds. + builds = list(builder.active_builds) + builds.sort() + for id in builds: + res = self.get_json_result(('builders', builder.name, 'builds', + str(id))) + times = res.get('times') + + # In rare circumstances, we could have accessed an invalid build, + # check for this. + if times is None or len(times) != 2: + yield ('invalid_build', builder.name, id) + builder.active_builds.remove(id) + + # Otherwise, just check to see if the build is done. + if times[1] is not None: + yield ('completed_build', builder.name, id) + builder.active_builds.remove(id) builder.last_poll = time.time() From daniel at zuster.org Fri Feb 18 10:42:53 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:42:53 -0000 Subject: [llvm-commits] [zorg] r125904 - in /zorg/trunk/llvmlab/llvmlab: ci/status.py llvmlabtool/lab.cfg.sample llvmlabtool/main.py ui/app.py Message-ID: <20110218164253.582332A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:42:53 2011 New Revision: 125904 URL: http://llvm.org/viewvc/llvm-project?rev=125904&view=rev Log: llvmlab: Add a status object to the application & config, for persisting the sync'ed buildbot status. Modified: zorg/trunk/llvmlab/llvmlab/ci/status.py zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py zorg/trunk/llvmlab/llvmlab/ui/app.py Modified: zorg/trunk/llvmlab/llvmlab/ci/status.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/status.py?rev=125904&r1=125903&r2=125904&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/status.py (original) +++ zorg/trunk/llvmlab/llvmlab/ci/status.py Fri Feb 18 10:42:53 2011 @@ -39,13 +39,15 @@ if version != 0: raise ValueError, "Unknown version" - return Status([BuildStatus.fromdata(item) - for item in data['builds']]) + return Status(dict((name, [BuildStatus.fromdata(b) + for b in builds]) + for name,builds in data['builders'])) def todata(self): return { 'version' : 0, - 'builds' : [item.todata() - for item in self.builds] } + 'builders' : [(name, [b.todata() + for b in builds]) + for name,builds in self.builders.items()] } - def __init__(self, builds): - self.builds = builds + def __init__(self, builders): + self.builders = builders Modified: zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample?rev=125904&r1=125903&r2=125904&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample (original) +++ zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample Fri Feb 18 10:42:53 2011 @@ -18,3 +18,6 @@ # Path to the managed data file. DATA_PATH = %(data_path)r + +# Path to the buildbot status file. +STATUS_PATH = %(status_path)r Modified: zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py?rev=125904&r1=125903&r2=125904&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py (original) +++ zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py Fri Feb 18 10:42:53 2011 @@ -9,6 +9,7 @@ import flask import llvmlab.data import llvmlab.user +import llvmlab.ci.status import llvmlab.ui.app def note(message): @@ -64,6 +65,7 @@ basepath = os.path.abspath(basepath) cfg_path = os.path.join(basepath, 'lab.cfg') data_path = os.path.join(basepath, 'lab-data.json') + status_path = os.path.join(basepath, 'lab-status.json') if not os.path.exists(basepath): try: @@ -78,6 +80,8 @@ parser.error("%r exists (use --force to override)" % cfg_path) if os.path.exists(data_path): parser.error("%r exists (use --force to override)" % data_path) + if os.path.exists(status_path): + parser.error("%r exists (use --force to override)" % status_path) # Construct the config file. sample_cfg_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), @@ -93,21 +97,24 @@ opts.admin_password + secret_key).hexdigest() cfg_options['secret_key'] = secret_key cfg_options['data_path'] = data_path + cfg_options['status_path'] = status_path cfg_data = sample_cfg_data % cfg_options # Write the initial config file. cfg_file = open(cfg_path, 'w') cfg_file.write(cfg_data) cfg_file.close() - - # Create the inital data file. - data = llvmlab.data.Data(users = []) - - # Write the initial (empty) data file. - data_file = open(data_path, 'w') - flask.json.dump(data.todata(), data_file, indent=2) - print >>data_file - data_file.close() + + # Construct the initial database and status files. + data = llvmlab.data.Data(users = [], machines = []) + status = llvmlab.ci.status.Status({}) + + # Construct an app instance, and save the data. + instance = llvmlab.ui.app.App.create_standalone(data = data, + status = status, + config_path = cfg_path) + instance.save_data() + instance.save_status() def action_runserver(name, args): """run a llvmlab instance""" Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125904&r1=125903&r2=125904&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:42:53 2011 @@ -5,15 +5,16 @@ import llvmlab.data import llvmlab.user +import llvmlab.ci.status from llvmlab.ui.ci.views import ci as ci_views from llvmlab.ui.frontend.views import frontend as frontend_views class App(flask.Flask): @staticmethod - def create_standalone(config = None, data = None, config_path = None): + def create_standalone(config = None, data = None, status = None, + config_path = None): if config_path is not None: assert config is None - assert data is None # Construct the application. app = App(__name__) @@ -24,6 +25,9 @@ # Load the database. app.load_data(data) + # Load the buildbot status. + app.load_status(status) + # Load the application routes. app.register_module(ci_views) app.register_module(frontend_views) @@ -45,12 +49,16 @@ "ADMIN_EMAIL" : "admin at example.com", "DEBUG" : True, "SECRET_KEY" : secret_key, - "DATA_PATH" : None } + "DATA_PATH" : None, + "STATUS_PATH" : None } # Construct an empty test database. - data = llvmlab.data.Data(users = []) + data = llvmlab.data.Data(users = [], machines = []) + + # Construct an empty status file. + data = llvmlab.ci.status.Status({}) - return App.create_standalone(config, data) + return App.create_standalone(config, data, status) def __init__(self, name): super(App, self).__init__(name) @@ -97,6 +105,24 @@ print >>file file.close() + def load_status(self, status = None): + if status is None: + data_path = self.config["STATUS_PATH"] + data_file = open(data_path, "rb") + data_object = flask.json.load(data_file) + data_file.close() + + # Create the internal Status object. + status = llvmlab.ci.status.Status.fromdata(data_object) + + self.config.status = status + + def save_status(self): + file = open(self.config["STATUS_PATH"], 'w') + flask.json.dump(self.config.status.todata(), file, indent=2) + print >>file + file.close() + def authenticate_login(self, username, password): passhash = hashlib.sha256( password + self.config["SECRET_KEY"]).hexdigest() From daniel at zuster.org Fri Feb 18 10:42:56 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:42:56 -0000 Subject: [llvm-commits] [zorg] r125905 - in /zorg/trunk/llvmlab/llvmlab: ci/status.py llvmlabtool/main.py ui/app.py Message-ID: <20110218164257.11E932A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:42:56 2011 New Revision: 125905 URL: http://llvm.org/viewvc/llvm-project?rev=125905&view=rev Log: llvmlab: Add a master URL parameter to the status object. Modified: zorg/trunk/llvmlab/llvmlab/ci/status.py zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py zorg/trunk/llvmlab/llvmlab/ui/app.py Modified: zorg/trunk/llvmlab/llvmlab/ci/status.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/status.py?rev=125905&r1=125904&r2=125905&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/status.py (original) +++ zorg/trunk/llvmlab/llvmlab/ci/status.py Fri Feb 18 10:42:56 2011 @@ -3,6 +3,7 @@ """ from llvmlab import util +import buildbot.statusclient class BuildStatus(util.simple_repr_mixin): @staticmethod @@ -39,15 +40,26 @@ if version != 0: raise ValueError, "Unknown version" - return Status(dict((name, [BuildStatus.fromdata(b) + sc = data.get('statusclient') + if sc: + sc = buildbot.statusclient.StatusClient.fromdata(sc) + return Status(data['master_url'], + dict((name, [BuildStatus.fromdata(b) for b in builds]) - for name,builds in data['builders'])) + for name,builds in data['builders']), + sc) def todata(self): return { 'version' : 0, + 'master_url' : self.master_url, 'builders' : [(name, [b.todata() for b in builds]) - for name,builds in self.builders.items()] } + for name,builds in self.builders.items()], + 'statusclient' : self.statusclient.todata() } - def __init__(self, builders): + def __init__(self, master_url, builders, statusclient = None): + self.master_url = master_url self.builders = builders + if statusclient is None and master_url: + statusclient = buildbot.statusclient.StatusClient(master_url) + self.statusclient = statusclient Modified: zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py?rev=125905&r1=125904&r2=125905&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py (original) +++ zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py Fri Feb 18 10:42:56 2011 @@ -50,6 +50,9 @@ group.add_option("", "--admin-email", dest="admin_email", help="administrator email [%default]", default='admin at example.com') + group.add_option("", "--master-url", dest="master_url", + help="URL for the buildbot master [%default]", + default='http://lab.llvm.org:8013') group.add_option("", "--debug-server", dest="debug_server", help="run server in debug mode [%default]", @@ -107,7 +110,7 @@ # Construct the initial database and status files. data = llvmlab.data.Data(users = [], machines = []) - status = llvmlab.ci.status.Status({}) + status = llvmlab.ci.status.Status(opts.master_url, {}) # Construct an app instance, and save the data. instance = llvmlab.ui.app.App.create_standalone(data = data, Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125905&r1=125904&r2=125905&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:42:56 2011 @@ -56,7 +56,7 @@ data = llvmlab.data.Data(users = [], machines = []) # Construct an empty status file. - data = llvmlab.ci.status.Status({}) + data = llvmlab.ci.status.Status(None, {}) return App.create_standalone(config, data, status) From daniel at zuster.org Fri Feb 18 10:43:03 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:43:03 -0000 Subject: [llvm-commits] [zorg] r125907 - in /zorg/trunk/llvmlab/llvmlab: ci/status.py ui/app.py Message-ID: <20110218164303.E3CDE2A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:43:03 2011 New Revision: 125907 URL: http://llvm.org/viewvc/llvm-project?rev=125907&view=rev Log: llvmlab: Checkpoint the status information frequently, for now. Modified: zorg/trunk/llvmlab/llvmlab/ci/status.py zorg/trunk/llvmlab/llvmlab/ui/app.py Modified: zorg/trunk/llvmlab/llvmlab/ci/status.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/status.py?rev=125907&r1=125906&r2=125907&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/status.py (original) +++ zorg/trunk/llvmlab/llvmlab/ci/status.py Fri Feb 18 10:43:03 2011 @@ -37,8 +37,9 @@ self.end_time = end_time class StatusMonitor(threading.Thread): - def __init__(self, status): + def __init__(self, app, status): threading.Thread.__init__(self) + self.app = app self.status = status def run(self): @@ -93,6 +94,10 @@ # FIXME: Use flask logging APIs. print >>sys.stderr,"warning: unknown event '%r'" % (event,) + # FIXME: Don't save this frequently, we really just want to + # checkpoint and make sure we save on restart. + self.app.save_status() + time.sleep(.1) class Status(util.simple_repr_mixin): @@ -132,8 +137,8 @@ for b in builds)) for name,builds in self.builders.items()) - def start_monitor(self): + def start_monitor(self, app): if self.statusclient: - monitor = StatusMonitor(self) + monitor = StatusMonitor(app, self) monitor.start() return monitor Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125907&r1=125906&r2=125907&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:43:03 2011 @@ -33,7 +33,7 @@ app.register_module(frontend_views) # Spawn the status monitor thread. - app.monitor = app.config.status.start_monitor() + app.monitor = app.config.status.start_monitor(app) return app From daniel at zuster.org Fri Feb 18 10:43:00 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:43:00 -0000 Subject: [llvm-commits] [zorg] r125906 - in /zorg/trunk/llvmlab/llvmlab: ci/status.py ui/app.py ui/ci/views.py ui/templates/buildbot_monitor.html Message-ID: <20110218164300.E580B2A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:43:00 2011 New Revision: 125906 URL: http://llvm.org/viewvc/llvm-project?rev=125906&view=rev Log: llvmlab: Start sketching code to actively monitor a buildbot instance from the web app and add a simple monitor page for debugging. Added: zorg/trunk/llvmlab/llvmlab/ui/templates/buildbot_monitor.html Modified: zorg/trunk/llvmlab/llvmlab/ci/status.py zorg/trunk/llvmlab/llvmlab/ui/app.py zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Modified: zorg/trunk/llvmlab/llvmlab/ci/status.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/status.py?rev=125906&r1=125905&r2=125906&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/status.py (original) +++ zorg/trunk/llvmlab/llvmlab/ci/status.py Fri Feb 18 10:43:00 2011 @@ -2,6 +2,9 @@ Status information for the CI infrastructure, for use by the dashboard. """ +import threading +import time + from llvmlab import util import buildbot.statusclient @@ -33,6 +36,65 @@ self.start_time = start_time self.end_time = end_time +class StatusMonitor(threading.Thread): + def __init__(self, status): + threading.Thread.__init__(self) + self.status = status + + def run(self): + # Constantly read events from the status client. + while 1: + for event in self.status.statusclient.pull_events(): + # Log the event (for debugging). + self.status.event_log.append((time.time(), event)) + self.status.event_log = self.status.event_log[-100:] + + kind = event[0] + if kind == 'added_builder': + name = event[1] + if name not in self.status.builders: + self.status.builders[name] = [] + self.status.build_map[name] = {} + elif kind == 'removed_builder': + name = event[1] + self.status.builders.pop(name) + self.status.build_map.pop(name) + elif kind == 'reset_builder': + name = event[1] + self.status.builders[name] = [] + self.status.build_map[name] = {} + elif kind == 'invalid_build': + _,name,id = event + build = self.status.build_map[name].get(id) + if build is not None: + self.status.builders[name].remove(build) + self.status.build_map[name].pop(id) + elif kind in ('add_build', 'completed_build'): + _,name,id = event + build = self.status.build_map[name].get(id) + if build is None: + build = BuildStatus(name, id, None, None, None, None) + self.status.build_map[name][id] = build + + # Add to the builds list, maintaining order. + builds = self.status.builders[name] + builds.append(build) + if len(builds)>1 and build.number < builds[-2].number: + builds.sort(key = lambda b: b.number) + + # Get the build information. + res = self.status.statusclient.get_json_result(( + 'builders', name, 'builds', str(build.number))) + build.result = res['results'] + build.source_stamp = res['sourceStamp']['revision'] + build.start_time = res['times'][0] + build.end_time = res['times'][1] + else: + # FIXME: Use flask logging APIs. + print >>sys.stderr,"warning: unknown event '%r'" % (event,) + + time.sleep(.1) + class Status(util.simple_repr_mixin): @staticmethod def fromdata(data): @@ -63,3 +125,15 @@ if statusclient is None and master_url: statusclient = buildbot.statusclient.StatusClient(master_url) self.statusclient = statusclient + + # Transient data. + self.event_log = [] + self.build_map = dict((name, dict((b.number, b) + for b in builds)) + for name,builds in self.builders.items()) + + def start_monitor(self): + if self.statusclient: + monitor = StatusMonitor(self) + monitor.start() + return monitor Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125906&r1=125905&r2=125906&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:43:00 2011 @@ -32,6 +32,9 @@ app.register_module(ci_views) app.register_module(frontend_views) + # Spawn the status monitor thread. + app.monitor = app.config.status.start_monitor() + return app @staticmethod @@ -62,6 +65,7 @@ def __init__(self, name): super(App, self).__init__(name) + self.monitor = None def load_config(self, config = None, config_path = None): if config_path is not None: Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/ci/views.py?rev=125906&r1=125905&r2=125906&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/ci/views.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Fri Feb 18 10:43:00 2011 @@ -80,3 +80,7 @@ def dashboard(): return render_template("dashboard.html", ci_config=g_config) + at ci.route('/monitor') +def buildbot_monitor(): + return render_template("buildbot_monitor.html", + bb_status=current_app.config.status) Added: zorg/trunk/llvmlab/llvmlab/ui/templates/buildbot_monitor.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/buildbot_monitor.html?rev=125906&view=auto ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/buildbot_monitor.html (added) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/buildbot_monitor.html Fri Feb 18 10:43:00 2011 @@ -0,0 +1,50 @@ +{% extends "layout.html" %} +{% block title %}buildbot monitor{% endblock %} +{% block body %} + +
Buildbot Status Monitor
+ +Monitoring: {{ bb_status.master_url }} + +{% for name,builds in bb_status.builders|dictsort %} + +
{{ name }}
+ + + + + + + + + + + +{% for build in builds %} + + + + + + + +{% endfor %} +
Number Source Stamp Result Start Time End Time
{{ build.number }} {{ build.source_stamp }} {{ build.result }} {{ build.start_time }} {{ build.end_time }}
+ +{% endfor %} + +
Event Log
+ + + + + +{% for time,event in bb_status.event_log|reverse %} + + + + +{% endfor %} +
Time Event
{{ time }} {{ event }}
+ +{% endblock %} From daniel at zuster.org Fri Feb 18 10:43:29 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:43:29 -0000 Subject: [llvm-commits] [zorg] r125914 - in /zorg/trunk/llvmlab/llvmlab/ci: buildbot/statusclient.py status.py Message-ID: <20110218164329.138A32A6C12E@llvm.org> Author: ddunbar Date: Fri Feb 18 10:43:28 2011 New Revision: 125914 URL: http://llvm.org/viewvc/llvm-project?rev=125914&view=rev Log: llvmlab: Don't crash on network outages. Modified: zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py zorg/trunk/llvmlab/llvmlab/ci/status.py Modified: zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py?rev=125914&r1=125913&r2=125914&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py (original) +++ zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py Fri Feb 18 10:43:28 2011 @@ -88,7 +88,13 @@ path += '?' + urllib2.urlencode(arguments) url = self.master_url + path - request = urllib2.urlopen(url) + try: + request = urllib2.urlopen(url) + except: + # FIXME: Logging. + import traceback + traceback.print_exc() + return None data = request.read() request.close() @@ -116,6 +122,9 @@ # FIXME: BuildBot should provide a more efficient query for this. #yield ('poll_builders',) res = self.get_json_result(('builders',)) + if not res: + return + builder_names = set(res.keys()) current_builders = set(self.builders) @@ -134,6 +143,8 @@ # Get the latest build number. res = self.get_json_result(('builders', builder.name, 'builds', '-1')) + if not res: + return number = res['number'] # Check if we need to start or reset the state. @@ -157,6 +168,8 @@ for id in builds: res = self.get_json_result(('builders', builder.name, 'builds', str(id))) + if not res: + continue times = res.get('times') # In rare circumstances, we could have accessed an invalid build, Modified: zorg/trunk/llvmlab/llvmlab/ci/status.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/status.py?rev=125914&r1=125913&r2=125914&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/status.py (original) +++ zorg/trunk/llvmlab/llvmlab/ci/status.py Fri Feb 18 10:43:28 2011 @@ -86,10 +86,11 @@ # Get the build information. res = self.status.statusclient.get_json_result(( 'builders', name, 'builds', str(build.number))) - build.result = res['results'] - build.source_stamp = res['sourceStamp']['revision'] - build.start_time = res['times'][0] - build.end_time = res['times'][1] + if res: + build.result = res['results'] + build.source_stamp = res['sourceStamp']['revision'] + build.start_time = res['times'][0] + build.end_time = res['times'][1] else: # FIXME: Use flask logging APIs. print >>sys.stderr,"warning: unknown event '%r'" % (event,) From daniel at zuster.org Fri Feb 18 10:43:34 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:43:34 -0000 Subject: [llvm-commits] [zorg] r125916 - /zorg/trunk/llvmlab/llvmlab/ci/status.py Message-ID: <20110218164334.18FE32A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:43:33 2011 New Revision: 125916 URL: http://llvm.org/viewvc/llvm-project?rev=125916&view=rev Log: llvmlab: Tweak status tracking to not make the build visible until it's data has been populated. Modified: zorg/trunk/llvmlab/llvmlab/ci/status.py Modified: zorg/trunk/llvmlab/llvmlab/ci/status.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/status.py?rev=125916&r1=125915&r2=125916&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/status.py (original) +++ zorg/trunk/llvmlab/llvmlab/ci/status.py Fri Feb 18 10:43:33 2011 @@ -73,15 +73,10 @@ elif kind in ('add_build', 'completed_build'): _,name,id = event build = self.status.build_map[name].get(id) + add_build = False if build is None: + add_build = True build = BuildStatus(name, id, None, None, None, None) - self.status.build_map[name][id] = build - - # Add to the builds list, maintaining order. - builds = self.status.builders[name] - builds.append(build) - if len(builds)>1 and build.number < builds[-2].number: - builds.sort(key = lambda b: b.number) # Get the build information. res = self.status.statusclient.get_json_result(( @@ -91,6 +86,15 @@ build.source_stamp = res['sourceStamp']['revision'] build.start_time = res['times'][0] build.end_time = res['times'][1] + + if add_build: + # Add to the builds list, maintaining order. + self.status.build_map[name][id] = build + builds = self.status.builders[name] + builds.append(build) + if (len(builds) > 1 and + build.number < builds[-2].number): + builds.sort(key = lambda b: b.number) else: # FIXME: Use flask logging APIs. print >>sys.stderr,"warning: unknown event '%r'" % (event,) From daniel at zuster.org Fri Feb 18 10:43:37 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:43:37 -0000 Subject: [llvm-commits] [zorg] r125917 - in /zorg/trunk/llvmlab/llvmlab: ci/status.py llvmlabtool/lab.cfg.sample llvmlabtool/main.py ui/app.py Message-ID: <20110218164337.BC41D2A6C12E@llvm.org> Author: ddunbar Date: Fri Feb 18 10:43:37 2011 New Revision: 125917 URL: http://llvm.org/viewvc/llvm-project?rev=125917&view=rev Log: llvmlab: Enable file/mail error logging. Modified: zorg/trunk/llvmlab/llvmlab/ci/status.py zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py zorg/trunk/llvmlab/llvmlab/ui/app.py Modified: zorg/trunk/llvmlab/llvmlab/ci/status.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/status.py?rev=125917&r1=125916&r2=125917&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/status.py (original) +++ zorg/trunk/llvmlab/llvmlab/ci/status.py Fri Feb 18 10:43:37 2011 @@ -96,8 +96,7 @@ build.number < builds[-2].number): builds.sort(key = lambda b: b.number) else: - # FIXME: Use flask logging APIs. - print >>sys.stderr,"warning: unknown event '%r'" % (event,) + self.app.logger.warning("unknown event '%r'" % (event,)) # FIXME: Don't save this frequently, we really just want to # checkpoint and make sure we save on restart. Modified: zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample?rev=125917&r1=125916&r2=125917&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample (original) +++ zorg/trunk/llvmlab/llvmlab/llvmlabtool/lab.cfg.sample Fri Feb 18 10:43:37 2011 @@ -13,6 +13,10 @@ # Should server run in debug mode? DEBUG = %(debug_server)r +# Email configuration. +EMAIL_RELAY_SERVER = 'localhost' +MAIL_ERRORS = True + # Secret key for this server instance. SECRET_KEY = %(secret_key)r @@ -21,3 +25,6 @@ # Path to the buildbot status file. STATUS_PATH = %(status_path)r + +# Path to the error log. +ERROR_LOG_PATH = %(error_log_path)r Modified: zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py?rev=125917&r1=125916&r2=125917&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py (original) +++ zorg/trunk/llvmlab/llvmlab/llvmlabtool/main.py Fri Feb 18 10:43:37 2011 @@ -69,6 +69,7 @@ cfg_path = os.path.join(basepath, 'lab.cfg') data_path = os.path.join(basepath, 'lab-data.json') status_path = os.path.join(basepath, 'lab-status.json') + error_log_path = os.path.join(basepath, 'error.log') if not os.path.exists(basepath): try: @@ -101,6 +102,7 @@ cfg_options['secret_key'] = secret_key cfg_options['data_path'] = data_path cfg_options['status_path'] = status_path + cfg_options['error_log_path'] = error_log_path cfg_data = sample_cfg_data % cfg_options # Write the initial config file. Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125917&r1=125916&r2=125917&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/app.py (original) +++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:43:37 2011 @@ -1,4 +1,6 @@ import hashlib +import logging +import logging.handlers import os import flask @@ -23,6 +25,19 @@ # Load the application configuration. app.load_config(config, config_path) + # Configure error logging. + handler = logging.FileHandler(app.config['ERROR_LOG_PATH']) + handler.setLevel(logging.WARNING) + app.logger.addHandler(handler) + + # Configure error emails, if requested. + if app.config['MAIL_ERRORS']: + handler = logging.handlers.SMTPHandler( + app.config['EMAIL_RELAY_SERVER'], app.config['ADMIN_EMAIL'], + app.config['ADMIN_EMAIL'], 'LLVM Lab Failure') + handler.setLevel(logging.ERROR) + app.logger.addHandler(handler) + # Load the database. app.load_data(data) @@ -56,6 +71,8 @@ "ADMIN_NAME" : "Administrator", "ADMIN_EMAIL" : "admin at example.com", "DEBUG" : True, + "EMAIL_RELAY_SERVER" : "localhost", + "MAIL_ERRORS" : False, "SECRET_KEY" : secret_key, "DATA_PATH" : None, "STATUS_PATH" : None } From daniel at zuster.org Fri Feb 18 10:44:13 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:44:13 -0000 Subject: [llvm-commits] [zorg] r125927 - in /zorg/trunk/llvmlab/llvmlab/ci: buildbot/statusclient.py status.py Message-ID: <20110218164413.BB4272A6C12D@llvm.org> Author: ddunbar Date: Fri Feb 18 10:44:13 2011 New Revision: 125927 URL: http://llvm.org/viewvc/llvm-project?rev=125927&view=rev Log: llvmlab: Fix some buildbot monitoring bugs exposed by builder renames. Modified: zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py zorg/trunk/llvmlab/llvmlab/ci/status.py Modified: zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py?rev=125927&r1=125926&r2=125927&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py (original) +++ zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py Fri Feb 18 10:44:13 2011 @@ -133,7 +133,7 @@ self.builders[name] = BuilderInfo(name) for name in current_builders - builder_names: yield ('removed_builder', name) - self.builders.remove(name) + self.builders.pop(name) self.last_builders_poll = time.time() Modified: zorg/trunk/llvmlab/llvmlab/ci/status.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/status.py?rev=125927&r1=125926&r2=125927&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/status.py (original) +++ zorg/trunk/llvmlab/llvmlab/ci/status.py Fri Feb 18 10:44:13 2011 @@ -58,8 +58,9 @@ self.status.build_map[name] = {} elif kind == 'removed_builder': name = event[1] - self.status.builders.pop(name) - self.status.build_map.pop(name) + if name in self.status.builders: + self.status.builders.pop(name) + self.status.build_map.pop(name) elif kind == 'reset_builder': name = event[1] self.status.builders[name] = [] From daniel at zuster.org Fri Feb 18 10:44:17 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:44:17 -0000 Subject: [llvm-commits] [zorg] r125928 - in /zorg/trunk/llvmlab/llvmlab/ci: buildbot/statusclient.py status.py Message-ID: <20110218164417.537332A6C12C@llvm.org> Author: ddunbar Date: Fri Feb 18 10:44:17 2011 New Revision: 125928 URL: http://llvm.org/viewvc/llvm-project?rev=125928&view=rev Log: llvmlab.ci.buildbot.statusclient: Attempt to improve robustness in the face of (a) network flukyness, (b) buildbot reconfiguration corner cases (i.e., empty builders). Modified: zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py zorg/trunk/llvmlab/llvmlab/ci/status.py Modified: zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py?rev=125928&r1=125927&r2=125928&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py (original) +++ zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py Fri Feb 18 10:44:17 2011 @@ -1,7 +1,21 @@ import time +import traceback import urllib2 +import StringIO from flask import json +### + +# Custom Exception Classes +# +# We generally only care about either proper 404 results or "other" failures. +class ResultMissing(Exception): + pass +class UnknownFailure(Exception): + pass + +### + class BuilderInfo(object): """ BuilderInfo object for tracking per-builder status information being @@ -81,6 +95,9 @@ # Set last poll time so we will repoll on startup. self.last_builders_poll = -1 + # Option logger object. + self.logger = None + def get_json_result(self, query_items, arguments=None): path = '/json/' + '/'.join(urllib2.quote(item) for item in query_items) @@ -90,11 +107,23 @@ url = self.master_url + path try: request = urllib2.urlopen(url) - except: - # FIXME: Logging. - import traceback - traceback.print_exc() - return None + except urllib2.HTTPError, err: + # Turn 404 into a result missing error. + if err.code == 404: + raise ResultMissing + + # Log this failure. + os = StringIO.StringIO() + print >>os, "*** ERROR: failure in 'get_json_result(%r, %r)' ***" %( + query_items, arguments) + print >>os, "URL: %r" % url + print >>os, "\n-- Traceback --" + traceback.print_exc(file = os) + if self.logger: + self.logger.warning(os.getvalue()) + else: + print >>sys.stderr, os.getvalue() + raise UnknownFailure data = request.read() request.close() @@ -121,8 +150,16 @@ # # FIXME: BuildBot should provide a more efficient query for this. #yield ('poll_builders',) - res = self.get_json_result(('builders',)) - if not res: + try: + res = self.get_json_result(('builders',)) + except ResultMissing: + # This should never happen, but don't crash if it does. + return + except UnknownFailure: + # Presumably a transient network issue, just wait a while and retry. + # + # FIXME: Evaluate decay algorithm. + self.last_builders_poll = time.time() + 60. return builder_names = set(res.keys()) @@ -138,26 +175,43 @@ self.last_builders_poll = time.time() def pull_builder(self, builder): - # Pull the builder data. - #yield ('poll_builder', builder.name) - # Get the latest build number. - res = self.get_json_result(('builders', builder.name, 'builds', '-1')) - if not res: + try: + res = self.get_json_result(('builders', builder.name, 'builds', + '-1')) + number = res['number'] + except ResultMissing: + # If the server returned 404, then either we gave a bogus builder + # name (which is bad), or there are no builds yet. + # + # We assume that bogus builder's will be figured out elsewhere, so + # just assume there are no builds. + builder.last_poll = time.time() + number = None + except UnknownFailure: + # Presumably a transient network issue, just wait a while and retry. + # + # FIXME: Evaluate decay algorithm. + builder.last_poll = time.time() + 60. return - number = res['number'] - # Check if we need to start or reset the state. - if (builder.last_build_number is None or - number < builder.last_build_number): - # Send a reset event. - yield ('reset_builder', builder.name) - builder.last_build_number = number - 1 - - # Add any potentially active builds. - for id in range(builder.last_build_number + 1, number + 1): - yield ('add_build', builder.name, id) - builder.active_builds.add(id) + # Check if we don't have any builds. + if number is None: + # Check if we need to start or reset the state. + if builder.last_build_number is not None: + yield ('reset_builder', builder.name) + else: + # Check if we need to start or reset the state. + if (builder.last_build_number is None or + number < builder.last_build_number): + # Send a reset event. + yield ('reset_builder', builder.name) + builder.last_build_number = number - 1 + + # Add any potentially active builds. + for id in range(builder.last_build_number + 1, number + 1): + yield ('add_build', builder.name, id) + builder.active_builds.add(id) # Update the latest build number. builder.last_build_number = number @@ -166,10 +220,22 @@ builds = list(builder.active_builds) builds.sort() for id in builds: - res = self.get_json_result(('builders', builder.name, 'builds', - str(id))) - if not res: - continue + # Get the result for this build. + try: + res = self.get_json_result(('builders', builder.name, 'builds', + str(id))) + except ResultMissing: + # This probably shouldn't ever happen, but if it does then trust + # the response. + res = {} + except UnknownFailure: + # Presumably a transient network issue, just wait a while and + # retry. + # + # FIXME: Evaluate decay algorithm. + builder.last_poll = time.time() + 60. + return + times = res.get('times') # In rare circumstances, we could have accessed an invalid build, Modified: zorg/trunk/llvmlab/llvmlab/ci/status.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/status.py?rev=125928&r1=125927&r2=125928&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/status.py (original) +++ zorg/trunk/llvmlab/llvmlab/ci/status.py Fri Feb 18 10:44:17 2011 @@ -80,8 +80,12 @@ build = BuildStatus(name, id, None, None, None, None) # Get the build information. - res = self.status.statusclient.get_json_result(( - 'builders', name, 'builds', str(build.number))) + try: + res = self.status.statusclient.get_json_result(( + 'builders', name, 'builds', str(build.number))) + except: + res = None + if res: build.result = res['results'] build.source_stamp = res['sourceStamp']['revision'] @@ -144,6 +148,8 @@ def start_monitor(self, app): if self.statusclient: + self.statusclient.logger = app.logger + monitor = StatusMonitor(app, self) monitor.start() return monitor From daniel at zuster.org Fri Feb 18 10:45:12 2011 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 18 Feb 2011 16:45:12 -0000 Subject: [llvm-commits] [zorg] r125941 - in /zorg/trunk/llvmlab/llvmlab: ci/buildbot/statusclient.py ui/templates/dashboard.html Message-ID: <20110218164513.280B02A6C12E@llvm.org> Author: ddunbar Date: Fri Feb 18 10:45:12 2011 New Revision: 125941 URL: http://llvm.org/viewvc/llvm-project?rev=125941&view=rev Log: llvmlab.ci.buildbot.statusclient: Fix a possible crash accessing invalid builders. Modified: zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Modified: zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py?rev=125941&r1=125940&r2=125941&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py (original) +++ zorg/trunk/llvmlab/llvmlab/ci/buildbot/statusclient.py Fri Feb 18 10:45:12 2011 @@ -243,6 +243,7 @@ if times is None or len(times) != 2: yield ('invalid_build', builder.name, id) builder.active_builds.remove(id) + continue # Otherwise, just check to see if the build is done. if times[1] is not None: Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125941&r1=125940&r2=125941&view=diff ============================================================================== --- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (original) +++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:45:12 2011 @@ -354,7 +354,6 @@ {# The div we use to include help popups. #}
{% call close_popup_link("help") %}(close) {% endcall %} -

{# The iframe we use to load the help source. This is never actually @@ -373,8 +372,7 @@ {# The div we use to include timing popups. #}
{% call close_popup_link("timing") %}(close) {% endcall %} -
-
+

From sabre at nondot.org Fri Feb 18 11:04:56 2011 From: sabre at nondot.org (Chris Lattner) Date: Fri, 18 Feb 2011 17:04:56 -0000 Subject: [llvm-commits] [llvm] r125943 - /llvm/trunk/lib/Support/Unix/Path.inc Message-ID: <20110218170456.E09532A6C12C@llvm.org> Author: lattner Date: Fri Feb 18 11:04:56 2011 New Revision: 125943 URL: http://llvm.org/viewvc/llvm-project?rev=125943&view=rev Log: improve support for OpenBSD, patch by Amit Kulkarni! Modified: llvm/trunk/lib/Support/Unix/Path.inc Modified: llvm/trunk/lib/Support/Unix/Path.inc URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Unix/Path.inc?rev=125943&r1=125942&r2=125943&view=diff ============================================================================== --- llvm/trunk/lib/Support/Unix/Path.inc (original) +++ llvm/trunk/lib/Support/Unix/Path.inc Fri Feb 18 11:04:56 2011 @@ -260,7 +260,8 @@ return Path(pathname); } -#if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__minix) +#if defined(__FreeBSD__) || defined (__NetBSD__) || \ + defined(__OpenBSD__) || defined(__minix) static int test_dir(char buf[PATH_MAX], char ret[PATH_MAX], const char *dir, const char *bin) @@ -328,7 +329,8 @@ if (realpath(exe_path, link_path)) return Path(link_path); } -#elif defined(__FreeBSD__) || defined (__NetBSD__) || defined(__minix) +#elif defined(__FreeBSD__) || defined (__NetBSD__) || \ + defined(__OpenBSD__) || defined(__minix) char exe_path[PATH_MAX]; if (getprogpath(exe_path, argv0) != NULL) From dpatel at apple.com Fri Feb 18 12:20:12 2011 From: dpatel at apple.com (Devang Patel) Date: Fri, 18 Feb 2011 10:20:12 -0800 Subject: [llvm-commits] [llvm] r125794 - in /llvm/trunk: include/llvm/CodeGen/SelectionDAG.h lib/CodeGen/SelectionDAG/LegalizeDAG.cpp lib/CodeGen/SelectionDAG/SDNodeDbgValue.h lib/CodeGen/SelectionDAG/SelectionDAG.cpp lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp test/CodeGen/X86/dbg-value-inlined-parameter.ll In-Reply-To: References: <20110217233327.D53A82A6C12C@llvm.org> <38F35C11-B253-4EBC-9A91-4B912F5FED02@apple.com> Message-ID: <7D5B4D45-974D-454D-88A4-660239F166AB@apple.com> On Feb 17, 2011, at 10:05 PM, Cameron Zwarich wrote: > The build has made it further, so it looks like this was the problem. > > Cameron > > On Feb 17, 2011, at 9:02 PM, Cameron Zwarich wrote: > >> I'm going to roll this out to help diagnose the failure on the llvm-gcc-i386-linux-selfhost bot. It is the only significant change in the blamed revision range. Sorry about that! OK. no worries :) Thanks, - Devang >> >> Cameron >> >> On Feb 17, 2011, at 3:33 PM, Devang Patel wrote: >> >>> Author: dpatel >>> Date: Thu Feb 17 17:33:27 2011 >>> New Revision: 125794 >>> >>> URL: http://llvm.org/viewvc/llvm-project?rev=125794&view=rev >>> Log: >>> Do not lose debug info of an inlined function argument even if the argument is only used through GEPs. >>> >>> Added: >>> llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll >>> Modified: >>> llvm/trunk/include/llvm/CodeGen/SelectionDAG.h >>> llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp >>> llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h >>> llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp >>> llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp >>> >>> Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAG.h >>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAG.h?rev=125794&r1=125793&r2=125794&view=diff >>> ============================================================================== >>> --- llvm/trunk/include/llvm/CodeGen/SelectionDAG.h (original) >>> +++ llvm/trunk/include/llvm/CodeGen/SelectionDAG.h Thu Feb 17 17:33:27 2011 >>> @@ -100,10 +100,6 @@ >>> return DbgValMap[Node]; >>> } >>> >>> - void removeSDDbgValues(const SDNode *Node) { >>> - DbgValMap.erase(Node); >>> - } >>> - >>> typedef SmallVector::iterator DbgIterator; >>> DbgIterator DbgBegin() { return DbgValues.begin(); } >>> DbgIterator DbgEnd() { return DbgValues.end(); } >>> >>> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp >>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp?rev=125794&r1=125793&r2=125794&view=diff >>> ============================================================================== >>> --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp (original) >>> +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Thu Feb 17 17:33:27 2011 >>> @@ -87,6 +87,9 @@ >>> // If someone requests legalization of the new node, return itself. >>> if (From != To) >>> LegalizedNodes.insert(std::make_pair(To, To)); >>> + >>> + // Transfer SDDbgValues. >>> + DAG.TransferDbgValues(From, To); >>> } >>> >>> public: >>> >>> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h >>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h?rev=125794&r1=125793&r2=125794&view=diff >>> ============================================================================== >>> --- llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h (original) >>> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h Thu Feb 17 17:33:27 2011 >>> @@ -83,14 +83,6 @@ >>> // Returns the SDNode* for a register ref >>> SDNode *getSDNode() { assert (kind==SDNODE); return u.s.Node; } >>> >>> - // setSDNode - If underlying SDNode is replaced by another node then >>> - // SelectionDAG can use this to transfer DbgValue. >>> - void setSDNode(SDNode *N, unsigned R) { >>> - assert (kind==SDNODE); >>> - u.s.Node = N; >>> - u.s.ResNo = R; >>> - } >>> - >>> // Returns the ResNo for a register ref >>> unsigned getResNo() { assert (kind==SDNODE); return u.s.ResNo; } >>> >>> >>> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp >>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=125794&r1=125793&r2=125794&view=diff >>> ============================================================================== >>> --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original) >>> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Thu Feb 17 17:33:27 2011 >>> @@ -5508,12 +5508,14 @@ >>> SDNode *FromNode = From.getNode(); >>> SDNode *ToNode = To.getNode(); >>> SmallVector &DVs = GetDbgValues(FromNode); >>> - DbgInfo->removeSDDbgValues(FromNode); >>> for (SmallVector::iterator I = DVs.begin(), E = DVs.end(); >>> I != E; ++I) { >>> - if ((*I)->getKind() == SDDbgValue::SDNODE) { >>> - AddDbgValue(*I, ToNode, false); >>> - (*I)->setSDNode(ToNode, To.getResNo()); >>> + SDDbgValue *Dbg = *I; >>> + if (Dbg->getKind() == SDDbgValue::SDNODE) { >>> + SDDbgValue *Clone = getDbgValue(Dbg->getMDPtr(), ToNode, To.getResNo(), >>> + Dbg->getOffset(), Dbg->getDebugLoc(), >>> + Dbg->getOrder()); >>> + AddDbgValue(Clone, ToNode, false); >>> } >>> } >>> } >>> >>> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp >>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp?rev=125794&r1=125793&r2=125794&view=diff >>> ============================================================================== >>> --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp (original) >>> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Thu Feb 17 17:33:27 2011 >>> @@ -4287,7 +4287,7 @@ >>> N.getResNo(), Offset, dl, SDNodeOrder); >>> DAG.AddDbgValue(SDV, N.getNode(), false); >>> } >>> - } else if (isa(V) && !V->use_empty() ) { >>> + } else if (!V->use_empty() ) { >>> // Do not call getValue(V) yet, as we don't want to generate code. >>> // Remember it for later. >>> DanglingDebugInfo DDI(&DI, dl, SDNodeOrder); >>> >>> Added: llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll >>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll?rev=125794&view=auto >>> ============================================================================== >>> --- llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll (added) >>> +++ llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll Thu Feb 17 17:33:27 2011 >>> @@ -0,0 +1,86 @@ >>> +; RUN: llc -mtriple=x86_64-apple-darwin < %s | FileCheck %s >>> + >>> +;CHECK: DW_TAG_inlined_subroutine >>> +;CHECK-NEXT: DW_AT_abstract_origin >>> +;CHECK-NEXT: DW_AT_low_pc >>> +;CHECK-NEXT: DW_AT_high_pc >>> +;CHECK-NEXT: DW_AT_call_file >>> +;CHECK-NEXT: DW_AT_call_line >>> +;CHECK-NEXT: DW_TAG_formal_parameter >>> +;CHECK-NEXT: .ascii "sp" ## DW_AT_name >>> + >>> +%struct.S1 = type { float*, i32 } >>> + >>> + at p = common global %struct.S1 zeroinitializer, align 8 >>> + >>> +define i32 @foo(%struct.S1* nocapture %sp, i32 %nums) nounwind optsize ssp { >>> +entry: >>> + tail call void @llvm.dbg.value(metadata !{%struct.S1* %sp}, i64 0, metadata !9), !dbg !20 >>> + tail call void @llvm.dbg.value(metadata !{i32 %nums}, i64 0, metadata !18), !dbg !21 >>> + %tmp2 = getelementptr inbounds %struct.S1* %sp, i64 0, i32 1, !dbg !22 >>> + store i32 %nums, i32* %tmp2, align 4, !dbg !22, !tbaa !24 >>> + %call = tail call float* @bar(i32 %nums) nounwind optsize, !dbg !27 >>> + %tmp5 = getelementptr inbounds %struct.S1* %sp, i64 0, i32 0, !dbg !27 >>> + store float* %call, float** %tmp5, align 8, !dbg !27, !tbaa !28 >>> + %cmp = icmp ne float* %call, null, !dbg !29 >>> + %cond = zext i1 %cmp to i32, !dbg !29 >>> + ret i32 %cond, !dbg !29 >>> +} >>> + >>> +declare float* @bar(i32) optsize >>> + >>> +define void @foobar() nounwind optsize ssp { >>> +entry: >>> + tail call void @llvm.dbg.value(metadata !30, i64 0, metadata !9) nounwind, !dbg !31 >>> + tail call void @llvm.dbg.value(metadata !34, i64 0, metadata !18) nounwind, !dbg !35 >>> + store i32 1, i32* getelementptr inbounds (%struct.S1* @p, i64 0, i32 1), align 8, !dbg !36, !tbaa !24 >>> + %call.i = tail call float* @bar(i32 1) nounwind optsize, !dbg !37 >>> + store float* %call.i, float** getelementptr inbounds (%struct.S1* @p, i64 0, i32 0), align 8, !dbg !37, !tbaa !28 >>> + ret void, !dbg !38 >>> +} >>> + >>> +declare void @llvm.dbg.value(metadata, i64, metadata) nounwind readnone >>> + >>> +!llvm.dbg.sp = !{!0, !6} >>> +!llvm.dbg.lv.foo = !{!9, !18} >>> +!llvm.dbg.gv = !{!19} >>> + >>> +!0 = metadata !{i32 589870, i32 0, metadata !1, metadata !"foo", metadata !"foo", metadata !"", metadata !1, i32 8, metadata !3, i1 false, i1 true, i32 0, i32 0, i32 0, i32 256, i1 true, i32 (%struct.S1*, i32)* @foo} ; [ DW_TAG_subprogram ] >>> +!1 = metadata !{i32 589865, metadata !"nm2.c", metadata !"/private/tmp", metadata !2} ; [ DW_TAG_file_type ] >>> +!2 = metadata !{i32 589841, i32 0, i32 12, metadata !"nm2.c", metadata !"/private/tmp", metadata !"clang version 2.9 (trunk 125693)", i1 true, i1 true, metadata !"", i32 0} ; [ DW_TAG_compile_unit ] >>> +!3 = metadata !{i32 589845, metadata !1, metadata !"", metadata !1, i32 0, i64 0, i64 0, i32 0, i32 0, i32 0, metadata !4, i32 0, i32 0} ; [ DW_TAG_subroutine_type ] >>> +!4 = metadata !{metadata !5} >>> +!5 = metadata !{i32 589860, metadata !2, metadata !"int", null, i32 0, i64 32, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] >>> +!6 = metadata !{i32 589870, i32 0, metadata !1, metadata !"foobar", metadata !"foobar", metadata !"", metadata !1, i32 15, metadata !7, i1 false, i1 true, i32 0, i32 0, i32 0, i32 0, i1 true, void ()* @foobar} ; [ DW_TAG_subprogram ] >>> +!7 = metadata !{i32 589845, metadata !1, metadata !"", metadata !1, i32 0, i64 0, i64 0, i32 0, i32 0, i32 0, metadata !8, i32 0, i32 0} ; [ DW_TAG_subroutine_type ] >>> +!8 = metadata !{null} >>> +!9 = metadata !{i32 590081, metadata !0, metadata !"sp", metadata !1, i32 7, metadata !10, i32 0} ; [ DW_TAG_arg_variable ] >>> +!10 = metadata !{i32 589839, metadata !2, metadata !"", null, i32 0, i64 64, i64 64, i64 0, i32 0, metadata !11} ; [ DW_TAG_pointer_type ] >>> +!11 = metadata !{i32 589846, metadata !2, metadata !"S1", metadata !1, i32 4, i64 0, i64 0, i64 0, i32 0, metadata !12} ; [ DW_TAG_typedef ] >>> +!12 = metadata !{i32 589843, metadata !2, metadata !"S1", metadata !1, i32 1, i64 128, i64 64, i32 0, i32 0, i32 0, metadata !13, i32 0, i32 0} ; [ DW_TAG_structure_type ] >>> +!13 = metadata !{metadata !14, metadata !17} >>> +!14 = metadata !{i32 589837, metadata !1, metadata !"m", metadata !1, i32 2, i64 64, i64 64, i64 0, i32 0, metadata !15} ; [ DW_TAG_member ] >>> +!15 = metadata !{i32 589839, metadata !2, metadata !"", null, i32 0, i64 64, i64 64, i64 0, i32 0, metadata !16} ; [ DW_TAG_pointer_type ] >>> +!16 = metadata !{i32 589860, metadata !2, metadata !"float", null, i32 0, i64 32, i64 32, i64 0, i32 0, i32 4} ; [ DW_TAG_base_type ] >>> +!17 = metadata !{i32 589837, metadata !1, metadata !"nums", metadata !1, i32 3, i64 32, i64 32, i64 64, i32 0, metadata !5} ; [ DW_TAG_member ] >>> +!18 = metadata !{i32 590081, metadata !0, metadata !"nums", metadata !1, i32 7, metadata !5, i32 0} ; [ DW_TAG_arg_variable ] >>> +!19 = metadata !{i32 589876, i32 0, metadata !2, metadata !"p", metadata !"p", metadata !"", metadata !1, i32 14, metadata !11, i32 0, i32 1, %struct.S1* @p} ; [ DW_TAG_variable ] >>> +!20 = metadata !{i32 7, i32 13, metadata !0, null} >>> +!21 = metadata !{i32 7, i32 21, metadata !0, null} >>> +!22 = metadata !{i32 9, i32 3, metadata !23, null} >>> +!23 = metadata !{i32 589835, metadata !0, i32 8, i32 1, metadata !1, i32 0} ; [ DW_TAG_lexical_block ] >>> +!24 = metadata !{metadata !"int", metadata !25} >>> +!25 = metadata !{metadata !"omnipotent char", metadata !26} >>> +!26 = metadata !{metadata !"Simple C/C++ TBAA", null} >>> +!27 = metadata !{i32 10, i32 3, metadata !23, null} >>> +!28 = metadata !{metadata !"any pointer", metadata !25} >>> +!29 = metadata !{i32 11, i32 3, metadata !23, null} >>> +!30 = metadata !{%struct.S1* @p} >>> +!31 = metadata !{i32 7, i32 13, metadata !0, metadata !32} >>> +!32 = metadata !{i32 16, i32 3, metadata !33, null} >>> +!33 = metadata !{i32 589835, metadata !6, i32 15, i32 15, metadata !1, i32 1} ; [ DW_TAG_lexical_block ] >>> +!34 = metadata !{i32 1} >>> +!35 = metadata !{i32 7, i32 21, metadata !0, metadata !32} >>> +!36 = metadata !{i32 9, i32 3, metadata !23, metadata !32} >>> +!37 = metadata !{i32 10, i32 3, metadata !23, metadata !32} >>> +!38 = metadata !{i32 17, i32 1, metadata !33, null} >>> >>> >>> _______________________________________________ >>> llvm-commits mailing list >>> llvm-commits at cs.uiuc.edu >>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits >> >> >> _______________________________________________ >> llvm-commits mailing list >> llvm-commits at cs.uiuc.edu >> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits > From clattner at apple.com Fri Feb 18 12:58:28 2011 From: clattner at apple.com (Chris Lattner) Date: Fri, 18 Feb 2011 10:58:28 -0800 Subject: [llvm-commits] [PATCH] Support building LLDB. In-Reply-To: References: Message-ID: <6F2859D0-77DB-48EC-A27A-AA07D39B2736@apple.com> On Feb 17, 2011, at 11:28 PM, Stephen Wilson wrote: > > This patch lets LLDB build as an LLVM subproject. LLDB is not built in > parallel with the rest of the tools directory as it depends on Clang. Looks good, please commit! -Chris > > > Index: tools/Makefile > =================================================================== > --- tools/Makefile (revision 125832) > +++ tools/Makefile (working copy) > @@ -12,6 +12,10 @@ > # Build clang if present. > OPTIONAL_PARALLEL_DIRS := clang > > +# Build LLDB if present. Note LLDB must be built last as it depends on the > +# wider LLVM infrastructure (including Clang). > +OPTIONAL_DIRS := lldb > + > # NOTE: The tools are organized into five groups of four consisting of one > # large and three small executables. This is done to minimize memory load > # in parallel builds. Please retain this ordering. > @@ -26,7 +30,8 @@ > # Let users override the set of tools to build from the command line. > ifdef ONLY_TOOLS > OPTIONAL_PARALLEL_DIRS := > - PARALLEL_DIRS := $(ONLY_TOOLS) > + OPTIONAL_DIRS := $(findstring lldb,$(ONLY_TOOLS)) > + PARALLEL_DIRS := $(filter-out lldb,$(ONLY_TOOLS)) > endif > > include $(LEVEL)/Makefile.config > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From clattner at apple.com Fri Feb 18 13:00:31 2011 From: clattner at apple.com (Chris Lattner) Date: Fri, 18 Feb 2011 11:00:31 -0800 Subject: [llvm-commits] [Review Request] lib/Target/X86/X86FastISel.cpp: [PR6275] Fix for Win32's dllimport function. In-Reply-To: References: Message-ID: <8A78731B-4C5F-4308-BB04-B4146C54EC0B@apple.com> On Feb 17, 2011, at 11:46 PM, NAKAMURA Takumi wrote: > Function must not be GlobalVariable. > > FIXME: Are latter conditions needed to check? > --- > lib/Target/X86/X86FastISel.cpp | 5 +++++ > 1 files changed, 5 insertions(+), 0 deletions(-) > --- > > I am dubious in one point; > > // Can't handle TLS or DLLImport. > // FIXME: Are they needed? > if (const GlobalVariable *GVar = dyn_cast(GV)) > if (GVar->isThreadLocal() || GVar->hasDLLImportLinkage()) > return false; > > Let me know if this clause could be eliminated, thank you. I think that they can. http://llvm.org/docs/LangRef.html#linkage_dllimport says "or variable". The patch looks good to me. Please remove the fixme and the "|| GVar->hasDLLImportLinkage()", since the new check subsumes it. -Chris From bruno.cardoso at gmail.com Fri Feb 18 13:45:59 2011 From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes) Date: Fri, 18 Feb 2011 19:45:59 -0000 Subject: [llvm-commits] [llvm] r125948 - in /llvm/trunk: lib/Target/ARM/ARMInstrFormats.td lib/Target/ARM/ARMInstrInfo.td lib/Target/ARM/ARMInstrThumb2.td lib/Target/ARM/AsmParser/ARMAsmParser.cpp lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp test/MC/ARM/arm_instructions.s test/MC/ARM/thumb2.s test/MC/Disassembler/ARM/arm-tests.txt test/MC/Disassembler/ARM/thumb-tests.txt Message-ID: <20110218194559.82BC42A6C12C@llvm.org> Author: bruno Date: Fri Feb 18 13:45:59 2011 New Revision: 125948 URL: http://llvm.org/viewvc/llvm-project?rev=125948&view=rev Log: Add assembly parsing support for "msr" and also fix its encoding. Also add testcases for the disassembler to make sure it still works for "msr". Modified: llvm/trunk/lib/Target/ARM/ARMInstrFormats.td llvm/trunk/lib/Target/ARM/ARMInstrInfo.td llvm/trunk/lib/Target/ARM/ARMInstrThumb2.td llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp llvm/trunk/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h llvm/trunk/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp llvm/trunk/test/MC/ARM/arm_instructions.s llvm/trunk/test/MC/ARM/thumb2.s llvm/trunk/test/MC/Disassembler/ARM/arm-tests.txt llvm/trunk/test/MC/Disassembler/ARM/thumb-tests.txt Modified: llvm/trunk/lib/Target/ARM/ARMInstrFormats.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMInstrFormats.td?rev=125948&r1=125947&r2=125948&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMInstrFormats.td (original) +++ llvm/trunk/lib/Target/ARM/ARMInstrFormats.td Fri Feb 18 13:45:59 2011 @@ -161,6 +161,12 @@ let ParserMethod = "tryParseProcIFlagsOperand"; } +def MSRMaskOperand : AsmOperandClass { + let Name = "MSRMask"; + let SuperClasses = []; + let ParserMethod = "tryParseMSRMaskOperand"; +} + // ARM imod and iflag operands, used only by the CPS instruction. def imod_op : Operand { let PrintMethod = "printCPSIMod"; @@ -205,6 +211,7 @@ def msr_mask : Operand { let PrintMethod = "printMSRMaskOperand"; + let ParserMatchClass = MSRMaskOperand; } // A8.6.117, A8.6.118. Different instructions are generated for #0 and #-0. Modified: llvm/trunk/lib/Target/ARM/ARMInstrInfo.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMInstrInfo.td?rev=125948&r1=125947&r2=125948&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMInstrInfo.td (original) +++ llvm/trunk/lib/Target/ARM/ARMInstrInfo.td Fri Feb 18 13:45:59 2011 @@ -3856,6 +3856,7 @@ // Move between special register and ARM core register -- for disassembly only // +// Move to ARM core register from Special Register def MRS : ABI<0b0001, (outs GPR:$Rd), (ins), NoItinerary, "mrs", "\t$Rd, cpsr", [/* For disassembly only; pattern left blank */]> { bits<4> Rd; @@ -3872,30 +3873,37 @@ let Inst{7-4} = 0b0000; } -def MSR : ABI<0b0001, (outs), (ins GPR:$src, msr_mask:$mask), NoItinerary, - "msr", "\tcpsr$mask, $src", - [/* For disassembly only; pattern left blank */]> { - let Inst{23-20} = 0b0010; - let Inst{7-4} = 0b0000; -} - -def MSRi : ABI<0b0011, (outs), (ins so_imm:$a, msr_mask:$mask), NoItinerary, - "msr", "\tcpsr$mask, $a", - [/* For disassembly only; pattern left blank */]> { - let Inst{23-20} = 0b0010; - let Inst{7-4} = 0b0000; -} - -def MSRsys : ABI<0b0001, (outs), (ins GPR:$src, msr_mask:$mask), NoItinerary, - "msr", "\tspsr$mask, $src", - [/* For disassembly only; pattern left blank */]> { - let Inst{23-20} = 0b0110; - let Inst{7-4} = 0b0000; -} - -def MSRsysi : ABI<0b0011, (outs), (ins so_imm:$a, msr_mask:$mask), NoItinerary, - "msr", "\tspsr$mask, $a", - [/* For disassembly only; pattern left blank */]> { - let Inst{23-20} = 0b0110; - let Inst{7-4} = 0b0000; +// Move from ARM core register to Special Register +// +// No need to have both system and application versions, the encodings are the +// same and the assembly parser has no way to distinguish between them. The mask +// operand contains the special register (R Bit) in bit 4 and bits 3-0 contains +// the mask with the fields to be accessed in the special register. +def MSR : ABI<0b0001, (outs), (ins msr_mask:$mask, GPR:$Rn), NoItinerary, + "msr", "\t$mask, $Rn", + [/* For disassembly only; pattern left blank */]> { + bits<5> mask; + bits<4> Rn; + + let Inst{23} = 0; + let Inst{22} = mask{4}; // R bit + let Inst{21-20} = 0b10; + let Inst{19-16} = mask{3-0}; + let Inst{15-12} = 0b1111; + let Inst{11-4} = 0b00000000; + let Inst{3-0} = Rn; +} + +def MSRi : ABI<0b0011, (outs), (ins msr_mask:$mask, so_imm:$a), NoItinerary, + "msr", "\t$mask, $a", + [/* For disassembly only; pattern left blank */]> { + bits<5> mask; + bits<12> a; + + let Inst{23} = 0; + let Inst{22} = mask{4}; // R bit + let Inst{21-20} = 0b10; + let Inst{19-16} = mask{3-0}; + let Inst{15-12} = 0b1111; + let Inst{11-0} = a; } Modified: llvm/trunk/lib/Target/ARM/ARMInstrThumb2.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMInstrThumb2.td?rev=125948&r1=125947&r2=125948&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMInstrThumb2.td (original) +++ llvm/trunk/lib/Target/ARM/ARMInstrThumb2.td Fri Feb 18 13:45:59 2011 @@ -3330,25 +3330,24 @@ (outs rGPR:$Rd), (ins), NoItinerary, "mrs", "\t$Rd, spsr", [/* For disassembly only; pattern left blank */]>; -class T2MSR op31_20, bits<2> op15_14, bits<1> op12, - dag oops, dag iops, InstrItinClass itin, - string opc, string asm, list pattern> - : T2SpecialReg { +// Move from ARM core register to Special Register +// +// No need to have both system and application versions, the encodings are the +// same and the assembly parser has no way to distinguish between them. The mask +// operand contains the special register (R Bit) in bit 4 and bits 3-0 contains +// the mask with the fields to be accessed in the special register. +def t2MSR : T2SpecialReg<0b111100111000 /* op31-20 */, 0b10 /* op15-14 */, + 0 /* op12 */, (outs), (ins msr_mask:$mask, rGPR:$Rn), + NoItinerary, "msr", "\t$mask, $Rn", + [/* For disassembly only; pattern left blank */]> { + bits<5> mask; bits<4> Rn; - bits<4> mask; let Inst{19-16} = Rn; - let Inst{11-8} = mask; + let Inst{20} = mask{4}; // R Bit + let Inst{13} = 0b0; + let Inst{11-8} = mask{3-0}; } -def t2MSR : T2MSR<0b111100111000, 0b10, 0, - (outs), (ins rGPR:$Rn, msr_mask:$mask), NoItinerary, "msr", - "\tcpsr$mask, $Rn", - [/* For disassembly only; pattern left blank */]>; -def t2MSRsys : T2MSR<0b111100111001, 0b10, 0, - (outs), (ins rGPR:$Rn, msr_mask:$mask), NoItinerary, "msr", - "\tspsr$mask, $Rn", - [/* For disassembly only; pattern left blank */]>; - //===----------------------------------------------------------------------===// // Move between coprocessor and ARM core register -- for disassembly only // Modified: llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp?rev=125948&r1=125947&r2=125948&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp (original) +++ llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Fri Feb 18 13:45:59 2011 @@ -100,6 +100,8 @@ SmallVectorImpl &); OperandMatchResultTy tryParseProcIFlagsOperand( SmallVectorImpl &); + OperandMatchResultTy tryParseMSRMaskOperand( + SmallVectorImpl &); public: ARMAsmParser(const Target &T, MCAsmParser &_Parser, TargetMachine &_TM) @@ -128,6 +130,7 @@ Immediate, MemBarrierOpt, Memory, + MSRMask, ProcIFlags, Register, RegisterList, @@ -157,6 +160,10 @@ } IFlags; struct { + unsigned Val; + } MMask; + + struct { const char *Data; unsigned Length; } Tok; @@ -222,6 +229,9 @@ case Memory: Mem = o.Mem; break; + case MSRMask: + MMask = o.MMask; + break; case ProcIFlags: IFlags = o.IFlags; } @@ -273,6 +283,11 @@ return IFlags.Val; } + unsigned getMSRMask() const { + assert(Kind == MSRMask && "Invalid access!"); + return MMask.Val; + } + /// @name Memory Operand Accessors /// @{ @@ -347,6 +362,7 @@ uint64_t Value = CE->getValue(); return ((Value & 0x3) == 0 && Value <= 124); } + bool isMSRMask() const { return Kind == MSRMask; } bool isProcIFlags() const { return Kind == ProcIFlags; } void addExpr(MCInst &Inst, const MCExpr *Expr) const { @@ -448,6 +464,11 @@ Inst.addOperand(MCOperand::CreateImm(CE->getValue())); } + void addMSRMaskOperands(MCInst &Inst, unsigned N) const { + assert(N == 1 && "Invalid number of operands!"); + Inst.addOperand(MCOperand::CreateImm(unsigned(getMSRMask()))); + } + void addProcIFlagsOperands(MCInst &Inst, unsigned N) const { assert(N == 1 && "Invalid number of operands!"); Inst.addOperand(MCOperand::CreateImm(unsigned(getProcIFlags()))); @@ -584,6 +605,14 @@ Op->EndLoc = S; return Op; } + + static ARMOperand *CreateMSRMask(unsigned MMask, SMLoc S) { + ARMOperand *Op = new ARMOperand(MSRMask); + Op->MMask.Val = MMask; + Op->StartLoc = S; + Op->EndLoc = S; + return Op; + } }; } // end anonymous namespace. @@ -602,6 +631,9 @@ case CoprocReg: OS << ""; break; + case MSRMask: + OS << ""; + break; case Immediate: getImm()->print(OS); break; @@ -950,6 +982,69 @@ return MatchOperand_Success; } +/// tryParseMSRMaskOperand - Try to parse mask flags from MSR instruction. +ARMAsmParser::OperandMatchResultTy ARMAsmParser:: +tryParseMSRMaskOperand(SmallVectorImpl &Operands) { + SMLoc S = Parser.getTok().getLoc(); + const AsmToken &Tok = Parser.getTok(); + assert(Tok.is(AsmToken::Identifier) && "Token is not an Identifier"); + StringRef Mask = Tok.getString(); + + // Split spec_reg from flag, example: CPSR_sxf => "CPSR" and "sxf" + size_t Start = 0, Next = Mask.find('_'); + StringRef Flags = ""; + StringRef SpecReg = Mask.slice(Start, Next); + if (Next != StringRef::npos) + Flags = Mask.slice(Next+1, Mask.size()); + + // FlagsVal contains the complete mask: + // 3-0: Mask + // 4: Special Reg (cpsr, apsr => 0; spsr => 1) + unsigned FlagsVal = 0; + + if (SpecReg == "apsr") { + FlagsVal = StringSwitch(Flags) + .Case("nzcvq", 0x8) // same as CPSR_c + .Case("g", 0x4) // same as CPSR_s + .Case("nzcvqg", 0xc) // same as CPSR_fs + .Default(~0U); + + if (FlagsVal == ~0U) + if (!Flags.empty()) + return MatchOperand_NoMatch; + else + FlagsVal = 0; // No flag + } else if (SpecReg == "cpsr" || SpecReg == "spsr") { + for (int i = 0, e = Flags.size(); i != e; ++i) { + unsigned Flag = StringSwitch(Flags.substr(i, 1)) + .Case("c", 1) + .Case("x", 2) + .Case("s", 4) + .Case("f", 8) + .Default(~0U); + + // If some specific flag is already set, it means that some letter is + // present more than once, this is not acceptable. + if (FlagsVal == ~0U || (FlagsVal & Flag)) + return MatchOperand_NoMatch; + FlagsVal |= Flag; + } + } else // No match for special register. + return MatchOperand_NoMatch; + + // Special register without flags are equivalent to "fc" flags. + if (!FlagsVal) + FlagsVal = 0x9; + + // Bit 4: Special Reg (cpsr, apsr => 0; spsr => 1) + if (SpecReg == "spsr") + FlagsVal |= 16; + + Parser.Lex(); // Eat identifier token. + Operands.push_back(ARMOperand::CreateMSRMask(FlagsVal, S)); + return MatchOperand_Success; +} + /// Parse an ARM memory expression, return false if successful else return true /// or an error. The first token must be a '[' when called. /// Modified: llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp?rev=125948&r1=125947&r2=125948&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp (original) +++ llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp Fri Feb 18 13:45:59 2011 @@ -720,25 +720,29 @@ NumOpsAdded = 1; return true; } - // MSR and MSRsys take one GPR reg Rm, followed by the mask. - if (Opcode == ARM::MSR || Opcode == ARM::MSRsys) { - assert(NumOps >= 1 && OpInfo[0].RegClass == ARM::GPRRegClassID && + // MSR take a mask, followed by one GPR reg Rm. The mask contains the R Bit in + // bit 4, and the special register fields in bits 3-0. + if (Opcode == ARM::MSR) { + assert(NumOps >= 1 && OpInfo[1].RegClass == ARM::GPRRegClassID && "Reg operand expected"); + MI.addOperand(MCOperand::CreateImm(slice(insn, 22, 22) << 4 /* R Bit */ | + slice(insn, 19, 16) /* Special Reg */ )); MI.addOperand(MCOperand::CreateReg(getRegisterEnum(B, ARM::GPRRegClassID, decodeRm(insn)))); - MI.addOperand(MCOperand::CreateImm(slice(insn, 19, 16))); NumOpsAdded = 2; return true; } - // MSRi and MSRsysi take one so_imm operand, followed by the mask. - if (Opcode == ARM::MSRi || Opcode == ARM::MSRsysi) { + // MSRi take a mask, followed by one so_imm operand. The mask contains the + // R Bit in bit 4, and the special register fields in bits 3-0. + if (Opcode == ARM::MSRi) { + MI.addOperand(MCOperand::CreateImm(slice(insn, 22, 22) << 4 /* R Bit */ | + slice(insn, 19, 16) /* Special Reg */ )); // SOImm is 4-bit rotate amount in bits 11-8 with 8-bit imm in bits 7-0. // A5.2.4 Rotate amount is twice the numeric value of Inst{11-8}. // See also ARMAddressingModes.h: getSOImmValImm() and getSOImmValRot(). unsigned Rot = (insn >> ARMII::SoRotImmShift) & 0xF; unsigned Imm = insn & 0xFF; MI.addOperand(MCOperand::CreateImm(ARM_AM::rotr32(Imm, 2*Rot))); - MI.addOperand(MCOperand::CreateImm(slice(insn, 19, 16))); NumOpsAdded = 2; return true; } Modified: llvm/trunk/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h?rev=125948&r1=125947&r2=125948&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h (original) +++ llvm/trunk/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h Fri Feb 18 13:45:59 2011 @@ -1702,11 +1702,13 @@ NumOpsAdded = 1; return true; } - // MSR and MSRsys take one GPR reg Rn, followed by the mask. - if (Opcode == ARM::t2MSR || Opcode == ARM::t2MSRsys || Opcode == ARM::t2BXJ) { + // MSR take a mask, followed by one GPR reg Rn. The mask contains the R Bit in + // bit 4, and the special register fields in bits 3-0. + if (Opcode == ARM::t2MSR) { + MI.addOperand(MCOperand::CreateImm(slice(insn, 20, 20) << 4 /* R Bit */ | + slice(insn, 11, 8) /* Special Reg */)); MI.addOperand(MCOperand::CreateReg(getRegisterEnum(B, ARM::GPRRegClassID, decodeRn(insn)))); - MI.addOperand(MCOperand::CreateImm(slice(insn, 11, 8))); NumOpsAdded = 2; return true; } Modified: llvm/trunk/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp?rev=125948&r1=125947&r2=125948&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp (original) +++ llvm/trunk/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp Fri Feb 18 13:45:59 2011 @@ -397,7 +397,14 @@ void ARMInstPrinter::printMSRMaskOperand(const MCInst *MI, unsigned OpNum, raw_ostream &O) { const MCOperand &Op = MI->getOperand(OpNum); - unsigned Mask = Op.getImm(); + unsigned SpecRegRBit = Op.getImm() >> 4; + unsigned Mask = Op.getImm() & 0xf; + + if (SpecRegRBit) + O << "spsr"; + else + O << "cpsr"; + if (Mask) { O << '_'; if (Mask & 8) O << 'f'; Modified: llvm/trunk/test/MC/ARM/arm_instructions.s URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/arm_instructions.s?rev=125948&r1=125947&r2=125948&view=diff ============================================================================== --- llvm/trunk/test/MC/ARM/arm_instructions.s (original) +++ llvm/trunk/test/MC/ARM/arm_instructions.s Fri Feb 18 13:45:59 2011 @@ -246,3 +246,39 @@ @ CHECK: cpsie if, #10 @ encoding: [0xca,0x00,0x0a,0xf1] cpsie if, #10 +@ CHECK: msr cpsr_fc, r0 @ encoding: [0x00,0xf0,0x29,0xe1] + msr apsr, r0 + +@ CHECK: msr cpsr_s, r0 @ encoding: [0x00,0xf0,0x24,0xe1] + msr apsr_g, r0 + +@ CHECK: msr cpsr_f, r0 @ encoding: [0x00,0xf0,0x28,0xe1] + msr apsr_nzcvq, r0 + +@ CHECK: msr cpsr_fs, r0 @ encoding: [0x00,0xf0,0x2c,0xe1] + msr apsr_nzcvqg, r0 + +@ CHECK: msr cpsr_fc, r0 @ encoding: [0x00,0xf0,0x29,0xe1] + msr cpsr_fc, r0 + +@ CHECK: msr cpsr_c, r0 @ encoding: [0x00,0xf0,0x21,0xe1] + msr cpsr_c, r0 + +@ CHECK: msr cpsr_x, r0 @ encoding: [0x00,0xf0,0x22,0xe1] + msr cpsr_x, r0 + +@ CHECK: msr cpsr_fc, r0 @ encoding: [0x00,0xf0,0x29,0xe1] + msr cpsr_fc, r0 + +@ CHECK: msr cpsr_fsx, r0 @ encoding: [0x00,0xf0,0x2e,0xe1] + msr cpsr_fsx, r0 + +@ CHECK: msr spsr_fc, r0 @ encoding: [0x00,0xf0,0x69,0xe1] + msr spsr_fc, r0 + +@ CHECK: msr spsr_fsxc, r0 @ encoding: [0x00,0xf0,0x6f,0xe1] + msr spsr_fsxc, r0 + +@ CHECK: msr cpsr_fsxc, r0 @ encoding: [0x00,0xf0,0x2f,0xe1] + msr cpsr_fsxc, r0 + Modified: llvm/trunk/test/MC/ARM/thumb2.s URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/thumb2.s?rev=125948&r1=125947&r2=125948&view=diff ============================================================================== --- llvm/trunk/test/MC/ARM/thumb2.s (original) +++ llvm/trunk/test/MC/ARM/thumb2.s Fri Feb 18 13:45:59 2011 @@ -259,3 +259,28 @@ @ CHECK: cpsie.w if, #10 @ encoding: [0xaf,0xf3,0x6a,0x85] cpsie.w if, #10 +@ CHECK: msr cpsr_fc, r0 @ encoding: [0x80,0xf3,0x00,0x89] + msr apsr, r0 +@ CHECK: msr cpsr_s, r0 @ encoding: [0x80,0xf3,0x00,0x84] + msr apsr_g, r0 +@ CHECK: msr cpsr_f, r0 @ encoding: [0x80,0xf3,0x00,0x88] + msr apsr_nzcvq, r0 +@ CHECK: msr cpsr_fs, r0 @ encoding: [0x80,0xf3,0x00,0x8c] + msr apsr_nzcvqg, r0 +@ CHECK: msr cpsr_fc, r0 @ encoding: [0x80,0xf3,0x00,0x89] + msr cpsr_fc, r0 +@ CHECK: msr cpsr_c, r0 @ encoding: [0x80,0xf3,0x00,0x81] + msr cpsr_c, r0 +@ CHECK: msr cpsr_x, r0 @ encoding: [0x80,0xf3,0x00,0x82] + msr cpsr_x, r0 +@ CHECK: msr cpsr_fc, r0 @ encoding: [0x80,0xf3,0x00,0x89] + msr cpsr_fc, r0 +@ CHECK: msr cpsr_fsx, r0 @ encoding: [0x80,0xf3,0x00,0x8e] + msr cpsr_fsx, r0 +@ CHECK: msr spsr_fc, r0 @ encoding: [0x90,0xf3,0x00,0x89] + msr spsr_fc, r0 +@ CHECK: msr spsr_fsxc, r0 @ encoding: [0x90,0xf3,0x00,0x8f] + msr spsr_fsxc, r0 +@ CHECK: msr cpsr_fsxc, r0 @ encoding: [0x80,0xf3,0x00,0x8f] + msr cpsr_fsxc, r0 + Modified: llvm/trunk/test/MC/Disassembler/ARM/arm-tests.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/arm-tests.txt?rev=125948&r1=125947&r2=125948&view=diff ============================================================================== --- llvm/trunk/test/MC/Disassembler/ARM/arm-tests.txt (original) +++ llvm/trunk/test/MC/Disassembler/ARM/arm-tests.txt Fri Feb 18 13:45:59 2011 @@ -127,3 +127,6 @@ # CHECK: cpsie if, #10 0xca 0x00 0x0a 0xf1 + +# CHECK: msr cpsr_fc, r0 +0x00 0xf0 0x29 0xe1 Modified: llvm/trunk/test/MC/Disassembler/ARM/thumb-tests.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/thumb-tests.txt?rev=125948&r1=125947&r2=125948&view=diff ============================================================================== --- llvm/trunk/test/MC/Disassembler/ARM/thumb-tests.txt (original) +++ llvm/trunk/test/MC/Disassembler/ARM/thumb-tests.txt Fri Feb 18 13:45:59 2011 @@ -115,3 +115,6 @@ # CHECK: cpsie aif 0x67 0xb6 + +# CHECK: msr cpsr_fc, r0 +0x80 0xf3 0x00 0x89 From bruno.cardoso at gmail.com Fri Feb 18 13:49:06 2011 From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes) Date: Fri, 18 Feb 2011 19:49:06 -0000 Subject: [llvm-commits] [llvm] r125949 - /llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Message-ID: <20110218194906.3A15E2A6C12C@llvm.org> Author: bruno Date: Fri Feb 18 13:49:06 2011 New Revision: 125949 URL: http://llvm.org/viewvc/llvm-project?rev=125949&view=rev Log: Fix style and a typo Modified: llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Modified: llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp?rev=125949&r1=125948&r2=125949&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp (original) +++ llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Fri Feb 18 13:49:06 2011 @@ -97,11 +97,11 @@ OperandMatchResultTy tryParseCoprocRegOperand( SmallVectorImpl&); OperandMatchResultTy tryParseMemBarrierOptOperand( - SmallVectorImpl &); + SmallVectorImpl&); OperandMatchResultTy tryParseProcIFlagsOperand( - SmallVectorImpl &); + SmallVectorImpl&); OperandMatchResultTy tryParseMSRMaskOperand( - SmallVectorImpl &); + SmallVectorImpl&); public: ARMAsmParser(const Target &T, MCAsmParser &_Parser, TargetMachine &_TM) @@ -953,7 +953,7 @@ return MatchOperand_Success; } -/// ParseProcIFlagsOperand - Try to parse iflags from CPS instruction. +/// tryParseProcIFlagsOperand - Try to parse iflags from CPS instruction. ARMAsmParser::OperandMatchResultTy ARMAsmParser:: tryParseProcIFlagsOperand(SmallVectorImpl &Operands) { SMLoc S = Parser.getTok().getLoc(); From wilsons at start.ca Fri Feb 18 14:50:33 2011 From: wilsons at start.ca (Stephen Wilson) Date: Fri, 18 Feb 2011 20:50:33 -0000 Subject: [llvm-commits] [llvm] r125956 - /llvm/trunk/tools/Makefile Message-ID: <20110218205033.875932A6C12C@llvm.org> Author: wilsons Date: Fri Feb 18 14:50:33 2011 New Revision: 125956 URL: http://llvm.org/viewvc/llvm-project?rev=125956&view=rev Log: This patch lets LLDB build as an LLVM subproject. LLDB is not built in parallel with the rest of the tools directory as it depends on Clang. Modified: llvm/trunk/tools/Makefile Modified: llvm/trunk/tools/Makefile URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/Makefile?rev=125956&r1=125955&r2=125956&view=diff ============================================================================== --- llvm/trunk/tools/Makefile (original) +++ llvm/trunk/tools/Makefile Fri Feb 18 14:50:33 2011 @@ -12,6 +12,10 @@ # Build clang if present. OPTIONAL_PARALLEL_DIRS := clang +# Build LLDB if present. Note LLDB must be built last as it depends on the +# wider LLVM infrastructure (including Clang). +OPTIONAL_DIRS := lldb + # NOTE: The tools are organized into five groups of four consisting of one # large and three small executables. This is done to minimize memory load # in parallel builds. Please retain this ordering. @@ -26,7 +30,8 @@ # Let users override the set of tools to build from the command line. ifdef ONLY_TOOLS OPTIONAL_PARALLEL_DIRS := - PARALLEL_DIRS := $(ONLY_TOOLS) + OPTIONAL_DIRS := $(findstring lldb,$(ONLY_TOOLS)) + PARALLEL_DIRS := $(filter-out lldb,$(ONLY_TOOLS)) endif include $(LEVEL)/Makefile.config From rafael.espindola at gmail.com Fri Feb 18 15:07:11 2011 From: rafael.espindola at gmail.com (Rafael Avila de Espindola) Date: Fri, 18 Feb 2011 16:07:11 -0500 Subject: [llvm-commits] [patch] Refactoring of the llvm mangler In-Reply-To: <83B15ACB-E9B7-489A-8A13-61A66C159D6B@apple.com> References: <4D55953A.2070809@gmail.com> <83B15ACB-E9B7-489A-8A13-61A66C159D6B@apple.com> Message-ID: <4D5EDF7F.60509@gmail.com> > How does this make LTO faster? With just this patch, it doesn't. I noticed that on ELF at least we spend a lot of time before even getting the list of symbols that are needed. The best way to speed this up is to have the necessary information in a symbol table like on real ELF files. One of the things we need is the actual symbol name. There are some lower hanging fruit (using mmap even for archive members), but my idea with this patch is to follow it up with *) Make getNameOnly a nop. This would drop funny features like mangling "foo bar" to foo_20_bar. *) Move the windows fastcall mangling to clang With this the mangler would just be adding a prefix. If we can make it handle only the linker visible ones, for elf at least it would be a nop and a gold plugin could just use the IL symbol table instead of asking libLTO. > It seems that the major change here is to change the SmallString to a raw_ostream, which seems ok, but but also does seem to require adding raw_svector_ostream's around now. Almost all the clients actually do want to fill in a SmallString after all :) True. The attached patch addresses the previous comments and keeps the interface on the existing functions. Only the new ones use streams. > -Chris Cheers, Rafael -------------- next part -------------- A non-text attachment was scrubbed... Name: refactor.patch Type: text/x-patch Size: 12506 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110218/0878ea67/attachment.bin From resistor at mac.com Fri Feb 18 15:10:49 2011 From: resistor at mac.com (Owen Anderson) Date: Fri, 18 Feb 2011 13:10:49 -0800 Subject: [llvm-commits] [llvm] r115927 - in /llvm/trunk: include/llvm-c/Core.h include/llvm/InitializePasses.h lib/Transforms/Scalar/Scalar.cpp lib/Transforms/Utils/CMakeLists.txt lib/Transforms/Utils/Utils.cpp lib/VMCore/Core.cpp In-Reply-To: References: <20101007175547.E941F2A6C12E@llvm.org> <9638033B-44C4-4936-A2C8-A88090FCD719@apple.com> <77D9A52D-0465-4752-A69C-1A7E030D1083@mac.com> <8ABF54E8-A00D-4046-BAEB-99C22BB8849A@apple.com> <85674857-3E92-4CE6-A3AE-5AD1EE9B4340@mac.com> Message-ID: <88E6A2AE-21B8-476D-9EAD-7800DDE3E29C@mac.com> On Feb 17, 2011, at 10:13 PM, Chris Lattner wrote: > > On Feb 17, 2011, at 8:21 PM, Owen Anderson wrote: >> We can do that, if you want, but we'll still want to have separate headers for LinkAllPasses() vs. LinkAllCodeGen(), etc., so that opt doesn't have to link in all of CodeGen, and vice-versa for llc. > > Sure, I'm just looking to *reduce* the number of places that have to be touched to add a new pass. I don't think putting the meta-functions in headers versus in a per-library cpp file really makes a difference on this front. Currently, adding a new pass requires touching two places: 1) Adding a declaration to InitializeAllPasses.h 2) Adding a call to that function in your per-library cpp file. Moving the meta-initializers into headers would make the process: 1) Adding a declaration to InitializeAllPasses.h 2) Adding a call to that function in InitializeMyLibrary.h Because we want to support clients like clang that don't want to link against every pass, we still need to keep InitializeAllPasses.h in a separate header from the various InitializeMyLibrary() functions. The "implicit" initialization that clang depends on needs to see those declarations w/o pulling in the link-the-kitchen-sink functions. --Owen -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110218/d9b745d4/attachment.html From isanbard at gmail.com Fri Feb 18 15:12:58 2011 From: isanbard at gmail.com (Bill Wendling) Date: Fri, 18 Feb 2011 21:12:58 -0000 Subject: [llvm-commits] [llvm] r125960 - in /llvm/trunk: lib/CodeGen/TargetLoweringObjectFileImpl.cpp test/CodeGen/X86/non-globl-eh-frame.ll Message-ID: <20110218211258.633122A6C12C@llvm.org> Author: void Date: Fri Feb 18 15:12:58 2011 New Revision: 125960 URL: http://llvm.org/viewvc/llvm-project?rev=125960&view=rev Log: Reapply r114997 now that the buildbots have been updated. Added: llvm/trunk/test/CodeGen/X86/non-globl-eh-frame.ll Modified: llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp Modified: llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp?rev=125960&r1=125959&r2=125960&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp (original) +++ llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp Fri Feb 18 15:12:58 2011 @@ -441,15 +441,11 @@ Triple T(((LLVMTargetMachine&)TM).getTargetTriple()); if (T.getOS() == Triple::Darwin) { - switch (T.getDarwinMajorNumber()) { - case 7: // 10.3 Panther. - case 8: // 10.4 Tiger. + unsigned MajNum = T.getDarwinMajorNumber(); + if (MajNum == 7 || MajNum == 8) // 10.3 Panther, 10.4 Tiger CommDirectiveSupportsAlignment = false; - break; - case 9: // 10.5 Leopard. - case 10: // 10.6 SnowLeopard. - break; - } + if (MajNum > 9) // 10.6 SnowLeopard + IsFunctionEHSymbolGlobal = false; } TargetLoweringObjectFile::Initialize(Ctx, TM); Added: llvm/trunk/test/CodeGen/X86/non-globl-eh-frame.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/non-globl-eh-frame.ll?rev=125960&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/non-globl-eh-frame.ll (added) +++ llvm/trunk/test/CodeGen/X86/non-globl-eh-frame.ll Fri Feb 18 15:12:58 2011 @@ -0,0 +1,24 @@ +; RUN: llc < %s -mtriple x86_64-apple-darwin10 -march x86 | not grep {{.globl\[\[:space:\]\]*__Z4funcv.eh}} +; RUN: llc < %s -mtriple x86_64-apple-darwin9 -march x86 | FileCheck %s -check-prefix=DARWIN9 + +%struct.__pointer_type_info_pseudo = type { %struct.__type_info_pseudo, i32, %"struct.std::type_info"* } +%struct.__type_info_pseudo = type { i8*, i8* } +%"struct.std::type_info" = type opaque + + at .str = private constant [12 x i8] c"hello world\00", align 1 + at _ZTIPc = external constant %struct.__pointer_type_info_pseudo + +define void @_Z4funcv() noreturn optsize ssp { +entry: + %0 = tail call i8* @__cxa_allocate_exception(i64 8) nounwind + %1 = bitcast i8* %0 to i8** + store i8* getelementptr inbounds ([12 x i8]* @.str, i64 0, i64 0), i8** %1, align 8 + tail call void @__cxa_throw(i8* %0, i8* bitcast (%struct.__pointer_type_info_pseudo* @_ZTIPc to i8*), void (i8*)* null) noreturn + unreachable +} + +; DARWIN9: .globl __Z4funcv.eh + +declare i8* @__cxa_allocate_exception(i64) nounwind + +declare void @__cxa_throw(i8*, i8*, void (i8*)*) noreturn From resistor at mac.com Fri Feb 18 15:33:23 2011 From: resistor at mac.com (Owen Anderson) Date: Fri, 18 Feb 2011 21:33:23 -0000 Subject: [llvm-commits] [llvm] r125964 - /llvm/trunk/tools/Makefile Message-ID: <20110218213323.B032D2A6C12C@llvm.org> Author: resistor Date: Fri Feb 18 15:33:23 2011 New Revision: 125964 URL: http://llvm.org/viewvc/llvm-project?rev=125964&view=rev Log: Revert r125956, which broke the build if you _don't_ have lldb checked out. Modified: llvm/trunk/tools/Makefile Modified: llvm/trunk/tools/Makefile URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/Makefile?rev=125964&r1=125963&r2=125964&view=diff ============================================================================== --- llvm/trunk/tools/Makefile (original) +++ llvm/trunk/tools/Makefile Fri Feb 18 15:33:23 2011 @@ -12,10 +12,6 @@ # Build clang if present. OPTIONAL_PARALLEL_DIRS := clang -# Build LLDB if present. Note LLDB must be built last as it depends on the -# wider LLVM infrastructure (including Clang). -OPTIONAL_DIRS := lldb - # NOTE: The tools are organized into five groups of four consisting of one # large and three small executables. This is done to minimize memory load # in parallel builds. Please retain this ordering. @@ -30,8 +26,7 @@ # Let users override the set of tools to build from the command line. ifdef ONLY_TOOLS OPTIONAL_PARALLEL_DIRS := - OPTIONAL_DIRS := $(findstring lldb,$(ONLY_TOOLS)) - PARALLEL_DIRS := $(filter-out lldb,$(ONLY_TOOLS)) + PARALLEL_DIRS := $(ONLY_TOOLS) endif include $(LEVEL)/Makefile.config From sabre at nondot.org Fri Feb 18 15:50:34 2011 From: sabre at nondot.org (Chris Lattner) Date: Fri, 18 Feb 2011 21:50:34 -0000 Subject: [llvm-commits] [llvm] r125965 - in /llvm/trunk: include/llvm/InitializePasses.h include/llvm/Target/TargetLibraryInfo.h lib/Target/CMakeLists.txt lib/Target/Target.cpp lib/Target/TargetLibraryInfo.cpp Message-ID: <20110218215034.8EAE52A6C12C@llvm.org> Author: lattner Date: Fri Feb 18 15:50:34 2011 New Revision: 125965 URL: http://llvm.org/viewvc/llvm-project?rev=125965&view=rev Log: introduce a new TargetLibraryInfo pass, which transformations can use to query about available library functions. For now this just has memset_pattern16, which exists on darwin, but it can be extended for a bunch of other things in the future. Added: llvm/trunk/include/llvm/Target/TargetLibraryInfo.h llvm/trunk/lib/Target/TargetLibraryInfo.cpp Modified: llvm/trunk/include/llvm/InitializePasses.h llvm/trunk/lib/Target/CMakeLists.txt llvm/trunk/lib/Target/Target.cpp Modified: llvm/trunk/include/llvm/InitializePasses.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/InitializePasses.h?rev=125965&r1=125964&r2=125965&view=diff ============================================================================== --- llvm/trunk/include/llvm/InitializePasses.h (original) +++ llvm/trunk/include/llvm/InitializePasses.h Fri Feb 18 15:50:34 2011 @@ -220,6 +220,7 @@ void initializeTailCallElimPass(PassRegistry&); void initializeTailDupPass(PassRegistry&); void initializeTargetDataPass(PassRegistry&); +void initializeTargetLibraryInfoPass(PassRegistry&); void initializeTwoAddressInstructionPassPass(PassRegistry&); void initializeTypeBasedAliasAnalysisPass(PassRegistry&); void initializeUnifyFunctionExitNodesPass(PassRegistry&); Added: llvm/trunk/include/llvm/Target/TargetLibraryInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetLibraryInfo.h?rev=125965&view=auto ============================================================================== --- llvm/trunk/include/llvm/Target/TargetLibraryInfo.h (added) +++ llvm/trunk/include/llvm/Target/TargetLibraryInfo.h Fri Feb 18 15:50:34 2011 @@ -0,0 +1,56 @@ +//===-- llvm/Target/TargetLibraryInfo.h - Library information ---*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_TARGET_TARGETLIBRARYINFO_H +#define LLVM_TARGET_TARGETLIBRARYINFO_H + +#include "llvm/Pass.h" + +namespace llvm { + class Triple; + + namespace LibFunc { + enum Func { + /// void memset_pattern16(void *b, const void *pattern16, size_t len); + memset_pattern16, + + NumLibFuncs + }; + } + +/// TargetLibraryInfo - This immutable pass captures information about what +/// library functions are available for the current target, and allows a +/// frontend to disable optimizations through -fno-builtin etc. +class TargetLibraryInfo : public ImmutablePass { + unsigned char AvailableArray[(LibFunc::NumLibFuncs+7)/8]; +public: + static char ID; + TargetLibraryInfo(); + TargetLibraryInfo(const Triple &T); + + /// has - This function is used by optimizations that want to match on or form + /// a given library function. + bool has(LibFunc::Func F) const { + return (AvailableArray[F/8] & (1 << (F&7))) != 0; + } + + /// setUnavailable - this can be used by whatever sets up TargetLibraryInfo to + /// ban use of specific library functions. + void setUnavailable(LibFunc::Func F) { + AvailableArray[F/8] &= ~(1 << (F&7)); + } + + void setAvailable(LibFunc::Func F) { + AvailableArray[F/8] |= 1 << (F&7); + } +}; + +} // end namespace llvm + +#endif Modified: llvm/trunk/lib/Target/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CMakeLists.txt?rev=125965&r1=125964&r2=125965&view=diff ============================================================================== --- llvm/trunk/lib/Target/CMakeLists.txt (original) +++ llvm/trunk/lib/Target/CMakeLists.txt Fri Feb 18 15:50:34 2011 @@ -9,6 +9,7 @@ TargetFrameLowering.cpp TargetInstrInfo.cpp TargetIntrinsicInfo.cpp + TargetLibraryInfo.cpp TargetLoweringObjectFile.cpp TargetMachine.cpp TargetRegisterInfo.cpp Modified: llvm/trunk/lib/Target/Target.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Target.cpp?rev=125965&r1=125964&r2=125965&view=diff ============================================================================== --- llvm/trunk/lib/Target/Target.cpp (original) +++ llvm/trunk/lib/Target/Target.cpp Fri Feb 18 15:50:34 2011 @@ -24,6 +24,7 @@ void llvm::initializeTarget(PassRegistry &Registry) { initializeTargetDataPass(Registry); + initializeTargetLibraryInfoPass(Registry); } void LLVMInitializeTarget(LLVMPassRegistryRef R) { Added: llvm/trunk/lib/Target/TargetLibraryInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetLibraryInfo.cpp?rev=125965&view=auto ============================================================================== --- llvm/trunk/lib/Target/TargetLibraryInfo.cpp (added) +++ llvm/trunk/lib/Target/TargetLibraryInfo.cpp Fri Feb 18 15:50:34 2011 @@ -0,0 +1,49 @@ +//===-- TargetLibraryInfo.cpp - Runtime library information ----------------==// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// This file implements the TargetLibraryInfo class. +// +//===----------------------------------------------------------------------===// + +#include "llvm/Target/TargetLibraryInfo.h" +#include "llvm/ADT/Triple.h" +using namespace llvm; + +// Register the default implementation. +INITIALIZE_PASS(TargetLibraryInfo, "targetlibinfo", + "Target Library Information", false, true) +char TargetLibraryInfo::ID = 0; + +/// initialize - Initialize the set of available library functions based on the +/// specified target triple. This should be carefully written so that a missing +/// target triple gets a sane set of defaults. +static void initialize(TargetLibraryInfo &TLI, const Triple &T) { + initializeTargetLibraryInfoPass(*PassRegistry::getPassRegistry()); + + + // memset_pattern16 is only available on iOS 3.0 and Mac OS/X 10.5 and later. + if (T.getOS() != Triple::Darwin || T.getDarwinMajorNumber() < 9) + TLI.setUnavailable(LibFunc::memset_pattern16); + +} + + +TargetLibraryInfo::TargetLibraryInfo() : ImmutablePass(ID) { + // Default to everything being available. + memset(AvailableArray, -1, sizeof(AvailableArray)); + + initialize(*this, Triple()); +} + +TargetLibraryInfo::TargetLibraryInfo(const Triple &T) : ImmutablePass(ID) { + // Default to everything being available. + memset(AvailableArray, -1, sizeof(AvailableArray)); + + initialize(*this, T); +} From resistor at mac.com Fri Feb 18 15:51:29 2011 From: resistor at mac.com (Owen Anderson) Date: Fri, 18 Feb 2011 21:51:29 -0000 Subject: [llvm-commits] [llvm] r125966 - in /llvm/trunk: include/llvm/Target/Target.td utils/TableGen/ARMDecoderEmitter.cpp utils/TableGen/DisassemblerEmitter.cpp utils/TableGen/FixedLenDecoderEmitter.cpp utils/TableGen/FixedLenDecoderEmitter.h Message-ID: <20110218215129.7F7902A6C12C@llvm.org> Author: resistor Date: Fri Feb 18 15:51:29 2011 New Revision: 125966 URL: http://llvm.org/viewvc/llvm-project?rev=125966&view=rev Log: Add FixedLenDecoderEmitter, the skeleton of a new disassembler emitter for fixed-length instruction encodings. A major part of its (eventual) goal is to support a much cleaner separation between disassembly callbacks provided by the target and the disassembler emitter itself, i.e. not requiring hardcoding of knowledge in tblgen like the existing disassembly emitters do. The hope is that some day this will allow us to replace the existing non-Thumb ARM disassembler and remove some of the hacks the old one introduced to tblgen. Added: llvm/trunk/utils/TableGen/FixedLenDecoderEmitter.cpp llvm/trunk/utils/TableGen/FixedLenDecoderEmitter.h Modified: llvm/trunk/include/llvm/Target/Target.td llvm/trunk/utils/TableGen/ARMDecoderEmitter.cpp llvm/trunk/utils/TableGen/DisassemblerEmitter.cpp Modified: llvm/trunk/include/llvm/Target/Target.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/Target.td?rev=125966&r1=125965&r2=125966&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/Target.td (original) +++ llvm/trunk/include/llvm/Target/Target.td Fri Feb 18 15:51:29 2011 @@ -245,6 +245,7 @@ string DisableEncoding = ""; string PostEncoderMethod = ""; + string DecoderMethod = ""; /// Target-specific flags. This becomes the TSFlags field in TargetInstrDesc. bits<64> TSFlags = 0; @@ -360,6 +361,7 @@ ValueType Type = ty; string PrintMethod = "printOperand"; string EncoderMethod = ""; + string DecoderMethod = ""; string AsmOperandLowerMethod = ?; dag MIOperandInfo = (ops); Modified: llvm/trunk/utils/TableGen/ARMDecoderEmitter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/ARMDecoderEmitter.cpp?rev=125966&r1=125965&r2=125966&view=diff ============================================================================== --- llvm/trunk/utils/TableGen/ARMDecoderEmitter.cpp (original) +++ llvm/trunk/utils/TableGen/ARMDecoderEmitter.cpp Fri Feb 18 15:51:29 2011 @@ -221,7 +221,7 @@ #define BIT_WIDTH 32 // Forward declaration. -class FilterChooser; +class ARMFilterChooser; // Representation of the instruction to work on. typedef bit_value_t insn_t[BIT_WIDTH]; @@ -262,9 +262,9 @@ /// decoder could try to decode the even/odd register numbering and assign to /// VST4q8a or VST4q8b, but for the time being, the decoder chooses the "a" /// version and return the Opcode since the two have the same Asm format string. -class Filter { +class ARMFilter { protected: - FilterChooser *Owner; // points to the FilterChooser who owns this filter + ARMFilterChooser *Owner; // points to the FilterChooser who owns this filter unsigned StartBit; // the starting bit position unsigned NumBits; // number of bits to filter bool Mixed; // a mixed region contains both set and unset bits @@ -276,7 +276,7 @@ std::vector VariableInstructions; // Map of well-known segment value to its delegate. - std::map FilterChooserMap; + std::map FilterChooserMap; // Number of instructions which fall under FilteredInstructions category. unsigned NumFiltered; @@ -296,16 +296,17 @@ } // Return the filter chooser for the group of instructions without constant // segment values. - FilterChooser &getVariableFC() { + ARMFilterChooser &getVariableFC() { assert(NumFiltered == 1); assert(FilterChooserMap.size() == 1); return *(FilterChooserMap.find((unsigned)-1)->second); } - Filter(const Filter &f); - Filter(FilterChooser &owner, unsigned startBit, unsigned numBits, bool mixed); + ARMFilter(const ARMFilter &f); + ARMFilter(ARMFilterChooser &owner, unsigned startBit, unsigned numBits, + bool mixed); - ~Filter(); + ~ARMFilter(); // Divides the decoding task into sub tasks and delegates them to the // inferior FilterChooser's. @@ -333,7 +334,7 @@ ATTR_MIXED } bitAttr_t; -/// FilterChooser - FilterChooser chooses the best filter among a set of Filters +/// ARMFilterChooser - FilterChooser chooses the best filter among a set of Filters /// in order to perform the decoding of instructions at the current level. /// /// Decoding proceeds from the top down. Based on the well-known encoding bits @@ -348,11 +349,11 @@ /// It is useful to think of a Filter as governing the switch stmts of the /// decoding tree. And each case is delegated to an inferior FilterChooser to /// decide what further remaining bits to look at. -class FilterChooser { +class ARMFilterChooser { static TARGET_NAME_t TargetName; protected: - friend class Filter; + friend class ARMFilter; // Vector of codegen instructions to choose our filter. const std::vector &AllInstructions; @@ -361,14 +362,14 @@ const std::vector Opcodes; // Vector of candidate filters. - std::vector Filters; + std::vector Filters; // Array of bit values passed down from our parent. // Set to all BIT_UNFILTERED's for Parent == NULL. bit_value_t FilterBitValues[BIT_WIDTH]; // Links to the FilterChooser above us in the decoding tree. - FilterChooser *Parent; + ARMFilterChooser *Parent; // Index of the best filter from Filters. int BestIndex; @@ -376,13 +377,13 @@ public: static void setTargetName(TARGET_NAME_t tn) { TargetName = tn; } - FilterChooser(const FilterChooser &FC) : + ARMFilterChooser(const ARMFilterChooser &FC) : AllInstructions(FC.AllInstructions), Opcodes(FC.Opcodes), Filters(FC.Filters), Parent(FC.Parent), BestIndex(FC.BestIndex) { memcpy(FilterBitValues, FC.FilterBitValues, sizeof(FilterBitValues)); } - FilterChooser(const std::vector &Insts, + ARMFilterChooser(const std::vector &Insts, const std::vector &IDs) : AllInstructions(Insts), Opcodes(IDs), Filters(), Parent(NULL), BestIndex(-1) { @@ -392,10 +393,10 @@ doFilter(); } - FilterChooser(const std::vector &Insts, - const std::vector &IDs, - bit_value_t (&ParentFilterBitValues)[BIT_WIDTH], - FilterChooser &parent) : + ARMFilterChooser(const std::vector &Insts, + const std::vector &IDs, + bit_value_t (&ParentFilterBitValues)[BIT_WIDTH], + ARMFilterChooser &parent) : AllInstructions(Insts), Opcodes(IDs), Filters(), Parent(&parent), BestIndex(-1) { for (unsigned i = 0; i < BIT_WIDTH; ++i) @@ -426,8 +427,9 @@ Insn[i] = bitFromBits(Bits, i); // Set Inst{21} to 1 (wback) when IndexModeBits == IndexModeUpd. - if (getByteField(*AllInstructions[Opcode]->TheDef, "IndexModeBits") - == IndexModeUpd) + Record *R = AllInstructions[Opcode]->TheDef; + if (R->getValue("IndexModeBits") && + getByteField(*R, "IndexModeBits") == IndexModeUpd) Insn[21] = BIT_TRUE; } @@ -452,7 +454,7 @@ /// dumpFilterArray on each filter chooser up to the top level one. void dumpStack(raw_ostream &o, const char *prefix); - Filter &bestFilter() { + ARMFilter &bestFilter() { assert(BestIndex != -1 && "BestIndex not set"); return Filters[BestIndex]; } @@ -497,11 +499,12 @@ bool emitSingletonDecoder(raw_ostream &o, unsigned &Indentation,unsigned Opc); // Emits code to decode the singleton, and then to decode the rest. - void emitSingletonDecoder(raw_ostream &o, unsigned &Indentation,Filter &Best); + void emitSingletonDecoder(raw_ostream &o, unsigned &Indentation, + ARMFilter &Best); // Assign a single filter and run with it. - void runSingleFilter(FilterChooser &owner, unsigned startBit, unsigned numBit, - bool mixed); + void runSingleFilter(ARMFilterChooser &owner, unsigned startBit, + unsigned numBit, bool mixed); // reportRegion is a helper function for filterProcessor to mark a region as // eligible for use as a filter region. @@ -530,7 +533,7 @@ // // /////////////////////////// -Filter::Filter(const Filter &f) : +ARMFilter::ARMFilter(const ARMFilter &f) : Owner(f.Owner), StartBit(f.StartBit), NumBits(f.NumBits), Mixed(f.Mixed), FilteredInstructions(f.FilteredInstructions), VariableInstructions(f.VariableInstructions), @@ -538,7 +541,7 @@ LastOpcFiltered(f.LastOpcFiltered), NumVariable(f.NumVariable) { } -Filter::Filter(FilterChooser &owner, unsigned startBit, unsigned numBits, +ARMFilter::ARMFilter(ARMFilterChooser &owner, unsigned startBit, unsigned numBits, bool mixed) : Owner(&owner), StartBit(startBit), NumBits(numBits), Mixed(mixed) { assert(StartBit + NumBits - 1 < BIT_WIDTH); @@ -575,8 +578,8 @@ && "Filter returns no instruction categories"); } -Filter::~Filter() { - std::map::iterator filterIterator; +ARMFilter::~ARMFilter() { + std::map::iterator filterIterator; for (filterIterator = FilterChooserMap.begin(); filterIterator != FilterChooserMap.end(); filterIterator++) { @@ -590,7 +593,7 @@ // A special case arises when there's only one entry in the filtered // instructions. In order to unambiguously decode the singleton, we need to // match the remaining undecoded encoding bits against the singleton. -void Filter::recurse() { +void ARMFilter::recurse() { std::map >::const_iterator mapIterator; bit_value_t BitValueArray[BIT_WIDTH]; @@ -606,12 +609,12 @@ // Delegates to an inferior filter chooser for futher processing on this // group of instructions whose segment values are variable. - FilterChooserMap.insert(std::pair( + FilterChooserMap.insert(std::pair( (unsigned)-1, - new FilterChooser(Owner->AllInstructions, - VariableInstructions, - BitValueArray, - *Owner) + new ARMFilterChooser(Owner->AllInstructions, + VariableInstructions, + BitValueArray, + *Owner) )); } @@ -638,18 +641,18 @@ // Delegates to an inferior filter chooser for futher processing on this // category of instructions. - FilterChooserMap.insert(std::pair( + FilterChooserMap.insert(std::pair( mapIterator->first, - new FilterChooser(Owner->AllInstructions, - mapIterator->second, - BitValueArray, - *Owner) + new ARMFilterChooser(Owner->AllInstructions, + mapIterator->second, + BitValueArray, + *Owner) )); } } // Emit code to decode instructions given a segment or segments of bits. -void Filter::emit(raw_ostream &o, unsigned &Indentation) { +void ARMFilter::emit(raw_ostream &o, unsigned &Indentation) { o.indent(Indentation) << "// Check Inst{"; if (NumBits > 1) @@ -660,7 +663,7 @@ o.indent(Indentation) << "switch (fieldFromInstruction(insn, " << StartBit << ", " << NumBits << ")) {\n"; - std::map::iterator filterIterator; + std::map::iterator filterIterator; bool DefaultCase = false; for (filterIterator = FilterChooserMap.begin(); @@ -709,7 +712,7 @@ // Returns the number of fanout produced by the filter. More fanout implies // the filter distinguishes more categories of instructions. -unsigned Filter::usefulness() const { +unsigned ARMFilter::usefulness() const { if (VariableInstructions.size()) return FilteredInstructions.size(); else @@ -723,10 +726,10 @@ ////////////////////////////////// // Define the symbol here. -TARGET_NAME_t FilterChooser::TargetName; +TARGET_NAME_t ARMFilterChooser::TargetName; // This provides an opportunity for target specific code emission. -void FilterChooser::emitTopHook(raw_ostream &o) { +void ARMFilterChooser::emitTopHook(raw_ostream &o) { if (TargetName == TARGET_ARM) { // Emit code that references the ARMFormat data type. o << "static const ARMFormat ARMFormats[] = {\n"; @@ -747,7 +750,7 @@ } // Emit the top level typedef and decodeInstruction() function. -void FilterChooser::emitTop(raw_ostream &o, unsigned &Indentation) { +void ARMFilterChooser::emitTop(raw_ostream &o, unsigned &Indentation) { // Run the target specific emit hook. emitTopHook(o); @@ -818,7 +821,7 @@ // This provides an opportunity for target specific code emission after // emitTop(). -void FilterChooser::emitBot(raw_ostream &o, unsigned &Indentation) { +void ARMFilterChooser::emitBot(raw_ostream &o, unsigned &Indentation) { if (TargetName != TARGET_THUMB) return; // Emit code that decodes the Thumb ISA. @@ -843,7 +846,7 @@ // // Returns false if and on the first uninitialized bit value encountered. // Returns true, otherwise. -bool FilterChooser::fieldFromInsn(uint64_t &Field, insn_t &Insn, +bool ARMFilterChooser::fieldFromInsn(uint64_t &Field, insn_t &Insn, unsigned StartBit, unsigned NumBits) const { Field = 0; @@ -860,7 +863,7 @@ /// dumpFilterArray - dumpFilterArray prints out debugging info for the given /// filter array as a series of chars. -void FilterChooser::dumpFilterArray(raw_ostream &o, +void ARMFilterChooser::dumpFilterArray(raw_ostream &o, bit_value_t (&filter)[BIT_WIDTH]) { unsigned bitIndex; @@ -884,8 +887,8 @@ /// dumpStack - dumpStack traverses the filter chooser chain and calls /// dumpFilterArray on each filter chooser up to the top level one. -void FilterChooser::dumpStack(raw_ostream &o, const char *prefix) { - FilterChooser *current = this; +void ARMFilterChooser::dumpStack(raw_ostream &o, const char *prefix) { + ARMFilterChooser *current = this; while (current) { o << prefix; @@ -896,7 +899,7 @@ } // Called from Filter::recurse() when singleton exists. For debug purpose. -void FilterChooser::SingletonExists(unsigned Opc) { +void ARMFilterChooser::SingletonExists(unsigned Opc) { insn_t Insn0; insnWithID(Insn0, Opc); @@ -923,7 +926,7 @@ // This returns a list of undecoded bits of an instructions, for example, // Inst{20} = 1 && Inst{3-0} == 0b1111 represents two islands of yet-to-be // decoded bits in order to verify that the instruction matches the Opcode. -unsigned FilterChooser::getIslands(std::vector &StartBits, +unsigned ARMFilterChooser::getIslands(std::vector &StartBits, std::vector &EndBits, std::vector &FieldVals, insn_t &Insn) { unsigned Num, BitNo; @@ -983,7 +986,7 @@ // Emits code to decode the singleton. Return true if we have matched all the // well-known bits. -bool FilterChooser::emitSingletonDecoder(raw_ostream &o, unsigned &Indentation, +bool ARMFilterChooser::emitSingletonDecoder(raw_ostream &o, unsigned &Indentation, unsigned Opc) { std::vector StartBits; std::vector EndBits; @@ -1046,8 +1049,9 @@ } // Emits code to decode the singleton, and then to decode the rest. -void FilterChooser::emitSingletonDecoder(raw_ostream &o, unsigned &Indentation, - Filter &Best) { +void ARMFilterChooser::emitSingletonDecoder(raw_ostream &o, + unsigned &Indentation, + ARMFilter &Best) { unsigned Opc = Best.getSingletonOpc(); @@ -1063,10 +1067,11 @@ // Assign a single filter and run with it. Top level API client can initialize // with a single filter to start the filtering process. -void FilterChooser::runSingleFilter(FilterChooser &owner, unsigned startBit, - unsigned numBit, bool mixed) { +void ARMFilterChooser::runSingleFilter(ARMFilterChooser &owner, + unsigned startBit, + unsigned numBit, bool mixed) { Filters.clear(); - Filter F(*this, startBit, numBit, true); + ARMFilter F(*this, startBit, numBit, true); Filters.push_back(F); BestIndex = 0; // Sole Filter instance to choose from. bestFilter().recurse(); @@ -1074,18 +1079,18 @@ // reportRegion is a helper function for filterProcessor to mark a region as // eligible for use as a filter region. -void FilterChooser::reportRegion(bitAttr_t RA, unsigned StartBit, - unsigned BitIndex, bool AllowMixed) { +void ARMFilterChooser::reportRegion(bitAttr_t RA, unsigned StartBit, + unsigned BitIndex, bool AllowMixed) { if (RA == ATTR_MIXED && AllowMixed) - Filters.push_back(Filter(*this, StartBit, BitIndex - StartBit, true)); + Filters.push_back(ARMFilter(*this, StartBit, BitIndex - StartBit, true)); else if (RA == ATTR_ALL_SET && !AllowMixed) - Filters.push_back(Filter(*this, StartBit, BitIndex - StartBit, false)); + Filters.push_back(ARMFilter(*this, StartBit, BitIndex - StartBit, false)); } // FilterProcessor scans the well-known encoding bits of the instructions and // builds up a list of candidate filters. It chooses the best filter and // recursively descends down the decoding tree. -bool FilterChooser::filterProcessor(bool AllowMixed, bool Greedy) { +bool ARMFilterChooser::filterProcessor(bool AllowMixed, bool Greedy) { Filters.clear(); BestIndex = -1; unsigned numInstructions = Opcodes.size(); @@ -1317,7 +1322,7 @@ // Decides on the best configuration of filter(s) to use in order to decode // the instructions. A conflict of instructions may occur, in which case we // dump the conflict set to the standard error. -void FilterChooser::doFilter() { +void ARMFilterChooser::doFilter() { unsigned Num = Opcodes.size(); assert(Num && "FilterChooser created with no instructions"); @@ -1350,7 +1355,7 @@ // Emits code to decode our share of instructions. Returns true if the // emitted code causes a return, which occurs if we know how to decode // the instruction at this level or the instruction is not decodeable. -bool FilterChooser::emit(raw_ostream &o, unsigned &Indentation) { +bool ARMFilterChooser::emit(raw_ostream &o, unsigned &Indentation) { if (Opcodes.size() == 1) // There is only one instruction in the set, which is great! // Call emitSingletonDecoder() to see whether there are any remaining @@ -1359,7 +1364,7 @@ // Choose the best filter to do the decodings! if (BestIndex != -1) { - Filter &Best = bestFilter(); + ARMFilter &Best = bestFilter(); if (Best.getNumFiltered() == 1) emitSingletonDecoder(o, Indentation, Best); else @@ -1538,7 +1543,7 @@ std::vector Opcodes2; ARMDecoderEmitter &Frontend; CodeGenTarget Target; - FilterChooser *FC; + ARMFilterChooser *FC; TARGET_NAME_t TargetName; }; @@ -1752,32 +1757,20 @@ void ARMDecoderEmitter::ARMDEBackend::populateInstructions() { getInstructionsByEnumValue(NumberedInstructions); - uint16_t numUIDs = NumberedInstructions.size(); - uint16_t uid; - - const char *instClass = NULL; - - switch (TargetName) { - case TARGET_ARM: - instClass = "InstARM"; - break; - default: - assert(0 && "Unreachable code!"); - } - - for (uid = 0; uid < numUIDs; uid++) { - // filter out intrinsics - if (!NumberedInstructions[uid]->TheDef->isSubClassOf(instClass)) - continue; + unsigned numUIDs = NumberedInstructions.size(); + if (TargetName == TARGET_ARM) { + for (unsigned uid = 0; uid < numUIDs; uid++) { + // filter out intrinsics + if (!NumberedInstructions[uid]->TheDef->isSubClassOf("InstARM")) + continue; - if (populateInstruction(*NumberedInstructions[uid], TargetName)) - Opcodes.push_back(uid); - } + if (populateInstruction(*NumberedInstructions[uid], TargetName)) + Opcodes.push_back(uid); + } - // Special handling for the ARM chip, which supports two modes of execution. - // This branch handles the Thumb opcodes. - if (TargetName == TARGET_ARM) { - for (uid = 0; uid < numUIDs; uid++) { + // Special handling for the ARM chip, which supports two modes of execution. + // This branch handles the Thumb opcodes. + for (unsigned uid = 0; uid < numUIDs; uid++) { // filter out intrinsics if (!NumberedInstructions[uid]->TheDef->isSubClassOf("InstARM") && !NumberedInstructions[uid]->TheDef->isSubClassOf("InstThumb")) @@ -1786,6 +1779,18 @@ if (populateInstruction(*NumberedInstructions[uid], TARGET_THUMB)) Opcodes2.push_back(uid); } + + return; + } + + // For other targets. + for (unsigned uid = 0; uid < numUIDs; uid++) { + Record *R = NumberedInstructions[uid]->TheDef; + if (R->getValueAsString("Namespace") == "TargetOpcode") + continue; + + if (populateInstruction(*NumberedInstructions[uid], TargetName)) + Opcodes.push_back(uid); } } @@ -1805,20 +1810,20 @@ o << '\n'; o << "namespace llvm {\n\n"; - FilterChooser::setTargetName(TargetName); + ARMFilterChooser::setTargetName(TargetName); switch (TargetName) { case TARGET_ARM: { // Emit common utility and ARM ISA decoder. - FC = new FilterChooser(NumberedInstructions, Opcodes); + FC = new ARMFilterChooser(NumberedInstructions, Opcodes); // Reset indentation level. unsigned Indentation = 0; FC->emitTop(o, Indentation); delete FC; // Emit Thumb ISA decoder as well. - FilterChooser::setTargetName(TARGET_THUMB); - FC = new FilterChooser(NumberedInstructions, Opcodes2); + ARMFilterChooser::setTargetName(TARGET_THUMB); + FC = new ARMFilterChooser(NumberedInstructions, Opcodes2); // Reset indentation level. Indentation = 0; FC->emitBot(o, Indentation); Modified: llvm/trunk/utils/TableGen/DisassemblerEmitter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/DisassemblerEmitter.cpp?rev=125966&r1=125965&r2=125966&view=diff ============================================================================== --- llvm/trunk/utils/TableGen/DisassemblerEmitter.cpp (original) +++ llvm/trunk/utils/TableGen/DisassemblerEmitter.cpp Fri Feb 18 15:51:29 2011 @@ -13,6 +13,7 @@ #include "X86DisassemblerTables.h" #include "X86RecognizableInstr.h" #include "ARMDecoderEmitter.h" +#include "FixedLenDecoderEmitter.h" using namespace llvm; using namespace llvm::X86Disassembler; @@ -127,11 +128,11 @@ } // Fixed-instruction-length targets use a common disassembler. + // ARM use its own implementation for now. if (Target.getName() == "ARM") { ARMDecoderEmitter(Records).run(OS); return; } - throw TGError(Target.getTargetRecord()->getLoc(), - "Unable to generate disassembler for this target"); + FixedLenDecoderEmitter(Records).run(OS); } Added: llvm/trunk/utils/TableGen/FixedLenDecoderEmitter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/FixedLenDecoderEmitter.cpp?rev=125966&view=auto ============================================================================== --- llvm/trunk/utils/TableGen/FixedLenDecoderEmitter.cpp (added) +++ llvm/trunk/utils/TableGen/FixedLenDecoderEmitter.cpp Fri Feb 18 15:51:29 2011 @@ -0,0 +1,1372 @@ +//===------------ FixedLenDecoderEmitter.cpp - Decoder Generator ----------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// It contains the tablegen backend that emits the decoder functions for +// targets with fixed length instruction set. +// +//===----------------------------------------------------------------------===// + +#define DEBUG_TYPE "decoder-emitter" + +#include "FixedLenDecoderEmitter.h" +#include "CodeGenTarget.h" +#include "Record.h" +#include "llvm/ADT/StringExtras.h" +#include "llvm/Support/Debug.h" +#include "llvm/Support/raw_ostream.h" + +#include +#include +#include + +using namespace llvm; + +// The set (BIT_TRUE, BIT_FALSE, BIT_UNSET) represents a ternary logic system +// for a bit value. +// +// BIT_UNFILTERED is used as the init value for a filter position. It is used +// only for filter processings. +typedef enum { + BIT_TRUE, // '1' + BIT_FALSE, // '0' + BIT_UNSET, // '?' + BIT_UNFILTERED // unfiltered +} bit_value_t; + +static bool ValueSet(bit_value_t V) { + return (V == BIT_TRUE || V == BIT_FALSE); +} +static bool ValueNotSet(bit_value_t V) { + return (V == BIT_UNSET); +} +static int Value(bit_value_t V) { + return ValueNotSet(V) ? -1 : (V == BIT_FALSE ? 0 : 1); +} +static bit_value_t bitFromBits(BitsInit &bits, unsigned index) { + if (BitInit *bit = dynamic_cast(bits.getBit(index))) + return bit->getValue() ? BIT_TRUE : BIT_FALSE; + + // The bit is uninitialized. + return BIT_UNSET; +} +// Prints the bit value for each position. +static void dumpBits(raw_ostream &o, BitsInit &bits) { + unsigned index; + + for (index = bits.getNumBits(); index > 0; index--) { + switch (bitFromBits(bits, index - 1)) { + case BIT_TRUE: + o << "1"; + break; + case BIT_FALSE: + o << "0"; + break; + case BIT_UNSET: + o << "_"; + break; + default: + assert(0 && "unexpected return value from bitFromBits"); + } + } +} + +static BitsInit &getBitsField(const Record &def, const char *str) { + BitsInit *bits = def.getValueAsBitsInit(str); + return *bits; +} + +// Forward declaration. +class FilterChooser; + +// FIXME: Possibly auto-detected? +#define BIT_WIDTH 32 + +// Representation of the instruction to work on. +typedef bit_value_t insn_t[BIT_WIDTH]; + +/// Filter - Filter works with FilterChooser to produce the decoding tree for +/// the ISA. +/// +/// It is useful to think of a Filter as governing the switch stmts of the +/// decoding tree in a certain level. Each case stmt delegates to an inferior +/// FilterChooser to decide what further decoding logic to employ, or in another +/// words, what other remaining bits to look at. The FilterChooser eventually +/// chooses a best Filter to do its job. +/// +/// This recursive scheme ends when the number of Opcodes assigned to the +/// FilterChooser becomes 1 or if there is a conflict. A conflict happens when +/// the Filter/FilterChooser combo does not know how to distinguish among the +/// Opcodes assigned. +/// +/// An example of a conflict is +/// +/// Conflict: +/// 111101000.00........00010000.... +/// 111101000.00........0001........ +/// 1111010...00........0001........ +/// 1111010...00.................... +/// 1111010......................... +/// 1111............................ +/// ................................ +/// VST4q8a 111101000_00________00010000____ +/// VST4q8b 111101000_00________00010000____ +/// +/// The Debug output shows the path that the decoding tree follows to reach the +/// the conclusion that there is a conflict. VST4q8a is a vst4 to double-spaced +/// even registers, while VST4q8b is a vst4 to double-spaced odd regsisters. +/// +/// The encoding info in the .td files does not specify this meta information, +/// which could have been used by the decoder to resolve the conflict. The +/// decoder could try to decode the even/odd register numbering and assign to +/// VST4q8a or VST4q8b, but for the time being, the decoder chooses the "a" +/// version and return the Opcode since the two have the same Asm format string. +class Filter { +protected: + FilterChooser *Owner; // points to the FilterChooser who owns this filter + unsigned StartBit; // the starting bit position + unsigned NumBits; // number of bits to filter + bool Mixed; // a mixed region contains both set and unset bits + + // Map of well-known segment value to the set of uid's with that value. + std::map > FilteredInstructions; + + // Set of uid's with non-constant segment values. + std::vector VariableInstructions; + + // Map of well-known segment value to its delegate. + std::map FilterChooserMap; + + // Number of instructions which fall under FilteredInstructions category. + unsigned NumFiltered; + + // Keeps track of the last opcode in the filtered bucket. + unsigned LastOpcFiltered; + + // Number of instructions which fall under VariableInstructions category. + unsigned NumVariable; + +public: + unsigned getNumFiltered() { return NumFiltered; } + unsigned getNumVariable() { return NumVariable; } + unsigned getSingletonOpc() { + assert(NumFiltered == 1); + return LastOpcFiltered; + } + // Return the filter chooser for the group of instructions without constant + // segment values. + FilterChooser &getVariableFC() { + assert(NumFiltered == 1); + assert(FilterChooserMap.size() == 1); + return *(FilterChooserMap.find((unsigned)-1)->second); + } + + Filter(const Filter &f); + Filter(FilterChooser &owner, unsigned startBit, unsigned numBits, bool mixed); + + ~Filter(); + + // Divides the decoding task into sub tasks and delegates them to the + // inferior FilterChooser's. + // + // A special case arises when there's only one entry in the filtered + // instructions. In order to unambiguously decode the singleton, we need to + // match the remaining undecoded encoding bits against the singleton. + void recurse(); + + // Emit code to decode instructions given a segment or segments of bits. + void emit(raw_ostream &o, unsigned &Indentation); + + // Returns the number of fanout produced by the filter. More fanout implies + // the filter distinguishes more categories of instructions. + unsigned usefulness() const; +}; // End of class Filter + +// These are states of our finite state machines used in FilterChooser's +// filterProcessor() which produces the filter candidates to use. +typedef enum { + ATTR_NONE, + ATTR_FILTERED, + ATTR_ALL_SET, + ATTR_ALL_UNSET, + ATTR_MIXED +} bitAttr_t; + +/// FilterChooser - FilterChooser chooses the best filter among a set of Filters +/// in order to perform the decoding of instructions at the current level. +/// +/// Decoding proceeds from the top down. Based on the well-known encoding bits +/// of instructions available, FilterChooser builds up the possible Filters that +/// can further the task of decoding by distinguishing among the remaining +/// candidate instructions. +/// +/// Once a filter has been chosen, it is called upon to divide the decoding task +/// into sub-tasks and delegates them to its inferior FilterChoosers for further +/// processings. +/// +/// It is useful to think of a Filter as governing the switch stmts of the +/// decoding tree. And each case is delegated to an inferior FilterChooser to +/// decide what further remaining bits to look at. +class FilterChooser { +protected: + friend class Filter; + + // Vector of codegen instructions to choose our filter. + const std::vector &AllInstructions; + + // Vector of uid's for this filter chooser to work on. + const std::vector Opcodes; + + // Lookup table for the operand decoding of instructions. + std::map > &Operands; + + // Vector of candidate filters. + std::vector Filters; + + // Array of bit values passed down from our parent. + // Set to all BIT_UNFILTERED's for Parent == NULL. + bit_value_t FilterBitValues[BIT_WIDTH]; + + // Links to the FilterChooser above us in the decoding tree. + FilterChooser *Parent; + + // Index of the best filter from Filters. + int BestIndex; + +public: + FilterChooser(const FilterChooser &FC) : + AllInstructions(FC.AllInstructions), Opcodes(FC.Opcodes), + Operands(FC.Operands), Filters(FC.Filters), Parent(FC.Parent), + BestIndex(FC.BestIndex) { + memcpy(FilterBitValues, FC.FilterBitValues, sizeof(FilterBitValues)); + } + + FilterChooser(const std::vector &Insts, + const std::vector &IDs, + std::map > &Ops) : + AllInstructions(Insts), Opcodes(IDs), Operands(Ops), Filters(), + Parent(NULL), BestIndex(-1) { + for (unsigned i = 0; i < BIT_WIDTH; ++i) + FilterBitValues[i] = BIT_UNFILTERED; + + doFilter(); + } + + FilterChooser(const std::vector &Insts, + const std::vector &IDs, + std::map > &Ops, + bit_value_t (&ParentFilterBitValues)[BIT_WIDTH], + FilterChooser &parent) : + AllInstructions(Insts), Opcodes(IDs), Operands(Ops), + Filters(), Parent(&parent), BestIndex(-1) { + for (unsigned i = 0; i < BIT_WIDTH; ++i) + FilterBitValues[i] = ParentFilterBitValues[i]; + + doFilter(); + } + + // The top level filter chooser has NULL as its parent. + bool isTopLevel() { return Parent == NULL; } + + // Emit the top level typedef and decodeInstruction() function. + void emitTop(raw_ostream &o, unsigned Indentation); + +protected: + // Populates the insn given the uid. + void insnWithID(insn_t &Insn, unsigned Opcode) const { + BitsInit &Bits = getBitsField(*AllInstructions[Opcode]->TheDef, "Inst"); + + for (unsigned i = 0; i < BIT_WIDTH; ++i) + Insn[i] = bitFromBits(Bits, i); + } + + // Returns the record name. + const std::string &nameWithID(unsigned Opcode) const { + return AllInstructions[Opcode]->TheDef->getName(); + } + + // Populates the field of the insn given the start position and the number of + // consecutive bits to scan for. + // + // Returns false if there exists any uninitialized bit value in the range. + // Returns true, otherwise. + bool fieldFromInsn(uint64_t &Field, insn_t &Insn, unsigned StartBit, + unsigned NumBits) const; + + /// dumpFilterArray - dumpFilterArray prints out debugging info for the given + /// filter array as a series of chars. + void dumpFilterArray(raw_ostream &o, bit_value_t (&filter)[BIT_WIDTH]); + + /// dumpStack - dumpStack traverses the filter chooser chain and calls + /// dumpFilterArray on each filter chooser up to the top level one. + void dumpStack(raw_ostream &o, const char *prefix); + + Filter &bestFilter() { + assert(BestIndex != -1 && "BestIndex not set"); + return Filters[BestIndex]; + } + + // Called from Filter::recurse() when singleton exists. For debug purpose. + void SingletonExists(unsigned Opc); + + bool PositionFiltered(unsigned i) { + return ValueSet(FilterBitValues[i]); + } + + // Calculates the island(s) needed to decode the instruction. + // This returns a lit of undecoded bits of an instructions, for example, + // Inst{20} = 1 && Inst{3-0} == 0b1111 represents two islands of yet-to-be + // decoded bits in order to verify that the instruction matches the Opcode. + unsigned getIslands(std::vector &StartBits, + std::vector &EndBits, std::vector &FieldVals, + insn_t &Insn); + + // Emits code to decode the singleton. Return true if we have matched all the + // well-known bits. + bool emitSingletonDecoder(raw_ostream &o, unsigned &Indentation,unsigned Opc); + + // Emits code to decode the singleton, and then to decode the rest. + void emitSingletonDecoder(raw_ostream &o, unsigned &Indentation,Filter &Best); + + // Assign a single filter and run with it. + void runSingleFilter(FilterChooser &owner, unsigned startBit, unsigned numBit, + bool mixed); + + // reportRegion is a helper function for filterProcessor to mark a region as + // eligible for use as a filter region. + void reportRegion(bitAttr_t RA, unsigned StartBit, unsigned BitIndex, + bool AllowMixed); + + // FilterProcessor scans the well-known encoding bits of the instructions and + // builds up a list of candidate filters. It chooses the best filter and + // recursively descends down the decoding tree. + bool filterProcessor(bool AllowMixed, bool Greedy = true); + + // Decides on the best configuration of filter(s) to use in order to decode + // the instructions. A conflict of instructions may occur, in which case we + // dump the conflict set to the standard error. + void doFilter(); + + // Emits code to decode our share of instructions. Returns true if the + // emitted code causes a return, which occurs if we know how to decode + // the instruction at this level or the instruction is not decodeable. + bool emit(raw_ostream &o, unsigned &Indentation); +}; + +/////////////////////////// +// // +// Filter Implmenetation // +// // +/////////////////////////// + +Filter::Filter(const Filter &f) : + Owner(f.Owner), StartBit(f.StartBit), NumBits(f.NumBits), Mixed(f.Mixed), + FilteredInstructions(f.FilteredInstructions), + VariableInstructions(f.VariableInstructions), + FilterChooserMap(f.FilterChooserMap), NumFiltered(f.NumFiltered), + LastOpcFiltered(f.LastOpcFiltered), NumVariable(f.NumVariable) { +} + +Filter::Filter(FilterChooser &owner, unsigned startBit, unsigned numBits, + bool mixed) : Owner(&owner), StartBit(startBit), NumBits(numBits), + Mixed(mixed) { + assert(StartBit + NumBits - 1 < BIT_WIDTH); + + NumFiltered = 0; + LastOpcFiltered = 0; + NumVariable = 0; + + for (unsigned i = 0, e = Owner->Opcodes.size(); i != e; ++i) { + insn_t Insn; + + // Populates the insn given the uid. + Owner->insnWithID(Insn, Owner->Opcodes[i]); + + uint64_t Field; + // Scans the segment for possibly well-specified encoding bits. + bool ok = Owner->fieldFromInsn(Field, Insn, StartBit, NumBits); + + if (ok) { + // The encoding bits are well-known. Lets add the uid of the + // instruction into the bucket keyed off the constant field value. + LastOpcFiltered = Owner->Opcodes[i]; + FilteredInstructions[Field].push_back(LastOpcFiltered); + ++NumFiltered; + } else { + // Some of the encoding bit(s) are unspecfied. This contributes to + // one additional member of "Variable" instructions. + VariableInstructions.push_back(Owner->Opcodes[i]); + ++NumVariable; + } + } + + assert((FilteredInstructions.size() + VariableInstructions.size() > 0) + && "Filter returns no instruction categories"); +} + +Filter::~Filter() { + std::map::iterator filterIterator; + for (filterIterator = FilterChooserMap.begin(); + filterIterator != FilterChooserMap.end(); + filterIterator++) { + delete filterIterator->second; + } +} + +// Divides the decoding task into sub tasks and delegates them to the +// inferior FilterChooser's. +// +// A special case arises when there's only one entry in the filtered +// instructions. In order to unambiguously decode the singleton, we need to +// match the remaining undecoded encoding bits against the singleton. +void Filter::recurse() { + std::map >::const_iterator mapIterator; + + bit_value_t BitValueArray[BIT_WIDTH]; + // Starts by inheriting our parent filter chooser's filter bit values. + memcpy(BitValueArray, Owner->FilterBitValues, sizeof(BitValueArray)); + + unsigned bitIndex; + + if (VariableInstructions.size()) { + // Conservatively marks each segment position as BIT_UNSET. + for (bitIndex = 0; bitIndex < NumBits; bitIndex++) + BitValueArray[StartBit + bitIndex] = BIT_UNSET; + + // Delegates to an inferior filter chooser for futher processing on this + // group of instructions whose segment values are variable. + FilterChooserMap.insert(std::pair( + (unsigned)-1, + new FilterChooser(Owner->AllInstructions, + VariableInstructions, + Owner->Operands, + BitValueArray, + *Owner) + )); + } + + // No need to recurse for a singleton filtered instruction. + // See also Filter::emit(). + if (getNumFiltered() == 1) { + //Owner->SingletonExists(LastOpcFiltered); + assert(FilterChooserMap.size() == 1); + return; + } + + // Otherwise, create sub choosers. + for (mapIterator = FilteredInstructions.begin(); + mapIterator != FilteredInstructions.end(); + mapIterator++) { + + // Marks all the segment positions with either BIT_TRUE or BIT_FALSE. + for (bitIndex = 0; bitIndex < NumBits; bitIndex++) { + if (mapIterator->first & (1ULL << bitIndex)) + BitValueArray[StartBit + bitIndex] = BIT_TRUE; + else + BitValueArray[StartBit + bitIndex] = BIT_FALSE; + } + + // Delegates to an inferior filter chooser for futher processing on this + // category of instructions. + FilterChooserMap.insert(std::pair( + mapIterator->first, + new FilterChooser(Owner->AllInstructions, + mapIterator->second, + Owner->Operands, + BitValueArray, + *Owner) + )); + } +} + +// Emit code to decode instructions given a segment or segments of bits. +void Filter::emit(raw_ostream &o, unsigned &Indentation) { + o.indent(Indentation) << "// Check Inst{"; + + if (NumBits > 1) + o << (StartBit + NumBits - 1) << '-'; + + o << StartBit << "} ...\n"; + + o.indent(Indentation) << "switch (fieldFromInstruction(insn, " + << StartBit << ", " << NumBits << ")) {\n"; + + std::map::iterator filterIterator; + + bool DefaultCase = false; + for (filterIterator = FilterChooserMap.begin(); + filterIterator != FilterChooserMap.end(); + filterIterator++) { + + // Field value -1 implies a non-empty set of variable instructions. + // See also recurse(). + if (filterIterator->first == (unsigned)-1) { + DefaultCase = true; + + o.indent(Indentation) << "default:\n"; + o.indent(Indentation) << " break; // fallthrough\n"; + + // Closing curly brace for the switch statement. + // This is unconventional because we want the default processing to be + // performed for the fallthrough cases as well, i.e., when the "cases" + // did not prove a decoded instruction. + o.indent(Indentation) << "}\n"; + + } else + o.indent(Indentation) << "case " << filterIterator->first << ":\n"; + + // We arrive at a category of instructions with the same segment value. + // Now delegate to the sub filter chooser for further decodings. + // The case may fallthrough, which happens if the remaining well-known + // encoding bits do not match exactly. + if (!DefaultCase) { ++Indentation; ++Indentation; } + + bool finished = filterIterator->second->emit(o, Indentation); + // For top level default case, there's no need for a break statement. + if (Owner->isTopLevel() && DefaultCase) + break; + if (!finished) + o.indent(Indentation) << "break;\n"; + + if (!DefaultCase) { --Indentation; --Indentation; } + } + + // If there is no default case, we still need to supply a closing brace. + if (!DefaultCase) { + // Closing curly brace for the switch statement. + o.indent(Indentation) << "}\n"; + } +} + +// Returns the number of fanout produced by the filter. More fanout implies +// the filter distinguishes more categories of instructions. +unsigned Filter::usefulness() const { + if (VariableInstructions.size()) + return FilteredInstructions.size(); + else + return FilteredInstructions.size() + 1; +} + +////////////////////////////////// +// // +// Filterchooser Implementation // +// // +////////////////////////////////// + +// Emit the top level typedef and decodeInstruction() function. +void FilterChooser::emitTop(raw_ostream &o, unsigned Indentation) { + switch (BIT_WIDTH) { + case 8: + o.indent(Indentation) << "typedef uint8_t field_t;\n"; + break; + case 16: + o.indent(Indentation) << "typedef uint16_t field_t;\n"; + break; + case 32: + o.indent(Indentation) << "typedef uint32_t field_t;\n"; + break; + case 64: + o.indent(Indentation) << "typedef uint64_t field_t;\n"; + break; + default: + assert(0 && "Unexpected instruction size!"); + } + + o << '\n'; + + o.indent(Indentation) << "static field_t " << + "fieldFromInstruction(field_t insn, unsigned startBit, unsigned numBits)\n"; + + o.indent(Indentation) << "{\n"; + + ++Indentation; ++Indentation; + o.indent(Indentation) << "assert(startBit + numBits <= " << BIT_WIDTH + << " && \"Instruction field out of bounds!\");\n"; + o << '\n'; + o.indent(Indentation) << "field_t fieldMask;\n"; + o << '\n'; + o.indent(Indentation) << "if (numBits == " << BIT_WIDTH << ")\n"; + + ++Indentation; ++Indentation; + o.indent(Indentation) << "fieldMask = (field_t)-1;\n"; + --Indentation; --Indentation; + + o.indent(Indentation) << "else\n"; + + ++Indentation; ++Indentation; + o.indent(Indentation) << "fieldMask = ((1 << numBits) - 1) << startBit;\n"; + --Indentation; --Indentation; + + o << '\n'; + o.indent(Indentation) << "return (insn & fieldMask) >> startBit;\n"; + --Indentation; --Indentation; + + o.indent(Indentation) << "}\n"; + + o << '\n'; + + o.indent(Indentation) << + "static bool decodeInstruction(MCInst &MI, field_t insn) {\n"; + o.indent(Indentation) << " unsigned tmp = 0;\n"; + + ++Indentation; ++Indentation; + // Emits code to decode the instructions. + emit(o, Indentation); + + o << '\n'; + o.indent(Indentation) << "return false;\n"; + --Indentation; --Indentation; + + o.indent(Indentation) << "}\n"; + + o << '\n'; +} + +// Populates the field of the insn given the start position and the number of +// consecutive bits to scan for. +// +// Returns false if and on the first uninitialized bit value encountered. +// Returns true, otherwise. +bool FilterChooser::fieldFromInsn(uint64_t &Field, insn_t &Insn, + unsigned StartBit, unsigned NumBits) const { + Field = 0; + + for (unsigned i = 0; i < NumBits; ++i) { + if (Insn[StartBit + i] == BIT_UNSET) + return false; + + if (Insn[StartBit + i] == BIT_TRUE) + Field = Field | (1ULL << i); + } + + return true; +} + +/// dumpFilterArray - dumpFilterArray prints out debugging info for the given +/// filter array as a series of chars. +void FilterChooser::dumpFilterArray(raw_ostream &o, + bit_value_t (&filter)[BIT_WIDTH]) { + unsigned bitIndex; + + for (bitIndex = BIT_WIDTH; bitIndex > 0; bitIndex--) { + switch (filter[bitIndex - 1]) { + case BIT_UNFILTERED: + o << "."; + break; + case BIT_UNSET: + o << "_"; + break; + case BIT_TRUE: + o << "1"; + break; + case BIT_FALSE: + o << "0"; + break; + } + } +} + +/// dumpStack - dumpStack traverses the filter chooser chain and calls +/// dumpFilterArray on each filter chooser up to the top level one. +void FilterChooser::dumpStack(raw_ostream &o, const char *prefix) { + FilterChooser *current = this; + + while (current) { + o << prefix; + dumpFilterArray(o, current->FilterBitValues); + o << '\n'; + current = current->Parent; + } +} + +// Called from Filter::recurse() when singleton exists. For debug purpose. +void FilterChooser::SingletonExists(unsigned Opc) { + insn_t Insn0; + insnWithID(Insn0, Opc); + + errs() << "Singleton exists: " << nameWithID(Opc) + << " with its decoding dominating "; + for (unsigned i = 0; i < Opcodes.size(); ++i) { + if (Opcodes[i] == Opc) continue; + errs() << nameWithID(Opcodes[i]) << ' '; + } + errs() << '\n'; + + dumpStack(errs(), "\t\t"); + for (unsigned i = 0; i < Opcodes.size(); i++) { + const std::string &Name = nameWithID(Opcodes[i]); + + errs() << '\t' << Name << " "; + dumpBits(errs(), + getBitsField(*AllInstructions[Opcodes[i]]->TheDef, "Inst")); + errs() << '\n'; + } +} + +// Calculates the island(s) needed to decode the instruction. +// This returns a list of undecoded bits of an instructions, for example, +// Inst{20} = 1 && Inst{3-0} == 0b1111 represents two islands of yet-to-be +// decoded bits in order to verify that the instruction matches the Opcode. +unsigned FilterChooser::getIslands(std::vector &StartBits, + std::vector &EndBits, std::vector &FieldVals, + insn_t &Insn) { + unsigned Num, BitNo; + Num = BitNo = 0; + + uint64_t FieldVal = 0; + + // 0: Init + // 1: Water (the bit value does not affect decoding) + // 2: Island (well-known bit value needed for decoding) + int State = 0; + int Val = -1; + + for (unsigned i = 0; i < BIT_WIDTH; ++i) { + Val = Value(Insn[i]); + bool Filtered = PositionFiltered(i); + switch (State) { + default: + assert(0 && "Unreachable code!"); + break; + case 0: + case 1: + if (Filtered || Val == -1) + State = 1; // Still in Water + else { + State = 2; // Into the Island + BitNo = 0; + StartBits.push_back(i); + FieldVal = Val; + } + break; + case 2: + if (Filtered || Val == -1) { + State = 1; // Into the Water + EndBits.push_back(i - 1); + FieldVals.push_back(FieldVal); + ++Num; + } else { + State = 2; // Still in Island + ++BitNo; + FieldVal = FieldVal | Val << BitNo; + } + break; + } + } + // If we are still in Island after the loop, do some housekeeping. + if (State == 2) { + EndBits.push_back(BIT_WIDTH - 1); + FieldVals.push_back(FieldVal); + ++Num; + } + + assert(StartBits.size() == Num && EndBits.size() == Num && + FieldVals.size() == Num); + return Num; +} + +// Emits code to decode the singleton. Return true if we have matched all the +// well-known bits. +bool FilterChooser::emitSingletonDecoder(raw_ostream &o, unsigned &Indentation, + unsigned Opc) { + std::vector StartBits; + std::vector EndBits; + std::vector FieldVals; + insn_t Insn; + insnWithID(Insn, Opc); + + // Look for islands of undecoded bits of the singleton. + getIslands(StartBits, EndBits, FieldVals, Insn); + + unsigned Size = StartBits.size(); + unsigned I, NumBits; + + // If we have matched all the well-known bits, just issue a return. + if (Size == 0) { + o.indent(Indentation) << "{\n"; + o.indent(Indentation) << " MI.setOpcode(" << Opc << ");\n"; + std::vector& InsnOperands = Operands[Opc]; + for (std::vector::iterator + I = InsnOperands.begin(), E = InsnOperands.end(); I != E; ++I) { + // If a custom instruction decoder was specified, use that. + if (I->FieldBase == ~0U && I->FieldLength == ~0U) { + o.indent(Indentation) << " " << I->Decoder << "(MI, insn);\n"; + break; + } + + o.indent(Indentation) + << " tmp = fieldFromInstruction(insn, " << I->FieldBase + << ", " << I->FieldLength << ");\n"; + if (I->Decoder != "") { + o.indent(Indentation) << " " << I->Decoder << "(MI, tmp);\n"; + } else { + o.indent(Indentation) + << " MI.addOperand(MCOperand::CreateImm(tmp));\n"; + } + } + + o.indent(Indentation) << " return true; // " << nameWithID(Opc) + << '\n'; + o.indent(Indentation) << "}\n"; + return true; + } + + // Otherwise, there are more decodings to be done! + + // Emit code to match the island(s) for the singleton. + o.indent(Indentation) << "// Check "; + + for (I = Size; I != 0; --I) { + o << "Inst{" << EndBits[I-1] << '-' << StartBits[I-1] << "} "; + if (I > 1) + o << "&& "; + else + o << "for singleton decoding...\n"; + } + + o.indent(Indentation) << "if ("; + + for (I = Size; I != 0; --I) { + NumBits = EndBits[I-1] - StartBits[I-1] + 1; + o << "fieldFromInstruction(insn, " << StartBits[I-1] << ", " << NumBits + << ") == " << FieldVals[I-1]; + if (I > 1) + o << " && "; + else + o << ") {\n"; + } + o.indent(Indentation) << " MI.setOpcode(" << Opc << ");\n"; + std::vector& InsnOperands = Operands[Opc]; + for (std::vector::iterator + I = InsnOperands.begin(), E = InsnOperands.end(); I != E; ++I) { + // If a custom instruction decoder was specified, use that. + if (I->FieldBase == ~0U && I->FieldLength == ~0U) { + o.indent(Indentation) << " " << I->Decoder << "(MI, insn);\n"; + break; + } + + o.indent(Indentation) + << " tmp = fieldFromInstruction(insn, " << I->FieldBase + << ", " << I->FieldLength << ");\n"; + if (I->Decoder != "") { + o.indent(Indentation) << " " << I->Decoder << "(MI, tmp);\n"; + } else { + o.indent(Indentation) + << " MI.addOperand(MCOperand::CreateImm(tmp));\n"; + } + } + o.indent(Indentation) << " return true; // " << nameWithID(Opc) + << '\n'; + o.indent(Indentation) << "}\n"; + + return false; +} + +// Emits code to decode the singleton, and then to decode the rest. +void FilterChooser::emitSingletonDecoder(raw_ostream &o, unsigned &Indentation, + Filter &Best) { + + unsigned Opc = Best.getSingletonOpc(); + + emitSingletonDecoder(o, Indentation, Opc); + + // Emit code for the rest. + o.indent(Indentation) << "else\n"; + + Indentation += 2; + Best.getVariableFC().emit(o, Indentation); + Indentation -= 2; +} + +// Assign a single filter and run with it. Top level API client can initialize +// with a single filter to start the filtering process. +void FilterChooser::runSingleFilter(FilterChooser &owner, unsigned startBit, + unsigned numBit, bool mixed) { + Filters.clear(); + Filter F(*this, startBit, numBit, true); + Filters.push_back(F); + BestIndex = 0; // Sole Filter instance to choose from. + bestFilter().recurse(); +} + +// reportRegion is a helper function for filterProcessor to mark a region as +// eligible for use as a filter region. +void FilterChooser::reportRegion(bitAttr_t RA, unsigned StartBit, + unsigned BitIndex, bool AllowMixed) { + if (RA == ATTR_MIXED && AllowMixed) + Filters.push_back(Filter(*this, StartBit, BitIndex - StartBit, true)); + else if (RA == ATTR_ALL_SET && !AllowMixed) + Filters.push_back(Filter(*this, StartBit, BitIndex - StartBit, false)); +} + +// FilterProcessor scans the well-known encoding bits of the instructions and +// builds up a list of candidate filters. It chooses the best filter and +// recursively descends down the decoding tree. +bool FilterChooser::filterProcessor(bool AllowMixed, bool Greedy) { + Filters.clear(); + BestIndex = -1; + unsigned numInstructions = Opcodes.size(); + + assert(numInstructions && "Filter created with no instructions"); + + // No further filtering is necessary. + if (numInstructions == 1) + return true; + + // Heuristics. See also doFilter()'s "Heuristics" comment when num of + // instructions is 3. + if (AllowMixed && !Greedy) { + assert(numInstructions == 3); + + for (unsigned i = 0; i < Opcodes.size(); ++i) { + std::vector StartBits; + std::vector EndBits; + std::vector FieldVals; + insn_t Insn; + + insnWithID(Insn, Opcodes[i]); + + // Look for islands of undecoded bits of any instruction. + if (getIslands(StartBits, EndBits, FieldVals, Insn) > 0) { + // Found an instruction with island(s). Now just assign a filter. + runSingleFilter(*this, StartBits[0], EndBits[0] - StartBits[0] + 1, + true); + return true; + } + } + } + + unsigned BitIndex, InsnIndex; + + // We maintain BIT_WIDTH copies of the bitAttrs automaton. + // The automaton consumes the corresponding bit from each + // instruction. + // + // Input symbols: 0, 1, and _ (unset). + // States: NONE, FILTERED, ALL_SET, ALL_UNSET, and MIXED. + // Initial state: NONE. + // + // (NONE) ------- [01] -> (ALL_SET) + // (NONE) ------- _ ----> (ALL_UNSET) + // (ALL_SET) ---- [01] -> (ALL_SET) + // (ALL_SET) ---- _ ----> (MIXED) + // (ALL_UNSET) -- [01] -> (MIXED) + // (ALL_UNSET) -- _ ----> (ALL_UNSET) + // (MIXED) ------ . ----> (MIXED) + // (FILTERED)---- . ----> (FILTERED) + + bitAttr_t bitAttrs[BIT_WIDTH]; + + // FILTERED bit positions provide no entropy and are not worthy of pursuing. + // Filter::recurse() set either BIT_TRUE or BIT_FALSE for each position. + for (BitIndex = 0; BitIndex < BIT_WIDTH; ++BitIndex) + if (FilterBitValues[BitIndex] == BIT_TRUE || + FilterBitValues[BitIndex] == BIT_FALSE) + bitAttrs[BitIndex] = ATTR_FILTERED; + else + bitAttrs[BitIndex] = ATTR_NONE; + + for (InsnIndex = 0; InsnIndex < numInstructions; ++InsnIndex) { + insn_t insn; + + insnWithID(insn, Opcodes[InsnIndex]); + + for (BitIndex = 0; BitIndex < BIT_WIDTH; ++BitIndex) { + switch (bitAttrs[BitIndex]) { + case ATTR_NONE: + if (insn[BitIndex] == BIT_UNSET) + bitAttrs[BitIndex] = ATTR_ALL_UNSET; + else + bitAttrs[BitIndex] = ATTR_ALL_SET; + break; + case ATTR_ALL_SET: + if (insn[BitIndex] == BIT_UNSET) + bitAttrs[BitIndex] = ATTR_MIXED; + break; + case ATTR_ALL_UNSET: + if (insn[BitIndex] != BIT_UNSET) + bitAttrs[BitIndex] = ATTR_MIXED; + break; + case ATTR_MIXED: + case ATTR_FILTERED: + break; + } + } + } + + // The regionAttr automaton consumes the bitAttrs automatons' state, + // lowest-to-highest. + // + // Input symbols: F(iltered), (all_)S(et), (all_)U(nset), M(ixed) + // States: NONE, ALL_SET, MIXED + // Initial state: NONE + // + // (NONE) ----- F --> (NONE) + // (NONE) ----- S --> (ALL_SET) ; and set region start + // (NONE) ----- U --> (NONE) + // (NONE) ----- M --> (MIXED) ; and set region start + // (ALL_SET) -- F --> (NONE) ; and report an ALL_SET region + // (ALL_SET) -- S --> (ALL_SET) + // (ALL_SET) -- U --> (NONE) ; and report an ALL_SET region + // (ALL_SET) -- M --> (MIXED) ; and report an ALL_SET region + // (MIXED) ---- F --> (NONE) ; and report a MIXED region + // (MIXED) ---- S --> (ALL_SET) ; and report a MIXED region + // (MIXED) ---- U --> (NONE) ; and report a MIXED region + // (MIXED) ---- M --> (MIXED) + + bitAttr_t RA = ATTR_NONE; + unsigned StartBit = 0; + + for (BitIndex = 0; BitIndex < BIT_WIDTH; BitIndex++) { + bitAttr_t bitAttr = bitAttrs[BitIndex]; + + assert(bitAttr != ATTR_NONE && "Bit without attributes"); + + switch (RA) { + case ATTR_NONE: + switch (bitAttr) { + case ATTR_FILTERED: + break; + case ATTR_ALL_SET: + StartBit = BitIndex; + RA = ATTR_ALL_SET; + break; + case ATTR_ALL_UNSET: + break; + case ATTR_MIXED: + StartBit = BitIndex; + RA = ATTR_MIXED; + break; + default: + assert(0 && "Unexpected bitAttr!"); + } + break; + case ATTR_ALL_SET: + switch (bitAttr) { + case ATTR_FILTERED: + reportRegion(RA, StartBit, BitIndex, AllowMixed); + RA = ATTR_NONE; + break; + case ATTR_ALL_SET: + break; + case ATTR_ALL_UNSET: + reportRegion(RA, StartBit, BitIndex, AllowMixed); + RA = ATTR_NONE; + break; + case ATTR_MIXED: + reportRegion(RA, StartBit, BitIndex, AllowMixed); + StartBit = BitIndex; + RA = ATTR_MIXED; + break; + default: + assert(0 && "Unexpected bitAttr!"); + } + break; + case ATTR_MIXED: + switch (bitAttr) { + case ATTR_FILTERED: + reportRegion(RA, StartBit, BitIndex, AllowMixed); + StartBit = BitIndex; + RA = ATTR_NONE; + break; + case ATTR_ALL_SET: + reportRegion(RA, StartBit, BitIndex, AllowMixed); + StartBit = BitIndex; + RA = ATTR_ALL_SET; + break; + case ATTR_ALL_UNSET: + reportRegion(RA, StartBit, BitIndex, AllowMixed); + RA = ATTR_NONE; + break; + case ATTR_MIXED: + break; + default: + assert(0 && "Unexpected bitAttr!"); + } + break; + case ATTR_ALL_UNSET: + assert(0 && "regionAttr state machine has no ATTR_UNSET state"); + case ATTR_FILTERED: + assert(0 && "regionAttr state machine has no ATTR_FILTERED state"); + } + } + + // At the end, if we're still in ALL_SET or MIXED states, report a region + switch (RA) { + case ATTR_NONE: + break; + case ATTR_FILTERED: + break; + case ATTR_ALL_SET: + reportRegion(RA, StartBit, BitIndex, AllowMixed); + break; + case ATTR_ALL_UNSET: + break; + case ATTR_MIXED: + reportRegion(RA, StartBit, BitIndex, AllowMixed); + break; + } + + // We have finished with the filter processings. Now it's time to choose + // the best performing filter. + BestIndex = 0; + bool AllUseless = true; + unsigned BestScore = 0; + + for (unsigned i = 0, e = Filters.size(); i != e; ++i) { + unsigned Usefulness = Filters[i].usefulness(); + + if (Usefulness) + AllUseless = false; + + if (Usefulness > BestScore) { + BestIndex = i; + BestScore = Usefulness; + } + } + + if (!AllUseless) + bestFilter().recurse(); + + return !AllUseless; +} // end of FilterChooser::filterProcessor(bool) + +// Decides on the best configuration of filter(s) to use in order to decode +// the instructions. A conflict of instructions may occur, in which case we +// dump the conflict set to the standard error. +void FilterChooser::doFilter() { + unsigned Num = Opcodes.size(); + assert(Num && "FilterChooser created with no instructions"); + + // Try regions of consecutive known bit values first. + if (filterProcessor(false)) + return; + + // Then regions of mixed bits (both known and unitialized bit values allowed). + if (filterProcessor(true)) + return; + + // Heuristics to cope with conflict set {t2CMPrs, t2SUBSrr, t2SUBSrs} where + // no single instruction for the maximum ATTR_MIXED region Inst{14-4} has a + // well-known encoding pattern. In such case, we backtrack and scan for the + // the very first consecutive ATTR_ALL_SET region and assign a filter to it. + if (Num == 3 && filterProcessor(true, false)) + return; + + // If we come to here, the instruction decoding has failed. + // Set the BestIndex to -1 to indicate so. + BestIndex = -1; +} + +// Emits code to decode our share of instructions. Returns true if the +// emitted code causes a return, which occurs if we know how to decode +// the instruction at this level or the instruction is not decodeable. +bool FilterChooser::emit(raw_ostream &o, unsigned &Indentation) { + if (Opcodes.size() == 1) + // There is only one instruction in the set, which is great! + // Call emitSingletonDecoder() to see whether there are any remaining + // encodings bits. + return emitSingletonDecoder(o, Indentation, Opcodes[0]); + + // Choose the best filter to do the decodings! + if (BestIndex != -1) { + Filter &Best = bestFilter(); + if (Best.getNumFiltered() == 1) + emitSingletonDecoder(o, Indentation, Best); + else + bestFilter().emit(o, Indentation); + return false; + } + + // We don't know how to decode these instructions! Return 0 and dump the + // conflict set! + o.indent(Indentation) << "return 0;" << " // Conflict set: "; + for (int i = 0, N = Opcodes.size(); i < N; ++i) { + o << nameWithID(Opcodes[i]); + if (i < (N - 1)) + o << ", "; + else + o << '\n'; + } + + // Print out useful conflict information for postmortem analysis. + errs() << "Decoding Conflict:\n"; + + dumpStack(errs(), "\t\t"); + + for (unsigned i = 0; i < Opcodes.size(); i++) { + const std::string &Name = nameWithID(Opcodes[i]); + + errs() << '\t' << Name << " "; + dumpBits(errs(), + getBitsField(*AllInstructions[Opcodes[i]]->TheDef, "Inst")); + errs() << '\n'; + } + + return true; +} + +bool FixedLenDecoderEmitter::populateInstruction(const CodeGenInstruction &CGI, + unsigned Opc){ + const Record &Def = *CGI.TheDef; + // If all the bit positions are not specified; do not decode this instruction. + // We are bound to fail! For proper disassembly, the well-known encoding bits + // of the instruction must be fully specified. + // + // This also removes pseudo instructions from considerations of disassembly, + // which is a better design and less fragile than the name matchings. + BitsInit &Bits = getBitsField(Def, "Inst"); + if (Bits.allInComplete()) return false; + + // Ignore "asm parser only" instructions. + if (Def.getValueAsBit("isAsmParserOnly")) + return false; + + std::vector InsnOperands; + + // If the instruction has specified a custom decoding hook, use that instead + // of trying to auto-generate the decoder. + std::string InstDecoder = Def.getValueAsString("DecoderMethod"); + if (InstDecoder != "") { + InsnOperands.push_back(OperandInfo(~0U, ~0U, InstDecoder)); + Operands[Opc] = InsnOperands; + return true; + } + + // Generate a description of the operand of the instruction that we know + // how to decode automatically. + // FIXME: We'll need to have a way to manually override this as needed. + + // Gather the outputs/inputs of the instruction, so we can find their + // positions in the encoding. This assumes for now that they appear in the + // MCInst in the order that they're listed. + std::vector > InOutOperands; + DagInit *Out = Def.getValueAsDag("OutOperandList"); + DagInit *In = Def.getValueAsDag("InOperandList"); + for (unsigned i = 0; i < Out->getNumArgs(); ++i) + InOutOperands.push_back(std::make_pair(Out->getArg(i), Out->getArgName(i))); + for (unsigned i = 0; i < In->getNumArgs(); ++i) + InOutOperands.push_back(std::make_pair(In->getArg(i), In->getArgName(i))); + + // For each operand, see if we can figure out where it is encoded. + for (std::vector >::iterator + NI = InOutOperands.begin(), NE = InOutOperands.end(); NI != NE; ++NI) { + unsigned PrevBit = ~0; + unsigned Base = ~0; + unsigned PrevPos = ~0; + std::string Decoder = ""; + + for (unsigned bi = 0; bi < Bits.getNumBits(); ++bi) { + VarBitInit *BI = dynamic_cast(Bits.getBit(bi)); + if (!BI) continue; + + VarInit *Var = dynamic_cast(BI->getVariable()); + assert(Var); + unsigned CurrBit = BI->getBitNum(); + if (Var->getName() != NI->second) continue; + + // Figure out the lowest bit of the value, and the width of the field. + // Deliberately don't try to handle cases where the field is scattered, + // or where not all bits of the the field are explicit. + if (Base == ~0U && PrevBit == ~0U && PrevPos == ~0U) { + if (CurrBit == 0) + Base = bi; + else + continue; + } + + if ((PrevPos != ~0U && bi-1 != PrevPos) || + (CurrBit != ~0U && CurrBit-1 != PrevBit)) { + PrevBit = ~0; + Base = ~0; + PrevPos = ~0; + } + + PrevPos = bi; + PrevBit = CurrBit; + + // At this point, we can locate the field, but we need to know how to + // interpret it. As a first step, require the target to provide callbacks + // for decoding register classes. + // FIXME: This need to be extended to handle instructions with custom + // decoder methods, and operands with (simple) MIOperandInfo's. + TypedInit *TI = dynamic_cast(NI->first); + RecordRecTy *Type = dynamic_cast(TI->getType()); + Record *TypeRecord = Type->getRecord(); + bool isReg = false; + if (TypeRecord->isSubClassOf("RegisterClass")) { + Decoder = "Decode" + Type->getRecord()->getName() + "RegisterClass"; + isReg = true; + } + + RecordVal *DecoderString = TypeRecord->getValue("DecoderMethod"); + StringInit *String = DecoderString ? + dynamic_cast(DecoderString->getValue()) : + 0; + if (!isReg && String && String->getValue() != "") + Decoder = String->getValue(); + } + + if (Base != ~0U) { + InsnOperands.push_back(OperandInfo(Base, PrevBit+1, Decoder)); + DEBUG(errs() << "ENCODED OPERAND: $" << NI->second << " @ (" + << utostr(Base+PrevBit) << ", " << utostr(Base) << ")\n"); + } + } + + Operands[Opc] = InsnOperands; + + +#if 0 + DEBUG({ + // Dumps the instruction encoding bits. + dumpBits(errs(), Bits); + + errs() << '\n'; + + // Dumps the list of operand info. + for (unsigned i = 0, e = CGI.Operands.size(); i != e; ++i) { + const CGIOperandList::OperandInfo &Info = CGI.Operands[i]; + const std::string &OperandName = Info.Name; + const Record &OperandDef = *Info.Rec; + + errs() << "\t" << OperandName << " (" << OperandDef.getName() << ")\n"; + } + }); +#endif + + return true; +} + +void FixedLenDecoderEmitter::populateInstructions() { + for (unsigned i = 0, e = NumberedInstructions.size(); i < e; ++i) { + Record *R = NumberedInstructions[i]->TheDef; + if (R->getValueAsString("Namespace") == "TargetOpcode") + continue; + + if (populateInstruction(*NumberedInstructions[i], i)) + Opcodes.push_back(i); + } +} + +// Emits disassembler code for instruction decoding. +void FixedLenDecoderEmitter::run(raw_ostream &o) +{ + o << "#include \"llvm/MC/MCInst.h\"\n"; + o << "#include \"llvm/Support/DataTypes.h\"\n"; + o << "#include \n"; + o << '\n'; + o << "namespace llvm {\n\n"; + + NumberedInstructions = Target.getInstructionsByEnumValue(); + populateInstructions(); + FilterChooser FC(NumberedInstructions, Opcodes, Operands); + FC.emitTop(o, 0); + + o << "\n} // End llvm namespace \n"; +} Added: llvm/trunk/utils/TableGen/FixedLenDecoderEmitter.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/FixedLenDecoderEmitter.h?rev=125966&view=auto ============================================================================== --- llvm/trunk/utils/TableGen/FixedLenDecoderEmitter.h (added) +++ llvm/trunk/utils/TableGen/FixedLenDecoderEmitter.h Fri Feb 18 15:51:29 2011 @@ -0,0 +1,56 @@ +//===------------ FixedLenDecoderEmitter.h - Decoder Generator --*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// It contains the tablegen backend that emits the decoder functions for +// targets with fixed length instruction set. +// +//===----------------------------------------------------------------------===// + +#ifndef FixedLenDECODEREMITTER_H +#define FixedLenDECODEREMITTER_H + +#include "CodeGenTarget.h" +#include "TableGenBackend.h" + +#include "llvm/Support/DataTypes.h" + +namespace llvm { + +struct OperandInfo { + unsigned FieldBase; + unsigned FieldLength; + std::string Decoder; + + OperandInfo(unsigned FB, unsigned FL, std::string D) + : FieldBase(FB), FieldLength(FL), Decoder(D) { } +}; + +class FixedLenDecoderEmitter : public TableGenBackend { +public: + FixedLenDecoderEmitter(RecordKeeper &R) : + Records(R), Target(R), + NumberedInstructions(Target.getInstructionsByEnumValue()) {} + + // run - Output the code emitter + void run(raw_ostream &o); + +private: + RecordKeeper &Records; + CodeGenTarget Target; + std::vector NumberedInstructions; + std::vector Opcodes; + std::map > Operands; + + bool populateInstruction(const CodeGenInstruction &CGI, unsigned Opc); + void populateInstructions(); +}; + +} // end llvm namespace + +#endif From stoklund at 2pi.dk Fri Feb 18 16:03:19 2011 From: stoklund at 2pi.dk (Jakob Stoklund Olesen) Date: Fri, 18 Feb 2011 22:03:19 -0000 Subject: [llvm-commits] [llvm] r125967 - in /llvm/trunk/lib/CodeGen: RegAllocBasic.cpp RegAllocGreedy.cpp VirtRegMap.cpp VirtRegMap.h Message-ID: <20110218220319.1966A2A6C12C@llvm.org> Author: stoklund Date: Fri Feb 18 16:03:18 2011 New Revision: 125967 URL: http://llvm.org/viewvc/llvm-project?rev=125967&view=rev Log: Add VirtRegMap::rewrite() and use it in the new register allocators. The rewriter works almost identically to -rewriter=trivial, except it also eliminates any identity copies. This makes the new register allocators independent of VirtRegRewriter.cpp which will be going away at the same time as RegAllocLinearScan. Modified: llvm/trunk/lib/CodeGen/RegAllocBasic.cpp llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp llvm/trunk/lib/CodeGen/VirtRegMap.cpp llvm/trunk/lib/CodeGen/VirtRegMap.h Modified: llvm/trunk/lib/CodeGen/RegAllocBasic.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocBasic.cpp?rev=125967&r1=125966&r2=125967&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/RegAllocBasic.cpp (original) +++ llvm/trunk/lib/CodeGen/RegAllocBasic.cpp Fri Feb 18 16:03:18 2011 @@ -18,7 +18,6 @@ #include "RenderMachineFunction.h" #include "Spiller.h" #include "VirtRegMap.h" -#include "VirtRegRewriter.h" #include "llvm/ADT/OwningPtr.h" #include "llvm/ADT/Statistic.h" #include "llvm/Analysis/AliasAnalysis.h" @@ -510,8 +509,7 @@ #endif // !NDEBUG // Run rewriter - std::auto_ptr rewriter(createVirtRegRewriter()); - rewriter->runOnMachineFunction(*MF, *VRM, LIS); + VRM->rewrite(LIS->getSlotIndexes()); // The pass output is in VirtRegMap. Release all the transient data. releaseMemory(); Modified: llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp?rev=125967&r1=125966&r2=125967&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp (original) +++ llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp Fri Feb 18 16:03:18 2011 @@ -21,7 +21,6 @@ #include "SpillPlacement.h" #include "SplitKit.h" #include "VirtRegMap.h" -#include "VirtRegRewriter.h" #include "llvm/ADT/Statistic.h" #include "llvm/Analysis/AliasAnalysis.h" #include "llvm/Function.h" @@ -1273,8 +1272,7 @@ // Run rewriter { NamedRegionTimer T("Rewriter", TimerGroupName, TimePassesIsEnabled); - std::auto_ptr rewriter(createVirtRegRewriter()); - rewriter->runOnMachineFunction(*MF, *VRM, LIS); + VRM->rewrite(Indexes); } // The pass output is in VirtRegMap. Release all the transient data. Modified: llvm/trunk/lib/CodeGen/VirtRegMap.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/VirtRegMap.cpp?rev=125967&r1=125966&r2=125967&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/VirtRegMap.cpp (original) +++ llvm/trunk/lib/CodeGen/VirtRegMap.cpp Fri Feb 18 16:03:18 2011 @@ -24,6 +24,7 @@ #include "llvm/CodeGen/MachineFunction.h" #include "llvm/CodeGen/MachineInstrBuilder.h" #include "llvm/CodeGen/MachineRegisterInfo.h" +#include "llvm/CodeGen/SlotIndexes.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetRegisterInfo.h" @@ -254,6 +255,76 @@ return AnyUnused; } +void VirtRegMap::rewrite(SlotIndexes *Indexes) { + DEBUG(dbgs() << "********** REWRITE VIRTUAL REGISTERS **********\n" + << "********** Function: " + << MF->getFunction()->getName() << '\n'); + + SmallVector SuperKills; + + for (MachineFunction::iterator MBBI = MF->begin(), MBBE = MF->end(); + MBBI != MBBE; ++MBBI) { + DEBUG(MBBI->print(dbgs(), Indexes)); + for (MachineBasicBlock::iterator MII = MBBI->begin(), MIE = MBBI->end(); + MII != MIE;) { + MachineInstr *MI = MII; + ++MII; + + for (MachineInstr::mop_iterator MOI = MI->operands_begin(), + MOE = MI->operands_end(); MOI != MOE; ++MOI) { + MachineOperand &MO = *MOI; + if (!MO.isReg() || !TargetRegisterInfo::isVirtualRegister(MO.getReg())) + continue; + unsigned VirtReg = MO.getReg(); + unsigned PhysReg = getPhys(VirtReg); + assert(PhysReg != NO_PHYS_REG && "Instruction uses unmapped VirtReg"); + + // Preserve semantics of sub-register operands. + if (MO.getSubReg()) { + // A virtual register kill refers to the whole register, so we may + // have to add operands for the super-register. + if (MO.isUse() && MO.isKill() && !MO.isUndef()) + SuperKills.push_back(PhysReg); + + // We don't have to deal with sub-register defs because + // LiveIntervalAnalysis already added the necessary + // operands. + + // PhysReg operands cannot have subregister indexes. + PhysReg = TRI->getSubReg(PhysReg, MO.getSubReg()); + assert(PhysReg && "Invalid SubReg for physical register"); + MO.setSubReg(0); + } + // Rewrite. Note we could have used MachineOperand::substPhysReg(), but + // we need the inlining here. + MO.setReg(PhysReg); + } + + // Add any missing super-register kills after rewriting the whole + // instruction. + while (!SuperKills.empty()) + MI->addRegisterKilled(SuperKills.pop_back_val(), TRI, true); + + DEBUG(dbgs() << "> " << *MI); + + // Finally, remove any identity copies. + if (MI->isIdentityCopy()) { + DEBUG(dbgs() << "Deleting identity copy.\n"); + RemoveMachineInstrFromMaps(MI); + if (Indexes) + Indexes->removeMachineInstrFromMaps(MI); + // It's safe to erase MI because MII has already been incremented. + MI->eraseFromParent(); + } + } + } + + // Tell MRI about physical registers in use. + for (unsigned Reg = 1, RegE = TRI->getNumRegs(); Reg != RegE; ++Reg) + if (!MRI->reg_nodbg_empty(Reg)) + MRI->setPhysRegUsed(Reg); +} + void VirtRegMap::print(raw_ostream &OS, const Module* M) const { const TargetRegisterInfo* TRI = MF->getTarget().getRegisterInfo(); const MachineRegisterInfo &MRI = MF->getRegInfo(); Modified: llvm/trunk/lib/CodeGen/VirtRegMap.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/VirtRegMap.h?rev=125967&r1=125966&r2=125967&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/VirtRegMap.h (original) +++ llvm/trunk/lib/CodeGen/VirtRegMap.h Fri Feb 18 16:03:18 2011 @@ -35,6 +35,7 @@ class TargetInstrInfo; class TargetRegisterInfo; class raw_ostream; + class SlotIndexes; class VirtRegMap : public MachineFunctionPass { public: @@ -493,6 +494,13 @@ return 0; } + /// rewrite - Rewrite all instructions in MF to use only physical registers + /// by mapping all virtual register operands to their assigned physical + /// registers. + /// + /// @param Indexes Optionally remove deleted instructions from indexes. + void rewrite(SlotIndexes *Indexes); + void print(raw_ostream &OS, const Module* M = 0) const; void dump() const; }; From ofv at wanadoo.es Fri Feb 18 16:06:14 2011 From: ofv at wanadoo.es (Oscar Fuentes) Date: Fri, 18 Feb 2011 22:06:14 -0000 Subject: [llvm-commits] [llvm] r125968 - in /llvm/trunk: CMakeLists.txt cmake/modules/AddLLVM.cmake cmake/modules/CMakeLists.txt cmake/modules/LLVMConfig.cmake lib/Analysis/CMakeLists.txt lib/Bitcode/CMakeLists.txt lib/CMakeLists.txt lib/CodeGen/CMakeLists.txt lib/ExecutionEngine/CMakeLists.txt lib/MC/CMakeLists.txt lib/Target/CMakeLists.txt lib/Transforms/CMakeLists.txt tools/llvm-config/CMakeLists.txt Message-ID: <20110218220615.14A212A6C12C@llvm.org> Author: ofv Date: Fri Feb 18 16:06:14 2011 New Revision: 125968 URL: http://llvm.org/viewvc/llvm-project?rev=125968&view=rev Log: Move library stuff out of the toplevel CMakeLists.txt file. Added: llvm/trunk/lib/Bitcode/CMakeLists.txt llvm/trunk/lib/CMakeLists.txt llvm/trunk/lib/Transforms/CMakeLists.txt Modified: llvm/trunk/CMakeLists.txt llvm/trunk/cmake/modules/AddLLVM.cmake llvm/trunk/cmake/modules/CMakeLists.txt llvm/trunk/cmake/modules/LLVMConfig.cmake llvm/trunk/lib/Analysis/CMakeLists.txt llvm/trunk/lib/CodeGen/CMakeLists.txt llvm/trunk/lib/ExecutionEngine/CMakeLists.txt llvm/trunk/lib/MC/CMakeLists.txt llvm/trunk/lib/Target/CMakeLists.txt llvm/trunk/tools/llvm-config/CMakeLists.txt Modified: llvm/trunk/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=125968&r1=125967&r2=125968&view=diff ============================================================================== --- llvm/trunk/CMakeLists.txt (original) +++ llvm/trunk/CMakeLists.txt Fri Feb 18 16:06:14 2011 @@ -195,11 +195,9 @@ llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "-O2") endif() +# Put this before tblgen. Else we have a circular dependence. add_subdirectory(lib/Support) -# Everything else depends on Support: -set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} ${LLVM_LIBS} ) - set(LLVM_TABLEGEN "tblgen" CACHE STRING "Native TableGen executable. Saves building one when cross-compiling.") # Effective tblgen executable to be used: @@ -214,25 +212,7 @@ add_subdirectory(include/llvm) -add_subdirectory(lib/VMCore) -add_subdirectory(lib/CodeGen) -add_subdirectory(lib/CodeGen/SelectionDAG) -add_subdirectory(lib/CodeGen/AsmPrinter) -add_subdirectory(lib/Bitcode/Reader) -add_subdirectory(lib/Bitcode/Writer) -add_subdirectory(lib/Transforms/Utils) -add_subdirectory(lib/Transforms/Instrumentation) -add_subdirectory(lib/Transforms/InstCombine) -add_subdirectory(lib/Transforms/Scalar) -add_subdirectory(lib/Transforms/IPO) -add_subdirectory(lib/Transforms/Hello) -add_subdirectory(lib/Linker) -add_subdirectory(lib/Analysis) -add_subdirectory(lib/Analysis/IPA) -add_subdirectory(lib/MC) -add_subdirectory(lib/MC/MCParser) -add_subdirectory(lib/MC/MCDisassembler) -add_subdirectory(lib/Object) +add_subdirectory(lib) add_subdirectory(utils/FileCheck) add_subdirectory(utils/FileUpdate) @@ -240,64 +220,6 @@ add_subdirectory(utils/not) add_subdirectory(utils/llvm-lit) -set(LLVM_ENUM_ASM_PRINTERS "") -set(LLVM_ENUM_ASM_PARSERS "") -set(LLVM_ENUM_DISASSEMBLERS "") -foreach(t ${LLVM_TARGETS_TO_BUILD}) - message(STATUS "Targeting ${t}") - add_subdirectory(lib/Target/${t}) - add_subdirectory(lib/Target/${t}/TargetInfo) - set( td ${LLVM_MAIN_SRC_DIR}/lib/Target/${t} ) - file(GLOB asmp_file "${td}/*AsmPrinter.cpp") - if( asmp_file ) - set(LLVM_ENUM_ASM_PRINTERS - "${LLVM_ENUM_ASM_PRINTERS}LLVM_ASM_PRINTER(${t})\n") - endif() - if( EXISTS ${td}/InstPrinter/CMakeLists.txt ) - add_subdirectory(lib/Target/${t}/InstPrinter) - endif() - if( EXISTS ${td}/AsmParser/CMakeLists.txt ) - add_subdirectory(lib/Target/${t}/AsmParser) - set(LLVM_ENUM_ASM_PARSERS - "${LLVM_ENUM_ASM_PARSERS}LLVM_ASM_PARSER(${t})\n") - endif() - if( EXISTS ${td}/Disassembler/CMakeLists.txt ) - add_subdirectory(lib/Target/${t}/Disassembler) - set(LLVM_ENUM_DISASSEMBLERS - "${LLVM_ENUM_DISASSEMBLERS}LLVM_DISASSEMBLER(${t})\n") - endif() - if( EXISTS ${td}/Utils/CMakeLists.txt ) - add_subdirectory(${td}/Utils) - endif() - set(CURRENT_LLVM_TARGET) -endforeach(t) - -# Produce llvm/Config/AsmPrinters.def -configure_file( - ${LLVM_MAIN_INCLUDE_DIR}/llvm/Config/AsmPrinters.def.in - ${LLVM_BINARY_DIR}/include/llvm/Config/AsmPrinters.def - ) - -# Produce llvm/Config/AsmParsers.def -configure_file( - ${LLVM_MAIN_INCLUDE_DIR}/llvm/Config/AsmParsers.def.in - ${LLVM_BINARY_DIR}/include/llvm/Config/AsmParsers.def - ) - -# Produce llvm/Config/Disassemblers.def -configure_file( - ${LLVM_MAIN_INCLUDE_DIR}/llvm/Config/Disassemblers.def.in - ${LLVM_BINARY_DIR}/include/llvm/Config/Disassemblers.def - ) - -add_subdirectory(lib/ExecutionEngine) -add_subdirectory(lib/ExecutionEngine/Interpreter) -add_subdirectory(lib/ExecutionEngine/JIT) -add_subdirectory(lib/ExecutionEngine/MCJIT) -add_subdirectory(lib/Target) -add_subdirectory(lib/AsmParser) -add_subdirectory(lib/Archive) - add_subdirectory(projects) option(LLVM_BUILD_TOOLS Modified: llvm/trunk/cmake/modules/AddLLVM.cmake URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=125968&r1=125967&r2=125968&view=diff ============================================================================== --- llvm/trunk/cmake/modules/AddLLVM.cmake (original) +++ llvm/trunk/cmake/modules/AddLLVM.cmake Fri Feb 18 16:06:14 2011 @@ -4,8 +4,8 @@ macro(add_llvm_library name) llvm_process_sources( ALL_FILES ${ARGN} ) add_library( ${name} ${ALL_FILES} ) - set( llvm_libs ${llvm_libs} ${name} PARENT_SCOPE) - set( llvm_lib_targets ${llvm_lib_targets} ${name} PARENT_SCOPE ) + set_property( GLOBAL APPEND PROPERTY LLVM_LIBS ${name} ) + set_property( GLOBAL APPEND PROPERTY LLVM_LIB_TARGETS ${name} ) if( LLVM_COMMON_DEPENDS ) add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} ) endif( LLVM_COMMON_DEPENDS ) Modified: llvm/trunk/cmake/modules/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/CMakeLists.txt?rev=125968&r1=125967&r2=125968&view=diff ============================================================================== --- llvm/trunk/cmake/modules/CMakeLists.txt (original) +++ llvm/trunk/cmake/modules/CMakeLists.txt Fri Feb 18 16:06:14 2011 @@ -1,5 +1,8 @@ set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/share/llvm/cmake") +get_property(llvm_libs GLOBAL PROPERTY LLVM_LIBS) +get_property(llvm_lib_targets GLOBAL PROPERTY LLVM_LIB_TARGETS) + configure_file( LLVM.cmake ${llvm_cmake_builddir}/LLVM.cmake Modified: llvm/trunk/cmake/modules/LLVMConfig.cmake URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/LLVMConfig.cmake?rev=125968&r1=125967&r2=125968&view=diff ============================================================================== --- llvm/trunk/cmake/modules/LLVMConfig.cmake (original) +++ llvm/trunk/cmake/modules/LLVMConfig.cmake Fri Feb 18 16:06:14 2011 @@ -59,6 +59,7 @@ function(explicit_map_components_to_libraries out_libs) set( link_components ${ARGN} ) + get_property(llvm_libs GLOBAL PROPERTY LLVM_LIBS) string(TOUPPER "${llvm_libs}" capitalized_libs) # Translate symbolic component names to real libraries: foreach(c ${link_components}) Modified: llvm/trunk/lib/Analysis/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/CMakeLists.txt?rev=125968&r1=125967&r2=125968&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/CMakeLists.txt (original) +++ llvm/trunk/lib/Analysis/CMakeLists.txt Fri Feb 18 16:06:14 2011 @@ -56,3 +56,5 @@ TypeBasedAliasAnalysis.cpp ValueTracking.cpp ) + +add_subdirectory(IPA) Added: llvm/trunk/lib/Bitcode/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/CMakeLists.txt?rev=125968&view=auto ============================================================================== --- llvm/trunk/lib/Bitcode/CMakeLists.txt (added) +++ llvm/trunk/lib/Bitcode/CMakeLists.txt Fri Feb 18 16:06:14 2011 @@ -0,0 +1,2 @@ +add_subdirectory(Reader) +add_subdirectory(Writer) Added: llvm/trunk/lib/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CMakeLists.txt?rev=125968&view=auto ============================================================================== --- llvm/trunk/lib/CMakeLists.txt (added) +++ llvm/trunk/lib/CMakeLists.txt Fri Feb 18 16:06:14 2011 @@ -0,0 +1,14 @@ +# `Support' library is added on the top-level CMakeLists.txt + +add_subdirectory(VMCore) +add_subdirectory(CodeGen) +add_subdirectory(Bitcode) +add_subdirectory(Transforms) +add_subdirectory(Linker) +add_subdirectory(Analysis) +add_subdirectory(MC) +add_subdirectory(Object) +add_subdirectory(ExecutionEngine) +add_subdirectory(Target) +add_subdirectory(AsmParser) +add_subdirectory(Archive) Modified: llvm/trunk/lib/CodeGen/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/CMakeLists.txt?rev=125968&r1=125967&r2=125968&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/CMakeLists.txt (original) +++ llvm/trunk/lib/CodeGen/CMakeLists.txt Fri Feb 18 16:06:14 2011 @@ -94,3 +94,6 @@ VirtRegMap.cpp VirtRegRewriter.cpp ) + +add_subdirectory(SelectionDAG) +add_subdirectory(AsmPrinter) Modified: llvm/trunk/lib/ExecutionEngine/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/CMakeLists.txt?rev=125968&r1=125967&r2=125968&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/CMakeLists.txt (original) +++ llvm/trunk/lib/ExecutionEngine/CMakeLists.txt Fri Feb 18 16:06:14 2011 @@ -2,3 +2,7 @@ ExecutionEngine.cpp ExecutionEngineBindings.cpp ) + +add_subdirectory(Interpreter) +add_subdirectory(JIT) +add_subdirectory(MCJIT) Modified: llvm/trunk/lib/MC/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/CMakeLists.txt?rev=125968&r1=125967&r2=125968&view=diff ============================================================================== --- llvm/trunk/lib/MC/CMakeLists.txt (original) +++ llvm/trunk/lib/MC/CMakeLists.txt Fri Feb 18 16:06:14 2011 @@ -34,3 +34,6 @@ WinCOFFObjectWriter.cpp TargetAsmBackend.cpp ) + +add_subdirectory(MCParser) +add_subdirectory(MCDisassembler) Modified: llvm/trunk/lib/Target/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CMakeLists.txt?rev=125968&r1=125967&r2=125968&view=diff ============================================================================== --- llvm/trunk/lib/Target/CMakeLists.txt (original) +++ llvm/trunk/lib/Target/CMakeLists.txt Fri Feb 18 16:06:14 2011 @@ -15,3 +15,53 @@ TargetRegisterInfo.cpp TargetSubtarget.cpp ) + +set(LLVM_ENUM_ASM_PRINTERS "") +set(LLVM_ENUM_ASM_PARSERS "") +set(LLVM_ENUM_DISASSEMBLERS "") +foreach(t ${LLVM_TARGETS_TO_BUILD}) + message(STATUS "Targeting ${t}") + add_subdirectory(${t}) + add_subdirectory(${t}/TargetInfo) + set( td ${LLVM_MAIN_SRC_DIR}/lib/Target/${t} ) + file(GLOB asmp_file "${td}/*AsmPrinter.cpp") + if( asmp_file ) + set(LLVM_ENUM_ASM_PRINTERS + "${LLVM_ENUM_ASM_PRINTERS}LLVM_ASM_PRINTER(${t})\n") + endif() + if( EXISTS ${td}/InstPrinter/CMakeLists.txt ) + add_subdirectory(${t}/InstPrinter) + endif() + if( EXISTS ${td}/AsmParser/CMakeLists.txt ) + add_subdirectory(${t}/AsmParser) + set(LLVM_ENUM_ASM_PARSERS + "${LLVM_ENUM_ASM_PARSERS}LLVM_ASM_PARSER(${t})\n") + endif() + if( EXISTS ${td}/Disassembler/CMakeLists.txt ) + add_subdirectory(${t}/Disassembler) + set(LLVM_ENUM_DISASSEMBLERS + "${LLVM_ENUM_DISASSEMBLERS}LLVM_DISASSEMBLER(${t})\n") + endif() + if( EXISTS ${td}/Utils/CMakeLists.txt ) + add_subdirectory(${td}/Utils) + endif() + set(CURRENT_LLVM_TARGET) +endforeach(t) + +# Produce llvm/Config/AsmPrinters.def +configure_file( + ${LLVM_MAIN_INCLUDE_DIR}/llvm/Config/AsmPrinters.def.in + ${LLVM_BINARY_DIR}/include/llvm/Config/AsmPrinters.def + ) + +# Produce llvm/Config/AsmParsers.def +configure_file( + ${LLVM_MAIN_INCLUDE_DIR}/llvm/Config/AsmParsers.def.in + ${LLVM_BINARY_DIR}/include/llvm/Config/AsmParsers.def + ) + +# Produce llvm/Config/Disassemblers.def +configure_file( + ${LLVM_MAIN_INCLUDE_DIR}/llvm/Config/Disassemblers.def.in + ${LLVM_BINARY_DIR}/include/llvm/Config/Disassemblers.def + ) Added: llvm/trunk/lib/Transforms/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/CMakeLists.txt?rev=125968&view=auto ============================================================================== --- llvm/trunk/lib/Transforms/CMakeLists.txt (added) +++ llvm/trunk/lib/Transforms/CMakeLists.txt Fri Feb 18 16:06:14 2011 @@ -0,0 +1,6 @@ +add_subdirectory(Utils) +add_subdirectory(Instrumentation) +add_subdirectory(InstCombine) +add_subdirectory(Scalar) +add_subdirectory(IPO) +add_subdirectory(Hello) Modified: llvm/trunk/tools/llvm-config/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-config/CMakeLists.txt?rev=125968&r1=125967&r2=125968&view=diff ============================================================================== --- llvm/trunk/tools/llvm-config/CMakeLists.txt (original) +++ llvm/trunk/tools/llvm-config/CMakeLists.txt Fri Feb 18 16:06:14 2011 @@ -70,6 +70,8 @@ message(FATAL_ERROR "`nm' not found") endif() +get_property(llvm_libs GLOBAL PROPERTY LLVM_LIBS) + add_custom_command(OUTPUT ${LIBDEPS_TMP} COMMAND ${PERL_EXECUTABLE} ${LLVM_MAIN_SRC_DIR}/utils/GenLibDeps.pl -flat ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR} ${NM_PATH} > ${LIBDEPS_TMP} DEPENDS ${llvm_libs} @@ -122,6 +124,7 @@ add_custom_target(llvm-config.target ALL DEPENDS ${LLVM_CONFIG}) +get_property(llvm_lib_targets GLOBAL PROPERTY LLVM_LIB_TARGETS) add_dependencies(llvm-config.target ${llvm_lib_targets}) # Make sure that llvm-config builds before the llvm tools, so we have From ofv at wanadoo.es Fri Feb 18 16:06:23 2011 From: ofv at wanadoo.es (Oscar Fuentes) Date: Fri, 18 Feb 2011 22:06:23 -0000 Subject: [llvm-commits] [llvm] r125969 - /llvm/trunk/utils/TableGen/CMakeLists.txt Message-ID: <20110218220623.C32092A6C12C@llvm.org> Author: ofv Date: Fri Feb 18 16:06:23 2011 New Revision: 125969 URL: http://llvm.org/viewvc/llvm-project?rev=125969&view=rev Log: CMake: updated list of tblgen source files. Modified: llvm/trunk/utils/TableGen/CMakeLists.txt Modified: llvm/trunk/utils/TableGen/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/CMakeLists.txt?rev=125969&r1=125968&r2=125969&view=diff ============================================================================== --- llvm/trunk/utils/TableGen/CMakeLists.txt (original) +++ llvm/trunk/utils/TableGen/CMakeLists.txt Fri Feb 18 16:06:23 2011 @@ -25,6 +25,7 @@ DisassemblerEmitter.cpp EDEmitter.cpp FastISelEmitter.cpp + FixedLenDecoderEmitter.cpp InstrEnumEmitter.cpp InstrInfoEmitter.cpp IntrinsicEmitter.cpp From sabre at nondot.org Fri Feb 18 16:13:01 2011 From: sabre at nondot.org (Chris Lattner) Date: Fri, 18 Feb 2011 22:13:01 -0000 Subject: [llvm-commits] [llvm] r125970 - /llvm/trunk/tools/opt/opt.cpp Message-ID: <20110218221301.5DA4C2A6C12C@llvm.org> Author: lattner Date: Fri Feb 18 16:13:01 2011 New Revision: 125970 URL: http://llvm.org/viewvc/llvm-project?rev=125970&view=rev Log: Have opt set up a specific TargetLibraryInfo for modules with a triple. Modified: llvm/trunk/tools/opt/opt.cpp Modified: llvm/trunk/tools/opt/opt.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/opt/opt.cpp?rev=125970&r1=125969&r2=125970&view=diff ============================================================================== --- llvm/trunk/tools/opt/opt.cpp (original) +++ llvm/trunk/tools/opt/opt.cpp Fri Feb 18 16:13:01 2011 @@ -24,7 +24,9 @@ #include "llvm/Analysis/RegionPass.h" #include "llvm/Analysis/CallGraph.h" #include "llvm/Target/TargetData.h" +#include "llvm/Target/TargetLibraryInfo.h" #include "llvm/Target/TargetMachine.h" +#include "llvm/ADT/Triple.h" #include "llvm/Support/PassNameParser.h" #include "llvm/Support/Signals.h" #include "llvm/Support/Debug.h" @@ -525,11 +527,15 @@ NoOutput = true; // Create a PassManager to hold and optimize the collection of passes we are - // about to build... + // about to build. // PassManager Passes; - // Add an appropriate TargetData instance for this module... + // Add an appropriate TargetLibraryInfo pass for the module's triple. + if (!M->getTargetTriple().empty()) + Passes.add(new TargetLibraryInfo(Triple(M->getTargetTriple()))); + + // Add an appropriate TargetData instance for this module. TargetData *TD = 0; const std::string &ModuleDataLayout = M.get()->getDataLayout(); if (!ModuleDataLayout.empty()) From sabre at nondot.org Fri Feb 18 16:21:07 2011 From: sabre at nondot.org (Chris Lattner) Date: Fri, 18 Feb 2011 22:21:07 -0000 Subject: [llvm-commits] [llvm] r125972 - /llvm/trunk/include/llvm/Support/StandardPasses.h Message-ID: <20110218222107.7BBF82A6C12C@llvm.org> Author: lattner Date: Fri Feb 18 16:21:07 2011 New Revision: 125972 URL: http://llvm.org/viewvc/llvm-project?rev=125972&view=rev Log: rearrange some comments, no functionality change. Modified: llvm/trunk/include/llvm/Support/StandardPasses.h Modified: llvm/trunk/include/llvm/Support/StandardPasses.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/StandardPasses.h?rev=125972&r1=125971&r2=125972&view=diff ============================================================================== --- llvm/trunk/include/llvm/Support/StandardPasses.h (original) +++ llvm/trunk/include/llvm/Support/StandardPasses.h Fri Feb 18 16:21:07 2011 @@ -26,47 +26,6 @@ #include "llvm/Transforms/IPO.h" namespace llvm { - /// createStandardFunctionPasses - Add the standard list of function passes to - /// the provided pass manager. - /// - /// \arg OptimizationLevel - The optimization level, corresponding to -O0, - /// -O1, etc. - static inline void createStandardFunctionPasses(PassManagerBase *PM, - unsigned OptimizationLevel); - - /// createStandardModulePasses - Add the standard list of module passes to the - /// provided pass manager. - /// - /// \arg OptimizationLevel - The optimization level, corresponding to -O0, - /// -O1, etc. - /// \arg OptimizeSize - Whether the transformations should optimize for size. - /// \arg UnitAtATime - Allow passes which may make global module changes. - /// \arg UnrollLoops - Allow loop unrolling. - /// \arg SimplifyLibCalls - Allow library calls to be simplified. - /// \arg HaveExceptions - Whether the module may have code using exceptions. - /// \arg InliningPass - The inlining pass to use, if any, or null. This will - /// always be added, even at -O0.a - static inline void createStandardModulePasses(PassManagerBase *PM, - unsigned OptimizationLevel, - bool OptimizeSize, - bool UnitAtATime, - bool UnrollLoops, - bool SimplifyLibCalls, - bool HaveExceptions, - Pass *InliningPass); - - /// createStandardLTOPasses - Add the standard list of module passes suitable - /// for link time optimization. - /// - /// Internalize - Run the internalize pass. - /// RunInliner - Use a function inlining pass. - /// VerifyEach - Run the verifier after each pass. - static inline void createStandardLTOPasses(PassManagerBase *PM, - bool Internalize, - bool RunInliner, - bool VerifyEach); - - // Implementations static inline void createStandardAliasAnalysisPasses(PassManagerBase *PM) { // Add TypeBasedAliasAnalysis before BasicAliasAnalysis so that @@ -76,6 +35,11 @@ PM->add(createBasicAliasAnalysisPass()); } + /// createStandardFunctionPasses - Add the standard list of function passes to + /// the provided pass manager. + /// + /// \arg OptimizationLevel - The optimization level, corresponding to -O0, + /// -O1, etc. static inline void createStandardFunctionPasses(PassManagerBase *PM, unsigned OptimizationLevel) { if (OptimizationLevel > 0) { @@ -86,8 +50,18 @@ } } - /// createStandardModulePasses - Add the standard module passes. This is - /// expected to be run after the standard function passes. + /// createStandardModulePasses - Add the standard list of module passes to the + /// provided pass manager. + /// + /// \arg OptimizationLevel - The optimization level, corresponding to -O0, + /// -O1, etc. + /// \arg OptimizeSize - Whether the transformations should optimize for size. + /// \arg UnitAtATime - Allow passes which may make global module changes. + /// \arg UnrollLoops - Allow loop unrolling. + /// \arg SimplifyLibCalls - Allow library calls to be simplified. + /// \arg HaveExceptions - Whether the module may have code using exceptions. + /// \arg InliningPass - The inlining pass to use, if any, or null. This will + /// always be added, even at -O0.a static inline void createStandardModulePasses(PassManagerBase *PM, unsigned OptimizationLevel, bool OptimizeSize, @@ -183,6 +157,12 @@ PM->add(createVerifierPass()); } + /// createStandardLTOPasses - Add the standard list of module passes suitable + /// for link time optimization. + /// + /// Internalize - Run the internalize pass. + /// RunInliner - Use a function inlining pass. + /// VerifyEach - Run the verifier after each pass. static inline void createStandardLTOPasses(PassManagerBase *PM, bool Internalize, bool RunInliner, From sabre at nondot.org Fri Feb 18 16:21:24 2011 From: sabre at nondot.org (Chris Lattner) Date: Fri, 18 Feb 2011 22:21:24 -0000 Subject: [llvm-commits] [llvm] r125973 - /llvm/trunk/include/llvm/Target/TargetLibraryInfo.h Message-ID: <20110218222124.F0DCA2A6C12C@llvm.org> Author: lattner Date: Fri Feb 18 16:21:24 2011 New Revision: 125973 URL: http://llvm.org/viewvc/llvm-project?rev=125973&view=rev Log: add memset and memcpy, though they are always available for now. Modified: llvm/trunk/include/llvm/Target/TargetLibraryInfo.h Modified: llvm/trunk/include/llvm/Target/TargetLibraryInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetLibraryInfo.h?rev=125973&r1=125972&r2=125973&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/TargetLibraryInfo.h (original) +++ llvm/trunk/include/llvm/Target/TargetLibraryInfo.h Fri Feb 18 16:21:24 2011 @@ -17,6 +17,12 @@ namespace LibFunc { enum Func { + /// void *memset(void *b, int c, size_t len); + memset, + + // void *memcpy(void *s1, const void *s2, size_t n); + memcpy, + /// void memset_pattern16(void *b, const void *pattern16, size_t len); memset_pattern16, From sabre at nondot.org Fri Feb 18 16:22:15 2011 From: sabre at nondot.org (Chris Lattner) Date: Fri, 18 Feb 2011 22:22:15 -0000 Subject: [llvm-commits] [llvm] r125974 - /llvm/trunk/lib/Transforms/Scalar/LoopIdiomRecognize.cpp Message-ID: <20110218222215.C36902A6C12C@llvm.org> Author: lattner Date: Fri Feb 18 16:22:15 2011 New Revision: 125974 URL: http://llvm.org/viewvc/llvm-project?rev=125974&view=rev Log: Make loop-idiom use TargetLibraryInfo to determine whether it is allowed to hack on memset, memcpy etc. Modified: llvm/trunk/lib/Transforms/Scalar/LoopIdiomRecognize.cpp Modified: llvm/trunk/lib/Transforms/Scalar/LoopIdiomRecognize.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopIdiomRecognize.cpp?rev=125974&r1=125973&r2=125974&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/LoopIdiomRecognize.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/LoopIdiomRecognize.cpp Fri Feb 18 16:22:15 2011 @@ -30,7 +30,6 @@ // the loop. This would handle things like: // void foo(_Complex float *P) // for (i) { __real__(*P) = 0; __imag__(*P) = 0; } -// this is also "Example 2" from http://blog.regehr.org/archives/320 // // This could recognize common matrix multiplies and dot product idioms and // replace them with calls to BLAS (if linked in??). @@ -46,6 +45,7 @@ #include "llvm/Analysis/ScalarEvolutionExpander.h" #include "llvm/Analysis/ValueTracking.h" #include "llvm/Target/TargetData.h" +#include "llvm/Target/TargetLibraryInfo.h" #include "llvm/Transforms/Utils/Local.h" #include "llvm/Support/Debug.h" #include "llvm/Support/IRBuilder.h" @@ -62,6 +62,7 @@ const TargetData *TD; DominatorTree *DT; ScalarEvolution *SE; + TargetLibraryInfo *TLI; public: static char ID; explicit LoopIdiomRecognize() : LoopPass(ID) { @@ -101,6 +102,7 @@ AU.addPreserved(); AU.addPreserved(); AU.addRequired(); + AU.addRequired(); } }; } @@ -113,6 +115,7 @@ INITIALIZE_PASS_DEPENDENCY(LoopSimplify) INITIALIZE_PASS_DEPENDENCY(LCSSA) INITIALIZE_PASS_DEPENDENCY(ScalarEvolution) +INITIALIZE_PASS_DEPENDENCY(TargetLibraryInfo) INITIALIZE_AG_DEPENDENCY(AliasAnalysis) INITIALIZE_PASS_END(LoopIdiomRecognize, "loop-idiom", "Recognize loop idioms", false, false) @@ -175,6 +178,7 @@ DT = &getAnalysis(); LoopInfo &LI = getAnalysis(); + TLI = &getAnalysis(); SmallVector ExitBlocks; CurLoop->getUniqueExitBlocks(ExitBlocks); @@ -302,6 +306,10 @@ // We can only handle non-volatile memsets with a constant size. if (MSI->isVolatile() || !isa(MSI->getLength())) return false; + // If we're not allowed to hack on memset, we fail. + if (!TLI->has(LibFunc::memset)) + return false; + Value *Pointer = MSI->getDest(); // See if the pointer expression is an AddRec like {base,+,1} on the current @@ -371,6 +379,11 @@ unsigned StoreAlignment, Value *SplatValue, Instruction *TheStore, const SCEVAddRecExpr *Ev, const SCEV *BECount) { + // If we're not allowed to form memset, we fail. + if (!TLI->has(LibFunc::memset)) + return false; + + // Verify that the stored value is loop invariant. If not, we can't promote // the memset. if (!CurLoop->isLoopInvariant(SplatValue)) @@ -435,6 +448,10 @@ const SCEVAddRecExpr *StoreEv, const SCEVAddRecExpr *LoadEv, const SCEV *BECount) { + // If we're not allowed to form memcpy, we fail. + if (!TLI->has(LibFunc::memcpy)) + return false; + LoadInst *LI = cast(SI->getValueOperand()); // Okay, we have a strided store "p[i]" of a loaded value. We can turn From sabre at nondot.org Fri Feb 18 16:34:03 2011 From: sabre at nondot.org (Chris Lattner) Date: Fri, 18 Feb 2011 22:34:03 -0000 Subject: [llvm-commits] [llvm] r125978 - in /llvm/trunk: include/llvm/Target/TargetLibraryInfo.h lib/Target/TargetLibraryInfo.cpp tools/opt/opt.cpp Message-ID: <20110218223403.A95932A6C12C@llvm.org> Author: lattner Date: Fri Feb 18 16:34:03 2011 New Revision: 125978 URL: http://llvm.org/viewvc/llvm-project?rev=125978&view=rev Log: add a way to disable all builtins, wire it up to opt's -disable-simplifylibcalls flag. Modified: llvm/trunk/include/llvm/Target/TargetLibraryInfo.h llvm/trunk/lib/Target/TargetLibraryInfo.cpp llvm/trunk/tools/opt/opt.cpp Modified: llvm/trunk/include/llvm/Target/TargetLibraryInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetLibraryInfo.h?rev=125978&r1=125977&r2=125978&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/TargetLibraryInfo.h (original) +++ llvm/trunk/include/llvm/Target/TargetLibraryInfo.h Fri Feb 18 16:34:03 2011 @@ -55,6 +55,10 @@ void setAvailable(LibFunc::Func F) { AvailableArray[F/8] |= 1 << (F&7); } + + /// disableAllFunctions - This disables all builtins, which is used for + /// options like -fno-builtin. + void disableAllFunctions(); }; } // end namespace llvm Modified: llvm/trunk/lib/Target/TargetLibraryInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetLibraryInfo.cpp?rev=125978&r1=125977&r2=125978&view=diff ============================================================================== --- llvm/trunk/lib/Target/TargetLibraryInfo.cpp (original) +++ llvm/trunk/lib/Target/TargetLibraryInfo.cpp Fri Feb 18 16:34:03 2011 @@ -47,3 +47,9 @@ initialize(*this, T); } + +/// disableAllFunctions - This disables all builtins, which is used for options +/// like -fno-builtin. +void TargetLibraryInfo::disableAllFunctions() { + memset(AvailableArray, 0, sizeof(AvailableArray)); +} Modified: llvm/trunk/tools/opt/opt.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/opt/opt.cpp?rev=125978&r1=125977&r2=125978&view=diff ============================================================================== --- llvm/trunk/tools/opt/opt.cpp (original) +++ llvm/trunk/tools/opt/opt.cpp Fri Feb 18 16:34:03 2011 @@ -532,8 +532,12 @@ PassManager Passes; // Add an appropriate TargetLibraryInfo pass for the module's triple. - if (!M->getTargetTriple().empty()) - Passes.add(new TargetLibraryInfo(Triple(M->getTargetTriple()))); + TargetLibraryInfo *TLI = new TargetLibraryInfo(Triple(M->getTargetTriple())); + + // The -disable-simplify-libcalls flag actually disables all builtin optzns. + if (DisableSimplifyLibCalls) + TLI->disableAllFunctions(); + Passes.add(TLI); // Add an appropriate TargetData instance for this module. TargetData *TD = 0; From stoklund at 2pi.dk Fri Feb 18 16:35:20 2011 From: stoklund at 2pi.dk (Jakob Stoklund Olesen) Date: Fri, 18 Feb 2011 22:35:20 -0000 Subject: [llvm-commits] [llvm] r125980 - in /llvm/trunk/lib/CodeGen: LiveRangeEdit.cpp LiveRangeEdit.h VirtRegMap.h Message-ID: <20110218223520.936892A6C12C@llvm.org> Author: stoklund Date: Fri Feb 18 16:35:20 2011 New Revision: 125980 URL: http://llvm.org/viewvc/llvm-project?rev=125980&view=rev Log: Use VirtRegMap's Virt2SplitMap to keep track of the original live range before splitting. All new virtual registers created for spilling or splitting point back to their original. Modified: llvm/trunk/lib/CodeGen/LiveRangeEdit.cpp llvm/trunk/lib/CodeGen/LiveRangeEdit.h llvm/trunk/lib/CodeGen/VirtRegMap.h Modified: llvm/trunk/lib/CodeGen/LiveRangeEdit.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveRangeEdit.cpp?rev=125980&r1=125979&r2=125980&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LiveRangeEdit.cpp (original) +++ llvm/trunk/lib/CodeGen/LiveRangeEdit.cpp Fri Feb 18 16:35:20 2011 @@ -19,12 +19,18 @@ using namespace llvm; +unsigned LiveRangeEdit::getOriginal(const VirtRegMap &vrm) const { + unsigned Orig = vrm.getPreSplitReg(getReg()); + return Orig ? Orig : getReg(); +} + LiveInterval &LiveRangeEdit::create(MachineRegisterInfo &mri, LiveIntervals &lis, VirtRegMap &vrm) { - const TargetRegisterClass *RC = mri.getRegClass(parent_.reg); + const TargetRegisterClass *RC = mri.getRegClass(getReg()); unsigned VReg = mri.createVirtualRegister(RC); vrm.grow(); + vrm.setIsSplitFromReg(VReg, getOriginal(vrm)); LiveInterval &li = lis.getOrCreateInterval(VReg); newRegs_.push_back(&li); return li; Modified: llvm/trunk/lib/CodeGen/LiveRangeEdit.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveRangeEdit.h?rev=125980&r1=125979&r2=125980&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LiveRangeEdit.h (original) +++ llvm/trunk/lib/CodeGen/LiveRangeEdit.h Fri Feb 18 16:35:20 2011 @@ -73,6 +73,10 @@ LiveInterval &getParent() const { return parent_; } unsigned getReg() const { return parent_.reg; } + /// getOriginal - Return the original virtual register that parent descends + /// from through splitting. The original was not created by splitting. + unsigned getOriginal(const VirtRegMap&) const; + /// Iterator for accessing the new registers added by this edit. typedef SmallVectorImpl::const_iterator iterator; iterator begin() const { return newRegs_.begin()+firstNew_; } Modified: llvm/trunk/lib/CodeGen/VirtRegMap.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/VirtRegMap.h?rev=125980&r1=125979&r2=125980&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/VirtRegMap.h (original) +++ llvm/trunk/lib/CodeGen/VirtRegMap.h Fri Feb 18 16:35:20 2011 @@ -214,7 +214,7 @@ } /// @brief returns the live interval virtReg is split from. - unsigned getPreSplitReg(unsigned virtReg) { + unsigned getPreSplitReg(unsigned virtReg) const { return Virt2SplitMap[virtReg]; } From sabre at nondot.org Fri Feb 18 16:36:36 2011 From: sabre at nondot.org (Chris Lattner) Date: Fri, 18 Feb 2011 22:36:36 -0000 Subject: [llvm-commits] [llvm] r125981 - /llvm/trunk/include/llvm/Support/StandardPasses.h Message-ID: <20110218223636.61EA12A6C12C@llvm.org> Author: lattner Date: Fri Feb 18 16:36:36 2011 New Revision: 125981 URL: http://llvm.org/viewvc/llvm-project?rev=125981&view=rev Log: Now that -loop-idiom uses TargetLibraryInfo properly, it doesn't need to be pulled out of the pass manager when the user specifies -fno-builtin. It can intelligently determine which libcalls to optimize based on what is enabled in TargetLibraryInfo. This allows -fno-builtin-foo to work someday. Modified: llvm/trunk/include/llvm/Support/StandardPasses.h Modified: llvm/trunk/include/llvm/Support/StandardPasses.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/StandardPasses.h?rev=125981&r1=125980&r2=125981&view=diff ============================================================================== --- llvm/trunk/include/llvm/Support/StandardPasses.h (original) +++ llvm/trunk/include/llvm/Support/StandardPasses.h Fri Feb 18 16:36:36 2011 @@ -67,7 +67,7 @@ bool OptimizeSize, bool UnitAtATime, bool UnrollLoops, - bool OptimizeBuiltins, + bool SimplifyLibCalls, bool HaveExceptions, Pass *InliningPass) { createStandardAliasAnalysisPasses(PM); @@ -89,7 +89,7 @@ // Start of CallGraph SCC passes. if (UnitAtATime && HaveExceptions) - PM->add(createPruneEHPass()); // Remove dead EH info + PM->add(createPruneEHPass()); // Remove dead EH info if (InliningPass) PM->add(InliningPass); if (UnitAtATime) @@ -101,7 +101,7 @@ // Break up aggregate allocas, using SSAUpdater. PM->add(createScalarReplAggregatesPass(-1, false)); PM->add(createEarlyCSEPass()); // Catch trivial redundancies - if (OptimizeBuiltins) + if (SimplifyLibCalls) PM->add(createSimplifyLibCallsPass()); // Library Call Optimizations PM->add(createJumpThreadingPass()); // Thread jumps. PM->add(createCorrelatedValuePropagationPass()); // Propagate conditionals @@ -116,8 +116,7 @@ PM->add(createLoopUnswitchPass(OptimizeSize || OptimizationLevel < 3)); PM->add(createInstructionCombiningPass()); PM->add(createIndVarSimplifyPass()); // Canonicalize indvars - if (OptimizeBuiltins) - PM->add(createLoopIdiomPass()); // Recognize idioms like memset. + PM->add(createLoopIdiomPass()); // Recognize idioms like memset. PM->add(createLoopDeletionPass()); // Delete dead loops if (UnrollLoops) PM->add(createLoopUnrollPass()); // Unroll small loops From wilsons at start.ca Fri Feb 18 16:41:55 2011 From: wilsons at start.ca (Stephen Wilson) Date: Fri, 18 Feb 2011 17:41:55 -0500 Subject: [llvm-commits] [llvm] r125964 - /llvm/trunk/tools/Makefile In-Reply-To: <20110218213323.B032D2A6C12C@llvm.org> (Owen Anderson's message of "Fri, 18 Feb 2011 21:33:23 -0000") References: <20110218213323.B032D2A6C12C@llvm.org> Message-ID: Owen Anderson writes: > Author: resistor > Date: Fri Feb 18 15:33:23 2011 > New Revision: 125964 > > URL: http://llvm.org/viewvc/llvm-project?rev=125964&view=rev > Log: > Revert r125956, which broke the build if you _don't_ have lldb checked out. Damn. Thanks for reverting. Testing a patch to fixup Makefile.rules when doing in-tree builds. Thanks again, > > Modified: > llvm/trunk/tools/Makefile > > Modified: llvm/trunk/tools/Makefile > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/Makefile?rev=125964&r1=125963&r2=125964&view=diff > ============================================================================== > --- llvm/trunk/tools/Makefile (original) > +++ llvm/trunk/tools/Makefile Fri Feb 18 15:33:23 2011 > @@ -12,10 +12,6 @@ > # Build clang if present. > OPTIONAL_PARALLEL_DIRS := clang > > -# Build LLDB if present. Note LLDB must be built last as it depends on the > -# wider LLVM infrastructure (including Clang). > -OPTIONAL_DIRS := lldb > - > # NOTE: The tools are organized into five groups of four consisting of one > # large and three small executables. This is done to minimize memory load > # in parallel builds. Please retain this ordering. > @@ -30,8 +26,7 @@ > # Let users override the set of tools to build from the command line. > ifdef ONLY_TOOLS > OPTIONAL_PARALLEL_DIRS := > - OPTIONAL_DIRS := $(findstring lldb,$(ONLY_TOOLS)) > - PARALLEL_DIRS := $(filter-out lldb,$(ONLY_TOOLS)) > + PARALLEL_DIRS := $(ONLY_TOOLS) > endif > > include $(LEVEL)/Makefile.config > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits -- steve From dpatel at apple.com Fri Feb 18 16:43:43 2011 From: dpatel at apple.com (Devang Patel) Date: Fri, 18 Feb 2011 22:43:43 -0000 Subject: [llvm-commits] [llvm] r125984 - in /llvm/trunk: include/llvm/CodeGen/SelectionDAG.h lib/CodeGen/SelectionDAG/LegalizeDAG.cpp lib/CodeGen/SelectionDAG/SDNodeDbgValue.h lib/CodeGen/SelectionDAG/SelectionDAG.cpp lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp test/CodeGen/X86/dbg-value-inlined-parameter.ll Message-ID: <20110218224343.3FC862A6C12C@llvm.org> Author: dpatel Date: Fri Feb 18 16:43:42 2011 New Revision: 125984 URL: http://llvm.org/viewvc/llvm-project?rev=125984&view=rev Log: Do not lose debug info of an inlined function argument even if the argument is only used through GEPs. This time with a fix that avoids using invalidated DenseMap iterator. Added: llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAG.h llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAG.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAG.h?rev=125984&r1=125983&r2=125984&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/SelectionDAG.h (original) +++ llvm/trunk/include/llvm/CodeGen/SelectionDAG.h Fri Feb 18 16:43:42 2011 @@ -100,10 +100,6 @@ return DbgValMap[Node]; } - void removeSDDbgValues(const SDNode *Node) { - DbgValMap.erase(Node); - } - typedef SmallVector::iterator DbgIterator; DbgIterator DbgBegin() { return DbgValues.begin(); } DbgIterator DbgEnd() { return DbgValues.end(); } Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp?rev=125984&r1=125983&r2=125984&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Fri Feb 18 16:43:42 2011 @@ -87,6 +87,9 @@ // If someone requests legalization of the new node, return itself. if (From != To) LegalizedNodes.insert(std::make_pair(To, To)); + + // Transfer SDDbgValues. + DAG.TransferDbgValues(From, To); } public: Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h?rev=125984&r1=125983&r2=125984&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h Fri Feb 18 16:43:42 2011 @@ -83,14 +83,6 @@ // Returns the SDNode* for a register ref SDNode *getSDNode() { assert (kind==SDNODE); return u.s.Node; } - // setSDNode - If underlying SDNode is replaced by another node then - // SelectionDAG can use this to transfer DbgValue. - void setSDNode(SDNode *N, unsigned R) { - assert (kind==SDNODE); - u.s.Node = N; - u.s.ResNo = R; - } - // Returns the ResNo for a register ref unsigned getResNo() { assert (kind==SDNODE); return u.s.ResNo; } Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=125984&r1=125983&r2=125984&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Fri Feb 18 16:43:42 2011 @@ -5507,15 +5507,21 @@ return; SDNode *FromNode = From.getNode(); SDNode *ToNode = To.getNode(); - SmallVector &DVs = GetDbgValues(FromNode); - DbgInfo->removeSDDbgValues(FromNode); + SmallVector &DVs = GetDbgValues(FromNode); + SmallVector ClonedDVs; for (SmallVector::iterator I = DVs.begin(), E = DVs.end(); I != E; ++I) { - if ((*I)->getKind() == SDDbgValue::SDNODE) { - AddDbgValue(*I, ToNode, false); - (*I)->setSDNode(ToNode, To.getResNo()); + SDDbgValue *Dbg = *I; + if (Dbg->getKind() == SDDbgValue::SDNODE) { + SDDbgValue *Clone = getDbgValue(Dbg->getMDPtr(), ToNode, To.getResNo(), + Dbg->getOffset(), Dbg->getDebugLoc(), + Dbg->getOrder()); + ClonedDVs.push_back(Clone); } } + for (SmallVector::iterator I = ClonedDVs.begin(), + E = ClonedDVs.end(); I != E; ++I) + AddDbgValue(*I, ToNode, false); } //===----------------------------------------------------------------------===// Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp?rev=125984&r1=125983&r2=125984&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Fri Feb 18 16:43:42 2011 @@ -4287,7 +4287,7 @@ N.getResNo(), Offset, dl, SDNodeOrder); DAG.AddDbgValue(SDV, N.getNode(), false); } - } else if (isa(V) && !V->use_empty() ) { + } else if (!V->use_empty() ) { // Do not call getValue(V) yet, as we don't want to generate code. // Remember it for later. DanglingDebugInfo DDI(&DI, dl, SDNodeOrder); Added: llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll?rev=125984&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll (added) +++ llvm/trunk/test/CodeGen/X86/dbg-value-inlined-parameter.ll Fri Feb 18 16:43:42 2011 @@ -0,0 +1,86 @@ +; RUN: llc -mtriple=x86_64-apple-darwin < %s | FileCheck %s + +;CHECK: DW_TAG_inlined_subroutine +;CHECK-NEXT: DW_AT_abstract_origin +;CHECK-NEXT: DW_AT_low_pc +;CHECK-NEXT: DW_AT_high_pc +;CHECK-NEXT: DW_AT_call_file +;CHECK-NEXT: DW_AT_call_line +;CHECK-NEXT: DW_TAG_formal_parameter +;CHECK-NEXT: .ascii "sp" ## DW_AT_name + +%struct.S1 = type { float*, i32 } + + at p = common global %struct.S1 zeroinitializer, align 8 + +define i32 @foo(%struct.S1* nocapture %sp, i32 %nums) nounwind optsize ssp { +entry: + tail call void @llvm.dbg.value(metadata !{%struct.S1* %sp}, i64 0, metadata !9), !dbg !20 + tail call void @llvm.dbg.value(metadata !{i32 %nums}, i64 0, metadata !18), !dbg !21 + %tmp2 = getelementptr inbounds %struct.S1* %sp, i64 0, i32 1, !dbg !22 + store i32 %nums, i32* %tmp2, align 4, !dbg !22, !tbaa !24 + %call = tail call float* @bar(i32 %nums) nounwind optsize, !dbg !27 + %tmp5 = getelementptr inbounds %struct.S1* %sp, i64 0, i32 0, !dbg !27 + store float* %call, float** %tmp5, align 8, !dbg !27, !tbaa !28 + %cmp = icmp ne float* %call, null, !dbg !29 + %cond = zext i1 %cmp to i32, !dbg !29 + ret i32 %cond, !dbg !29 +} + +declare float* @bar(i32) optsize + +define void @foobar() nounwind optsize ssp { +entry: + tail call void @llvm.dbg.value(metadata !30, i64 0, metadata !9) nounwind, !dbg !31 + tail call void @llvm.dbg.value(metadata !34, i64 0, metadata !18) nounwind, !dbg !35 + store i32 1, i32* getelementptr inbounds (%struct.S1* @p, i64 0, i32 1), align 8, !dbg !36, !tbaa !24 + %call.i = tail call float* @bar(i32 1) nounwind optsize, !dbg !37 + store float* %call.i, float** getelementptr inbounds (%struct.S1* @p, i64 0, i32 0), align 8, !dbg !37, !tbaa !28 + ret void, !dbg !38 +} + +declare void @llvm.dbg.value(metadata, i64, metadata) nounwind readnone + +!llvm.dbg.sp = !{!0, !6} +!llvm.dbg.lv.foo = !{!9, !18} +!llvm.dbg.gv = !{!19} + +!0 = metadata !{i32 589870, i32 0, metadata !1, metadata !"foo", metadata !"foo", metadata !"", metadata !1, i32 8, metadata !3, i1 false, i1 true, i32 0, i32 0, i32 0, i32 256, i1 true, i32 (%struct.S1*, i32)* @foo} ; [ DW_TAG_subprogram ] +!1 = metadata !{i32 589865, metadata !"nm2.c", metadata !"/private/tmp", metadata !2} ; [ DW_TAG_file_type ] +!2 = metadata !{i32 589841, i32 0, i32 12, metadata !"nm2.c", metadata !"/private/tmp", metadata !"clang version 2.9 (trunk 125693)", i1 true, i1 true, metadata !"", i32 0} ; [ DW_TAG_compile_unit ] +!3 = metadata !{i32 589845, metadata !1, metadata !"", metadata !1, i32 0, i64 0, i64 0, i32 0, i32 0, i32 0, metadata !4, i32 0, i32 0} ; [ DW_TAG_subroutine_type ] +!4 = metadata !{metadata !5} +!5 = metadata !{i32 589860, metadata !2, metadata !"int", null, i32 0, i64 32, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] +!6 = metadata !{i32 589870, i32 0, metadata !1, metadata !"foobar", metadata !"foobar", metadata !"", metadata !1, i32 15, metadata !7, i1 false, i1 true, i32 0, i32 0, i32 0, i32 0, i1 true, void ()* @foobar} ; [ DW_TAG_subprogram ] +!7 = metadata !{i32 589845, metadata !1, metadata !"", metadata !1, i32 0, i64 0, i64 0, i32 0, i32 0, i32 0, metadata !8, i32 0, i32 0} ; [ DW_TAG_subroutine_type ] +!8 = metadata !{null} +!9 = metadata !{i32 590081, metadata !0, metadata !"sp", metadata !1, i32 7, metadata !10, i32 0} ; [ DW_TAG_arg_variable ] +!10 = metadata !{i32 589839, metadata !2, metadata !"", null, i32 0, i64 64, i64 64, i64 0, i32 0, metadata !11} ; [ DW_TAG_pointer_type ] +!11 = metadata !{i32 589846, metadata !2, metadata !"S1", metadata !1, i32 4, i64 0, i64 0, i64 0, i32 0, metadata !12} ; [ DW_TAG_typedef ] +!12 = metadata !{i32 589843, metadata !2, metadata !"S1", metadata !1, i32 1, i64 128, i64 64, i32 0, i32 0, i32 0, metadata !13, i32 0, i32 0} ; [ DW_TAG_structure_type ] +!13 = metadata !{metadata !14, metadata !17} +!14 = metadata !{i32 589837, metadata !1, metadata !"m", metadata !1, i32 2, i64 64, i64 64, i64 0, i32 0, metadata !15} ; [ DW_TAG_member ] +!15 = metadata !{i32 589839, metadata !2, metadata !"", null, i32 0, i64 64, i64 64, i64 0, i32 0, metadata !16} ; [ DW_TAG_pointer_type ] +!16 = metadata !{i32 589860, metadata !2, metadata !"float", null, i32 0, i64 32, i64 32, i64 0, i32 0, i32 4} ; [ DW_TAG_base_type ] +!17 = metadata !{i32 589837, metadata !1, metadata !"nums", metadata !1, i32 3, i64 32, i64 32, i64 64, i32 0, metadata !5} ; [ DW_TAG_member ] +!18 = metadata !{i32 590081, metadata !0, metadata !"nums", metadata !1, i32 7, metadata !5, i32 0} ; [ DW_TAG_arg_variable ] +!19 = metadata !{i32 589876, i32 0, metadata !2, metadata !"p", metadata !"p", metadata !"", metadata !1, i32 14, metadata !11, i32 0, i32 1, %struct.S1* @p} ; [ DW_TAG_variable ] +!20 = metadata !{i32 7, i32 13, metadata !0, null} +!21 = metadata !{i32 7, i32 21, metadata !0, null} +!22 = metadata !{i32 9, i32 3, metadata !23, null} +!23 = metadata !{i32 589835, metadata !0, i32 8, i32 1, metadata !1, i32 0} ; [ DW_TAG_lexical_block ] +!24 = metadata !{metadata !"int", metadata !25} +!25 = metadata !{metadata !"omnipotent char", metadata !26} +!26 = metadata !{metadata !"Simple C/C++ TBAA", null} +!27 = metadata !{i32 10, i32 3, metadata !23, null} +!28 = metadata !{metadata !"any pointer", metadata !25} +!29 = metadata !{i32 11, i32 3, metadata !23, null} +!30 = metadata !{%struct.S1* @p} +!31 = metadata !{i32 7, i32 13, metadata !0, metadata !32} +!32 = metadata !{i32 16, i32 3, metadata !33, null} +!33 = metadata !{i32 589835, metadata !6, i32 15, i32 15, metadata !1, i32 1} ; [ DW_TAG_lexical_block ] +!34 = metadata !{i32 1} +!35 = metadata !{i32 7, i32 21, metadata !0, metadata !32} +!36 = metadata !{i32 9, i32 3, metadata !23, metadata !32} +!37 = metadata !{i32 10, i32 3, metadata !23, metadata !32} +!38 = metadata !{i32 17, i32 1, metadata !33, null} From dpatel at apple.com Fri Feb 18 17:06:29 2011 From: dpatel at apple.com (Devang Patel) Date: Fri, 18 Feb 2011 23:06:29 -0000 Subject: [llvm-commits] [llvm] r125986 - in /llvm/trunk: include/llvm/Support/Dwarf.h lib/Support/Dwarf.cpp Message-ID: <20110218230629.4D6692A6C12C@llvm.org> Author: dpatel Date: Fri Feb 18 17:06:29 2011 New Revision: 125986 URL: http://llvm.org/viewvc/llvm-project?rev=125986&view=rev Log: Provide tag strings for llvm specific tags. Modified: llvm/trunk/include/llvm/Support/Dwarf.h llvm/trunk/lib/Support/Dwarf.cpp Modified: llvm/trunk/include/llvm/Support/Dwarf.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Dwarf.h?rev=125986&r1=125985&r2=125986&view=diff ============================================================================== --- llvm/trunk/include/llvm/Support/Dwarf.h (original) +++ llvm/trunk/include/llvm/Support/Dwarf.h Fri Feb 18 17:06:29 2011 @@ -49,7 +49,6 @@ DW_TAG_auto_variable = 0x100, // Tag for local (auto) variables. DW_TAG_arg_variable = 0x101, // Tag for argument variables. DW_TAG_return_variable = 0x102, // Tag for return variables. - DW_TAG_vector_type = 0x103, // Tag for vector types. DW_TAG_user_base = 0x1000, // Recommended base for user tags. Modified: llvm/trunk/lib/Support/Dwarf.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Dwarf.cpp?rev=125986&r1=125985&r2=125986&view=diff ============================================================================== --- llvm/trunk/lib/Support/Dwarf.cpp (original) +++ llvm/trunk/lib/Support/Dwarf.cpp Fri Feb 18 17:06:29 2011 @@ -78,6 +78,10 @@ case DW_TAG_shared_type: return "DW_TAG_shared_type"; case DW_TAG_lo_user: return "DW_TAG_lo_user"; case DW_TAG_hi_user: return "DW_TAG_hi_user"; + case DW_TAG_auto_variable: return "DW_TAG_auto_variable"; + case DW_TAG_arg_variable: return "DW_TAG_arg_variable"; + case DW_TAG_return_variable: return "DW_TAG_return_variable"; + case DW_TAG_vector_type: return "DW_TAG_vector_type"; } return 0; } From wilsons at start.ca Fri Feb 18 17:14:59 2011 From: wilsons at start.ca (Stephen Wilson) Date: Fri, 18 Feb 2011 18:14:59 -0500 Subject: [llvm-commits] [PATCH] Ignore missing OPTIONAL_DIRS for in tree builds. Message-ID: Do not try to descend into optional build directories if they do not exist. This makes the build logic symmetric for both the in tree and out of tree cases. Index: Makefile.rules =================================================================== --- Makefile.rules (revision 125955) +++ Makefile.rules (working copy) @@ -840,7 +840,9 @@ else $(RecursiveTargets):: $(Verb) for dir in $(OPTIONAL_DIRS); do \ - ($(MAKE) -C$$dir $@ ) || exit 1; \ + if [ -d $(PROJ_SRC_DIR)/$$dir ]; then\ + ($(MAKE) -C$$dir $@ ) || exit 1; \ + fi \ done endif endif From dpatel at apple.com Fri Feb 18 17:13:40 2011 From: dpatel at apple.com (Devang Patel) Date: Fri, 18 Feb 2011 23:13:40 -0000 Subject: [llvm-commits] [llvm] r125987 - /llvm/trunk/lib/VMCore/AsmWriter.cpp Message-ID: <20110218231340.71BF02A6C12C@llvm.org> Author: dpatel Date: Fri Feb 18 17:13:40 2011 New Revision: 125987 URL: http://llvm.org/viewvc/llvm-project?rev=125987&view=rev Log: These tags are now covered by dwarf::TagString(). Modified: llvm/trunk/lib/VMCore/AsmWriter.cpp Modified: llvm/trunk/lib/VMCore/AsmWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/AsmWriter.cpp?rev=125987&r1=125986&r2=125987&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/AsmWriter.cpp (original) +++ llvm/trunk/lib/VMCore/AsmWriter.cpp Fri Feb 18 17:13:40 2011 @@ -2047,15 +2047,7 @@ return; Out.PadToColumn(50); - if (Tag == dwarf::DW_TAG_auto_variable) - Out << "; [ DW_TAG_auto_variable ]"; - else if (Tag == dwarf::DW_TAG_arg_variable) - Out << "; [ DW_TAG_arg_variable ]"; - else if (Tag == dwarf::DW_TAG_return_variable) - Out << "; [ DW_TAG_return_variable ]"; - else if (Tag == dwarf::DW_TAG_vector_type) - Out << "; [ DW_TAG_vector_type ]"; - else if (Tag == dwarf::DW_TAG_user_base) + if (Tag == dwarf::DW_TAG_user_base) Out << "; [ DW_TAG_user_base ]"; else if (Tag.isIntN(32)) { if (const char *TagName = dwarf::TagString(Tag.getZExtValue())) From dpatel at apple.com Fri Feb 18 17:23:09 2011 From: dpatel at apple.com (Devang Patel) Date: Fri, 18 Feb 2011 23:23:09 -0000 Subject: [llvm-commits] [llvm] r125988 - /llvm/trunk/include/llvm/Support/Dwarf.h Message-ID: <20110218232309.98DC92A6C12C@llvm.org> Author: dpatel Date: Fri Feb 18 17:23:09 2011 New Revision: 125988 URL: http://llvm.org/viewvc/llvm-project?rev=125988&view=rev Log: Remove unused tag. Modified: llvm/trunk/include/llvm/Support/Dwarf.h Modified: llvm/trunk/include/llvm/Support/Dwarf.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Dwarf.h?rev=125988&r1=125987&r2=125988&view=diff ============================================================================== --- llvm/trunk/include/llvm/Support/Dwarf.h (original) +++ llvm/trunk/include/llvm/Support/Dwarf.h Fri Feb 18 17:23:09 2011 @@ -45,7 +45,6 @@ // llvm mock tags DW_TAG_invalid = ~0U, // Tag for invalid results. - DW_TAG_anchor = 0, // Tag for descriptor anchors. DW_TAG_auto_variable = 0x100, // Tag for local (auto) variables. DW_TAG_arg_variable = 0x101, // Tag for argument variables. DW_TAG_return_variable = 0x102, // Tag for return variables. From dpatel at apple.com Fri Feb 18 17:28:53 2011 From: dpatel at apple.com (Devang Patel) Date: Fri, 18 Feb 2011 23:28:53 -0000 Subject: [llvm-commits] [llvm] r125989 - /llvm/trunk/include/llvm/Analysis/DIBuilder.h Message-ID: <20110218232853.5C0BE2A6C12C@llvm.org> Author: dpatel Date: Fri Feb 18 17:28:53 2011 New Revision: 125989 URL: http://llvm.org/viewvc/llvm-project?rev=125989&view=rev Log: Provide enums to build complex address calucation expressions. (This is infact direct copy from DIFactory, which is disappearing soon.) Modified: llvm/trunk/include/llvm/Analysis/DIBuilder.h Modified: llvm/trunk/include/llvm/Analysis/DIBuilder.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/DIBuilder.h?rev=125989&r1=125988&r2=125989&view=diff ============================================================================== --- llvm/trunk/include/llvm/Analysis/DIBuilder.h (original) +++ llvm/trunk/include/llvm/Analysis/DIBuilder.h Fri Feb 18 17:28:53 2011 @@ -56,6 +56,7 @@ public: explicit DIBuilder(Module &M); const MDNode *getCU() { return TheCU; } + enum ComplexAddrKind { OpPlus=1, OpDeref }; /// CreateCompileUnit - A CompileUnit provides an anchor for all debugging /// information generated during this instance of compilation. From foldr at codedgers.com Fri Feb 18 18:33:27 2011 From: foldr at codedgers.com (Mikhail Glushenkov) Date: Sat, 19 Feb 2011 00:33:27 -0000 Subject: [llvm-commits] [llvm] r126000 - /llvm/trunk/tools/llvmc/src/Base.td.in Message-ID: <20110219003327.678842A6C12C@llvm.org> Author: foldr Date: Fri Feb 18 18:33:27 2011 New Revision: 126000 URL: http://llvm.org/viewvc/llvm-project?rev=126000&view=rev Log: Make "-opt [-emit-llvm]" work for .ll files. Patch by Kaelyn Uhrain! Modified: llvm/trunk/tools/llvmc/src/Base.td.in Modified: llvm/trunk/tools/llvmc/src/Base.td.in URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc/src/Base.td.in?rev=126000&r1=125999&r2=126000&view=diff ============================================================================== --- llvm/trunk/tools/llvmc/src/Base.td.in (original) +++ llvm/trunk/tools/llvmc/src/Base.td.in Fri Feb 18 18:33:27 2011 @@ -274,7 +274,8 @@ (out_language "llvm-bitcode"), (output_suffix "bc"), (command "llvm-as"), - (actions (case (switch_on "emit-llvm"), (stop_compilation))) + (actions (case (and (switch_on "emit-llvm"), (not (switch_on "opt"))), + (stop_compilation))) ]>; def llvm_gcc_assembler : Tool< @@ -424,7 +425,8 @@ (edge "llvm_as", "llc"), (optional_edge "root", "llvm_as", - (case (switch_on "emit-llvm"), (inc_weight))), + (case (or (switch_on "emit-llvm"), + (switch_on "opt")), (inc_weight))), (optional_edge "llvm_gcc_c", "opt", (case (switch_on "opt"), (inc_weight))), (optional_edge "llvm_gcc_cpp", "opt", From stoklund at 2pi.dk Fri Feb 18 18:38:40 2011 From: stoklund at 2pi.dk (Jakob Stoklund Olesen) Date: Sat, 19 Feb 2011 00:38:40 -0000 Subject: [llvm-commits] [llvm] r126001 - /llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp Message-ID: <20110219003840.78D2D2A6C12C@llvm.org> Author: stoklund Date: Fri Feb 18 18:38:40 2011 New Revision: 126001 URL: http://llvm.org/viewvc/llvm-project?rev=126001&view=rev Log: Separate timers for local and global splitting. Modified: llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp Modified: llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp?rev=126001&r1=126000&r2=126001&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp (original) +++ llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp Fri Feb 18 18:38:40 2011 @@ -1116,12 +1116,15 @@ /// @return Physreg when VirtReg may be assigned and/or new NewVRegs. unsigned RAGreedy::trySplit(LiveInterval &VirtReg, AllocationOrder &Order, SmallVectorImpl&NewVRegs) { - NamedRegionTimer T("Splitter", TimerGroupName, TimePassesIsEnabled); SA->analyze(&VirtReg); // Local intervals are handled separately. - if (LIS->intervalIsInOneMBB(VirtReg)) + if (LIS->intervalIsInOneMBB(VirtReg)) { + NamedRegionTimer T("Local Splitting", TimerGroupName, TimePassesIsEnabled); return tryLocalSplit(VirtReg, Order, NewVRegs); + } + + NamedRegionTimer T("Global Splitting", TimerGroupName, TimePassesIsEnabled); // First try to split around a region spanning multiple blocks. unsigned PhysReg = tryRegionSplit(VirtReg, Order, NewVRegs); From stoklund at 2pi.dk Fri Feb 18 18:38:43 2011 From: stoklund at 2pi.dk (Jakob Stoklund Olesen) Date: Sat, 19 Feb 2011 00:38:43 -0000 Subject: [llvm-commits] [llvm] r126002 - in /llvm/trunk/lib/CodeGen: LiveRangeEdit.cpp LiveRangeEdit.h VirtRegMap.h Message-ID: <20110219003843.422112A6C12D@llvm.org> Author: stoklund Date: Fri Feb 18 18:38:43 2011 New Revision: 126002 URL: http://llvm.org/viewvc/llvm-project?rev=126002&view=rev Log: This method belonged in VirtRegMap. Modified: llvm/trunk/lib/CodeGen/LiveRangeEdit.cpp llvm/trunk/lib/CodeGen/LiveRangeEdit.h llvm/trunk/lib/CodeGen/VirtRegMap.h Modified: llvm/trunk/lib/CodeGen/LiveRangeEdit.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveRangeEdit.cpp?rev=126002&r1=126001&r2=126002&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LiveRangeEdit.cpp (original) +++ llvm/trunk/lib/CodeGen/LiveRangeEdit.cpp Fri Feb 18 18:38:43 2011 @@ -19,18 +19,13 @@ using namespace llvm; -unsigned LiveRangeEdit::getOriginal(const VirtRegMap &vrm) const { - unsigned Orig = vrm.getPreSplitReg(getReg()); - return Orig ? Orig : getReg(); -} - LiveInterval &LiveRangeEdit::create(MachineRegisterInfo &mri, LiveIntervals &lis, VirtRegMap &vrm) { const TargetRegisterClass *RC = mri.getRegClass(getReg()); unsigned VReg = mri.createVirtualRegister(RC); vrm.grow(); - vrm.setIsSplitFromReg(VReg, getOriginal(vrm)); + vrm.setIsSplitFromReg(VReg, vrm.getOriginal(getReg())); LiveInterval &li = lis.getOrCreateInterval(VReg); newRegs_.push_back(&li); return li; Modified: llvm/trunk/lib/CodeGen/LiveRangeEdit.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveRangeEdit.h?rev=126002&r1=126001&r2=126002&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LiveRangeEdit.h (original) +++ llvm/trunk/lib/CodeGen/LiveRangeEdit.h Fri Feb 18 18:38:43 2011 @@ -73,10 +73,6 @@ LiveInterval &getParent() const { return parent_; } unsigned getReg() const { return parent_.reg; } - /// getOriginal - Return the original virtual register that parent descends - /// from through splitting. The original was not created by splitting. - unsigned getOriginal(const VirtRegMap&) const; - /// Iterator for accessing the new registers added by this edit. typedef SmallVectorImpl::const_iterator iterator; iterator begin() const { return newRegs_.begin()+firstNew_; } Modified: llvm/trunk/lib/CodeGen/VirtRegMap.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/VirtRegMap.h?rev=126002&r1=126001&r2=126002&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/VirtRegMap.h (original) +++ llvm/trunk/lib/CodeGen/VirtRegMap.h Fri Feb 18 18:38:43 2011 @@ -218,6 +218,15 @@ return Virt2SplitMap[virtReg]; } + /// getOriginal - Return the original virtual register that VirtReg descends + /// from through splitting. + /// A register that was not created by splitting is its own original. + /// This operation is idempotent. + unsigned getOriginal(unsigned VirtReg) const { + unsigned Orig = getPreSplitReg(VirtReg); + return Orig ? Orig : VirtReg; + } + /// @brief returns true if the specified virtual register is not /// mapped to a stack slot or rematerialized. bool isAssignedReg(unsigned virtReg) const { From stoklund at 2pi.dk Fri Feb 18 18:42:33 2011 From: stoklund at 2pi.dk (Jakob Stoklund Olesen) Date: Sat, 19 Feb 2011 00:42:33 -0000 Subject: [llvm-commits] [llvm] r126003 - in /llvm/trunk/lib/CodeGen: SplitKit.cpp SplitKit.h Message-ID: <20110219004233.B81952A6C12C@llvm.org> Author: stoklund Date: Fri Feb 18 18:42:33 2011 New Revision: 126003 URL: http://llvm.org/viewvc/llvm-project?rev=126003&view=rev Log: Missed member rename for naming convention. Modified: llvm/trunk/lib/CodeGen/SplitKit.cpp llvm/trunk/lib/CodeGen/SplitKit.h Modified: llvm/trunk/lib/CodeGen/SplitKit.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SplitKit.cpp?rev=126003&r1=126002&r2=126003&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SplitKit.cpp (original) +++ llvm/trunk/lib/CodeGen/SplitKit.cpp Fri Feb 18 18:42:33 2011 @@ -549,7 +549,7 @@ VirtRegMap &vrm, MachineDominatorTree &mdt, LiveRangeEdit &edit) - : sa_(sa), LIS(lis), VRM(vrm), + : SA(sa), LIS(lis), VRM(vrm), MRI(vrm.getMachineFunction().getRegInfo()), MDT(mdt), TII(*vrm.getMachineFunction().getTarget().getInstrInfo()), @@ -898,7 +898,7 @@ } // Calculate spill weight and allocation hints for new intervals. - VirtRegAuxInfo vrai(VRM.getMachineFunction(), LIS, sa_.Loops); + VirtRegAuxInfo vrai(VRM.getMachineFunction(), LIS, SA.Loops); for (LiveRangeEdit::iterator I = Edit.begin(), E = Edit.end(); I != E; ++I){ LiveInterval &li = **I; vrai.CalculateRegClass(li.reg); @@ -939,8 +939,8 @@ void SplitEditor::splitSingleBlocks(const SplitAnalysis::BlockPtrSet &Blocks) { DEBUG(dbgs() << " splitSingleBlocks for " << Blocks.size() << " blocks.\n"); - for (unsigned i = 0, e = sa_.LiveBlocks.size(); i != e; ++i) { - const SplitAnalysis::BlockInfo &BI = sa_.LiveBlocks[i]; + for (unsigned i = 0, e = SA.LiveBlocks.size(); i != e; ++i) { + const SplitAnalysis::BlockInfo &BI = SA.LiveBlocks[i]; if (!BI.Uses || !Blocks.count(BI.MBB)) continue; @@ -982,9 +982,9 @@ /// splitInsideBlock - Split CurLI into multiple intervals inside MBB. void SplitEditor::splitInsideBlock(const MachineBasicBlock *MBB) { SmallVector Uses; - Uses.reserve(sa_.UsingInstrs.size()); - for (SplitAnalysis::InstrPtrSet::const_iterator I = sa_.UsingInstrs.begin(), - E = sa_.UsingInstrs.end(); I != E; ++I) + Uses.reserve(SA.UsingInstrs.size()); + for (SplitAnalysis::InstrPtrSet::const_iterator I = SA.UsingInstrs.begin(), + E = SA.UsingInstrs.end(); I != E; ++I) if ((*I)->getParent() == MBB) Uses.push_back(LIS.getInstructionIndex(*I)); DEBUG(dbgs() << " splitInsideBlock BB#" << MBB->getNumber() << " for " Modified: llvm/trunk/lib/CodeGen/SplitKit.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SplitKit.h?rev=126003&r1=126002&r2=126003&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SplitKit.h (original) +++ llvm/trunk/lib/CodeGen/SplitKit.h Fri Feb 18 18:42:33 2011 @@ -260,7 +260,7 @@ /// - Rewrite instructions with finish(). /// class SplitEditor { - SplitAnalysis &sa_; + SplitAnalysis &SA; LiveIntervals &LIS; VirtRegMap &VRM; MachineRegisterInfo &MRI; @@ -315,7 +315,7 @@ MachineDominatorTree&, LiveRangeEdit&); /// getAnalysis - Get the corresponding analysis. - SplitAnalysis &getAnalysis() { return sa_; } + SplitAnalysis &getAnalysis() { return SA; } /// Create a new virtual register and live interval. void openIntv(); From joerg at bec.de Fri Feb 18 18:43:45 2011 From: joerg at bec.de (Joerg Sonnenberger) Date: Sat, 19 Feb 2011 00:43:45 -0000 Subject: [llvm-commits] [llvm] r126004 - /llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Message-ID: <20110219004345.E80852A6C12C@llvm.org> Author: joerg Date: Fri Feb 18 18:43:45 2011 New Revision: 126004 URL: http://llvm.org/viewvc/llvm-project?rev=126004&view=rev Log: Avoid dangling else warnings. Modified: llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Modified: llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp?rev=126004&r1=126003&r2=126004&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp (original) +++ llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Fri Feb 18 18:43:45 2011 @@ -1009,11 +1009,12 @@ .Case("nzcvqg", 0xc) // same as CPSR_fs .Default(~0U); - if (FlagsVal == ~0U) + if (FlagsVal == ~0U) { if (!Flags.empty()) return MatchOperand_NoMatch; else FlagsVal = 0; // No flag + } } else if (SpecReg == "cpsr" || SpecReg == "spsr") { for (int i = 0, e = Flags.size(); i != e; ++i) { unsigned Flag = StringSwitch(Flags.substr(i, 1)) From stoklund at 2pi.dk Fri Feb 18 18:53:42 2011 From: stoklund at 2pi.dk (Jakob Stoklund Olesen) Date: Sat, 19 Feb 2011 00:53:42 -0000 Subject: [llvm-commits] [llvm] r126005 - in /llvm/trunk/lib/CodeGen: RegAllocGreedy.cpp SplitKit.cpp SplitKit.h Message-ID: <20110219005342.4808B2A6C12C@llvm.org> Author: stoklund Date: Fri Feb 18 18:53:42 2011 New Revision: 126005 URL: http://llvm.org/viewvc/llvm-project?rev=126005&view=rev Log: Give SplitAnalysis a VRM member to access VirtRegMap::getOriginal(). Modified: llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp llvm/trunk/lib/CodeGen/SplitKit.cpp llvm/trunk/lib/CodeGen/SplitKit.h Modified: llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp?rev=126005&r1=126004&r2=126005&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp (original) +++ llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp Fri Feb 18 18:53:42 2011 @@ -1266,7 +1266,7 @@ Bundles = &getAnalysis(); SpillPlacer = &getAnalysis(); - SA.reset(new SplitAnalysis(*MF, *LIS, *Loops)); + SA.reset(new SplitAnalysis(*VRM, *LIS, *Loops)); allocatePhysRegs(); addMBBLiveIns(MF); Modified: llvm/trunk/lib/CodeGen/SplitKit.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SplitKit.cpp?rev=126005&r1=126004&r2=126005&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SplitKit.cpp (original) +++ llvm/trunk/lib/CodeGen/SplitKit.cpp Fri Feb 18 18:53:42 2011 @@ -37,13 +37,14 @@ // Split Analysis //===----------------------------------------------------------------------===// -SplitAnalysis::SplitAnalysis(const MachineFunction &mf, +SplitAnalysis::SplitAnalysis(const VirtRegMap &vrm, const LiveIntervals &lis, const MachineLoopInfo &mli) - : MF(mf), + : MF(vrm.getMachineFunction()), + VRM(vrm), LIS(lis), Loops(mli), - TII(*mf.getTarget().getInstrInfo()), + TII(*MF.getTarget().getInstrInfo()), CurLI(0) {} void SplitAnalysis::clear() { Modified: llvm/trunk/lib/CodeGen/SplitKit.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SplitKit.h?rev=126005&r1=126004&r2=126005&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SplitKit.h (original) +++ llvm/trunk/lib/CodeGen/SplitKit.h Fri Feb 18 18:53:42 2011 @@ -43,6 +43,7 @@ class SplitAnalysis { public: const MachineFunction &MF; + const VirtRegMap &VRM; const LiveIntervals &LIS; const MachineLoopInfo &Loops; const TargetInstrInfo &TII; @@ -105,7 +106,7 @@ bool canAnalyzeBranch(const MachineBasicBlock *MBB); public: - SplitAnalysis(const MachineFunction &mf, const LiveIntervals &lis, + SplitAnalysis(const VirtRegMap &vrm, const LiveIntervals &lis, const MachineLoopInfo &mli); /// analyze - set CurLI to the specified interval, and analyze how it may be From dpatel at apple.com Fri Feb 18 19:28:37 2011 From: dpatel at apple.com (Devang Patel) Date: Sat, 19 Feb 2011 01:28:37 -0000 Subject: [llvm-commits] [llvm] r126008 - /llvm/trunk/test/CodeGen/X86/2011-01-24-DbgValue-Before-Use.ll Message-ID: <20110219012837.90D302A6C12C@llvm.org> Author: dpatel Date: Fri Feb 18 19:28:37 2011 New Revision: 126008 URL: http://llvm.org/viewvc/llvm-project?rev=126008&view=rev Log: DIE numbers do not add any value in this test. Modified: llvm/trunk/test/CodeGen/X86/2011-01-24-DbgValue-Before-Use.ll Modified: llvm/trunk/test/CodeGen/X86/2011-01-24-DbgValue-Before-Use.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2011-01-24-DbgValue-Before-Use.ll?rev=126008&r1=126007&r2=126008&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/2011-01-24-DbgValue-Before-Use.ll (original) +++ llvm/trunk/test/CodeGen/X86/2011-01-24-DbgValue-Before-Use.ll Fri Feb 18 19:28:37 2011 @@ -3,11 +3,11 @@ target triple = "x86_64-apple-darwin10.0.0" ; Check debug info for variable z_s -;CHECK: .ascii "z_s" ## DW_AT_name -;CHECK-NEXT: .byte 0 -;CHECK-NEXT: .byte 1 ## DW_AT_decl_file -;CHECK-NEXT: .byte 27 ## DW_AT_decl_line -;CHECK-NEXT: .long 203 ## DW_AT_type +;CHECK: .ascii "z_s" ## DW_AT_name +;CHECK-NEXT: .byte 0 +;CHECK-NEXT: ## DW_AT_decl_file +;CHECK-NEXT: ## DW_AT_decl_line +;CHECK-NEXT: ## DW_AT_type ;CHECK-NEXT: ## DW_AT_location From dpatel at apple.com Fri Feb 18 19:31:27 2011 From: dpatel at apple.com (Devang Patel) Date: Sat, 19 Feb 2011 01:31:27 -0000 Subject: [llvm-commits] [llvm] r126009 - /llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Message-ID: <20110219013127.655392A6C12C@llvm.org> Author: dpatel Date: Fri Feb 18 19:31:27 2011 New Revision: 126009 URL: http://llvm.org/viewvc/llvm-project?rev=126009&view=rev Log: Do not emit empty DW_TAG_lexical_block DIEs. In one test case, size of debug info reduced by almost 7%. Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=126009&r1=126008&r2=126009&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original) +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Fri Feb 18 19:31:27 2011 @@ -1800,6 +1800,16 @@ if (!Scope || !Scope->getScopeNode()) return NULL; + SmallVector Children; + // Collect lexical scope childrens first. + const SmallVector &Variables = Scope->getDbgVariables(); + for (unsigned i = 0, N = Variables.size(); i < N; ++i) + if (DIE *Variable = constructVariableDIE(Variables[i], Scope)) + Children.push_back(Variable); + const SmallVector &Scopes = Scope->getScopes(); + for (unsigned j = 0, M = Scopes.size(); j < M; ++j) + if (DIE *Nested = constructScopeDIE(Scopes[j])) + Children.push_back(Nested); DIScope DS(Scope->getScopeNode()); DIE *ScopeDIE = NULL; if (Scope->getInlinedAt()) @@ -1815,26 +1825,19 @@ else ScopeDIE = updateSubprogramScopeDIE(DS); } - else + else { + // There is no need to emit empty lexical block DIE. + if (Children.empty()) + return NULL; ScopeDIE = constructLexicalScopeDIE(Scope); - if (!ScopeDIE) return NULL; - - // Add variables to scope. - const SmallVector &Variables = Scope->getDbgVariables(); - for (unsigned i = 0, N = Variables.size(); i < N; ++i) { - DIE *VariableDIE = constructVariableDIE(Variables[i], Scope); - if (VariableDIE) - ScopeDIE->addChild(VariableDIE); } + + if (!ScopeDIE) return NULL; - // Add nested scopes. - const SmallVector &Scopes = Scope->getScopes(); - for (unsigned j = 0, M = Scopes.size(); j < M; ++j) { - // Define the Scope debug information entry. - DIE *NestedDIE = constructScopeDIE(Scopes[j]); - if (NestedDIE) - ScopeDIE->addChild(NestedDIE); - } + // Add children + for (SmallVector::iterator I = Children.begin(), + E = Children.end(); I != E; ++I) + ScopeDIE->addChild(*I); if (DS.isSubprogram()) addPubTypes(DISubprogram(DS)); From kremenek at apple.com Fri Feb 18 19:59:22 2011 From: kremenek at apple.com (Ted Kremenek) Date: Sat, 19 Feb 2011 01:59:22 -0000 Subject: [llvm-commits] [llvm] r126011 - /llvm/trunk/include/llvm/ADT/ImmutableMap.h Message-ID: <20110219015922.20FFC2A6C12C@llvm.org> Author: kremenek Date: Fri Feb 18 19:59:21 2011 New Revision: 126011 URL: http://llvm.org/viewvc/llvm-project?rev=126011&view=rev Log: Add ImmutableMap methods 'manualRetain()', 'manualRelease()', and 'getRootWithoutRetain()' to help more aggressively reclaim memory in the static analyzer. Modified: llvm/trunk/include/llvm/ADT/ImmutableMap.h Modified: llvm/trunk/include/llvm/ADT/ImmutableMap.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/ImmutableMap.h?rev=126011&r1=126010&r2=126011&view=diff ============================================================================== --- llvm/trunk/include/llvm/ADT/ImmutableMap.h (original) +++ llvm/trunk/include/llvm/ADT/ImmutableMap.h Fri Feb 18 19:59:21 2011 @@ -134,11 +134,23 @@ return Root && RHS.Root ? Root->isNotEqual(*RHS.Root) : Root != RHS.Root; } - TreeTy* getRoot() const { + TreeTy *getRoot() const { if (Root) { Root->retain(); } return Root; } + TreeTy *getRootWithoutRetain() const { + return Root; + } + + void manualRetain() { + if (Root) Root->retain(); + } + + void manualRelease() { + if (Root) Root->release(); + } + bool isEmpty() const { return !Root; } //===--------------------------------------------------===// From echristo at apple.com Fri Feb 18 21:19:09 2011 From: echristo at apple.com (Eric Christopher) Date: Sat, 19 Feb 2011 03:19:09 -0000 Subject: [llvm-commits] [llvm] r126018 - /llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Message-ID: <20110219031909.69BD72A6C12F@llvm.org> Author: echristo Date: Fri Feb 18 21:19:09 2011 New Revision: 126018 URL: http://llvm.org/viewvc/llvm-project?rev=126018&view=rev Log: Fix typos. Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=126018&r1=126017&r2=126018&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Fri Feb 18 21:19:09 2011 @@ -5509,7 +5509,7 @@ case MVT::v16i8: return X86ISD::PUNPCKLBW; case MVT::v8i16: return X86ISD::PUNPCKLWD; default: - llvm_unreachable("Unknow type for unpckl"); + llvm_unreachable("Unknown type for unpckl"); } return 0; } @@ -5523,7 +5523,7 @@ case MVT::v16i8: return X86ISD::PUNPCKHBW; case MVT::v8i16: return X86ISD::PUNPCKHWD; default: - llvm_unreachable("Unknow type for unpckh"); + llvm_unreachable("Unknown type for unpckh"); } return 0; } From akyrtzi at gmail.com Fri Feb 18 21:55:58 2011 From: akyrtzi at gmail.com (Argyrios Kyrtzidis) Date: Sat, 19 Feb 2011 03:55:58 -0000 Subject: [llvm-commits] [llvm] r126019 - in /llvm/trunk/include/llvm/ADT: PointerIntPair.h PointerUnion.h Message-ID: <20110219035558.F2A772A6C12C@llvm.org> Author: akirtzidis Date: Fri Feb 18 21:55:58 2011 New Revision: 126019 URL: http://llvm.org/viewvc/llvm-project?rev=126019&view=rev Log: Allow getting the address of the value in a PointerUnion or PointerIntPair if one is confident enough that he knows what he is doing. Modified: llvm/trunk/include/llvm/ADT/PointerIntPair.h llvm/trunk/include/llvm/ADT/PointerUnion.h Modified: llvm/trunk/include/llvm/ADT/PointerIntPair.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/PointerIntPair.h?rev=126019&r1=126018&r2=126019&view=diff ============================================================================== --- llvm/trunk/include/llvm/ADT/PointerIntPair.h (original) +++ llvm/trunk/include/llvm/ADT/PointerIntPair.h Fri Feb 18 21:55:58 2011 @@ -91,6 +91,13 @@ Value |= IntVal << IntShift; // Set new integer. } + PointerTy const *getAddrOfPointer() const { + assert(Value == reinterpret_cast(getPointer()) && + "Can only return the address if IntBits is cleared and " + "PtrTraits doesn't change the pointer"); + return reinterpret_cast(&Value); + } + void *getOpaqueValue() const { return reinterpret_cast(Value); } void setFromOpaqueValue(void *Val) { Value = reinterpret_cast(Val);} Modified: llvm/trunk/include/llvm/ADT/PointerUnion.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/PointerUnion.h?rev=126019&r1=126018&r2=126019&view=diff ============================================================================== --- llvm/trunk/include/llvm/ADT/PointerUnion.h (original) +++ llvm/trunk/include/llvm/ADT/PointerUnion.h Fri Feb 18 21:55:58 2011 @@ -107,6 +107,18 @@ if (is()) return get(); return T(); } + + /// \brief If the union is set to the first pointer type we can get an + /// address pointing to it. + template + PT1 const *getAddrOf() const { + assert(is() && "Val is not the first pointer"); + assert(get() == Val.getPointer() && + "Can't get the address because PointerLikeTypeTraits changes the ptr"); + T const *can_only_get_address_of_first_pointer_type + = reinterpret_cast(Val.getAddrOfPointer()); + return can_only_get_address_of_first_pointer_type; + } /// Assignment operators - Allow assigning into this union from either /// pointer type, setting the discriminator to remember what it came from. From baldrick at free.fr Sat Feb 19 03:27:04 2011 From: baldrick at free.fr (Duncan Sands) Date: Sat, 19 Feb 2011 10:27:04 +0100 Subject: [llvm-commits] [llvm] r126019 - in /llvm/trunk/include/llvm/ADT: PointerIntPair.h PointerUnion.h In-Reply-To: <20110219035558.F2A772A6C12C@llvm.org> References: <20110219035558.F2A772A6C12C@llvm.org> Message-ID: <4D5F8CE8.50809@free.fr> Hi Argyrios, > Allow getting the address of the value in a PointerUnion or PointerIntPair if one is > confident enough that he knows what he is doing. this sounds like a bad idea to me - why do you need it? Ciao, Duncan. From geek4civic at gmail.com Sat Feb 19 05:34:13 2011 From: geek4civic at gmail.com (NAKAMURA Takumi) Date: Sat, 19 Feb 2011 20:34:13 +0900 Subject: [llvm-commits] [PATCH] [PR8850] Increase stack size for tblgen on mingw-w64. Message-ID: --- Makefile.config.in | 3 +++ utils/TableGen/Makefile | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) -- I am doing configure --host=x86_64-w64-mingw32 to build with mingw-w64. ...Takumi -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-PR8850-Increase-stack-size-for-tblgen-on-mingw-w.patch.txt Type: text/x-patch Size: 774 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110219/74bcd2ec/attachment.bin From anton at korobeynikov.info Sat Feb 19 05:38:37 2011 From: anton at korobeynikov.info (Anton Korobeynikov) Date: Sat, 19 Feb 2011 14:38:37 +0300 Subject: [llvm-commits] [PATCH] [PR8850] Increase stack size for tblgen on mingw-w64. In-Reply-To: References: Message-ID: > I am doing configure --host=x86_64-w64-mingw32 to build with mingw-w64. Ok for me. Please add a comment why this is necessary though (cellspu stuff, etc.) -- With best regards, Anton Korobeynikov Faculty of Mathematics and Mechanics, Saint Petersburg State University From aggarwa4 at illinois.edu Sat Feb 19 07:32:43 2011 From: aggarwa4 at illinois.edu (Arushi Aggarwal) Date: Sat, 19 Feb 2011 13:32:43 -0000 Subject: [llvm-commits] [poolalloc] r126027 - /poolalloc/trunk/lib/DSA/StdLibPass.cpp Message-ID: <20110219133243.D256C2A6C12C@llvm.org> Author: aggarwa4 Date: Sat Feb 19 07:32:43 2011 New Revision: 126027 URL: http://llvm.org/viewvc/llvm-project?rev=126027&view=rev Log: Added more functions. Fixed summary for others.` Modified: poolalloc/trunk/lib/DSA/StdLibPass.cpp Modified: poolalloc/trunk/lib/DSA/StdLibPass.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/StdLibPass.cpp?rev=126027&r1=126026&r2=126027&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/StdLibPass.cpp (original) +++ poolalloc/trunk/lib/DSA/StdLibPass.cpp Sat Feb 19 07:32:43 2011 @@ -84,51 +84,73 @@ {"stat", {NRET_YNARGS, NRET_NYARGS, NRET_NARGS, NRET_NARGS, false}}, {"fstat", {NRET_YNARGS, NRET_NYARGS, NRET_NARGS, NRET_NARGS, false}}, {"lstat", {NRET_YNARGS, NRET_NYARGS, NRET_NARGS, NRET_NARGS, false}}, - {"read", {NRET_YARGS, YRET_YARGS, NRET_NARGS, NRET_NARGS, false}}, - {"time", {NRET_YARGS, YRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + + {"getenv", {NRET_YNARGS, YRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + + {"remove", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"rename", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"unlink", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"fileno", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"create", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"write", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"read", {NRET_YARGS, YRET_YARGS, NRET_NARGS, NRET_NARGS, false}}, + {"truncate", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"open", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + + {"chdir", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"mkdir", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"rmdir", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + + {"chmod", {NRET_YARGS, YRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"fchmod", {NRET_YARGS, YRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + + {"kill", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + + {"execl", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"execlp", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"execle", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"execv", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"execvp", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + + {"time", {NRET_YARGS, YRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"ctime", {NRET_YARGS, YRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"asctime", {NRET_YARGS, YRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"utime", {NRET_YARGS, YRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"localtime", {NRET_YARGS, YRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"gmtime", {NRET_YARGS, YRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"ftime", {NRET_YARGS, NRET_YARGS, NRET_NARGS, NRET_NARGS, false}}, + //FIXME:add the exec family // printf not strictly true, %n could cause a write {"printf", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, - {"sscanf", {NRET_YARGS, YRET_NYARGS, NRET_NARGS, NRET_NARGS, false}}, - {"scanf", {NRET_YARGS, YRET_NYARGS, NRET_NARGS, NRET_NARGS, false}}, - {"fscanf", {NRET_YARGS, YRET_NYARGS, NRET_NARGS, NRET_NARGS, false}}, {"fprintf", {NRET_YARGS, NRET_YNARGS, NRET_NARGS, NRET_NARGS, false}}, - {"fprintf", {NRET_YARGS, NRET_YNARGS, NRET_NARGS, NRET_NYARGS, false}}, + {"fprintf", {NRET_YARGS, NRET_YNARGS, NRET_NARGS, NRET_NARGS, false}}, {"sprintf", {NRET_YARGS, NRET_YNARGS, NRET_NARGS, NRET_NARGS, false}}, {"snprintf", {NRET_YARGS, NRET_YNARGS, NRET_NARGS, NRET_NARGS, false}}, - {"vsnprintf", {NRET_YARGS, YRET_YNARGS, NRET_NARGS, YRET_YARGS, false}}, - {"puts", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, - {"gets", {NRET_NARGS, YRET_YARGS, NRET_NARGS, YRET_YNARGS, false}}, - {"fgets", {NRET_NYARGS, YRET_YNARGS, NRET_NARGS, YRET_YNARGS, false}}, - {"getc", {NRET_YNARGS, YRET_YNARGS, NRET_NARGS, NRET_NARGS, false}}, - {"ungetc", {NRET_YNARGS, YRET_YARGS, NRET_NARGS, NRET_NARGS, false}}, - {"_IO_getc", {NRET_YNARGS, YRET_YNARGS, NRET_NARGS, NRET_NARGS, false}}, - {"fgetc", {NRET_YNARGS, YRET_YNARGS, NRET_NARGS, NRET_NARGS, false}}, - {"putc", {NRET_NARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, - {"_IO_putc", {NRET_NARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, - {"putchar", {NRET_NARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, - {"fputs", {NRET_YARGS, NRET_NYARGS, NRET_NARGS, NRET_NARGS, false}}, - {"fputc", {NRET_YARGS, NRET_NYARGS, NRET_NARGS, NRET_NARGS, false}}, - {"feof", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"vsnprintf", {NRET_YARGS, YRET_YNARGS, NRET_NARGS, NRET_NARGS, false}}, + {"sscanf", {NRET_YARGS, YRET_NYARGS, NRET_NARGS, NRET_NARGS, false}}, + {"scanf", {NRET_YARGS, YRET_NYARGS, NRET_NARGS, NRET_NARGS, false}}, + {"fscanf", {NRET_YARGS, YRET_NYARGS, NRET_NARGS, NRET_NARGS, false}}, + {"calloc", {NRET_NARGS, YRET_NARGS, YRET_NARGS, NRET_NARGS, false}}, {"malloc", {NRET_NARGS, YRET_NARGS, YRET_NARGS, NRET_NARGS, false}}, {"valloc", {NRET_NARGS, YRET_NARGS, YRET_NARGS, NRET_NARGS, false}}, {"realloc", {NRET_NARGS, YRET_NARGS, YRET_YNARGS, YRET_YNARGS,false}}, - {"memalign", {NRET_NARGS, YRET_NARGS, YRET_NARGS, NRET_NARGS, false}}, - {"posix_memalign", {NRET_YARGS, YRET_YNARGS, NRET_NARGS, NRET_NARGS, false}}, {"free", {NRET_NARGS, NRET_NARGS, NRET_YNARGS, NRET_NARGS, false}}, - {"strdup", {NRET_YARGS, YRET_NARGS, YRET_NARGS, YRET_YARGS, false}}, - {"__strdup", {NRET_YARGS, YRET_NARGS, YRET_NARGS, YRET_YARGS, false}}, - {"wcsdup", {NRET_YARGS, YRET_NARGS, YRET_NARGS, YRET_YARGS, false}}, - + {"strdup", {NRET_YARGS, YRET_NARGS, YRET_NARGS, YRET_YARGS, false}}, + {"__strdup", {NRET_YARGS, YRET_NARGS, YRET_NARGS, YRET_YARGS, false}}, + {"wcsdup", {NRET_YARGS, YRET_NARGS, YRET_NARGS, YRET_YARGS, false}}, + + {"strlen", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"wcslen", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"atoi", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, {"atof", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, {"atol", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, {"atoll", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, {"atoq", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, - {"memcmp", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, {"strcmp", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, {"wcscmp", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, @@ -138,47 +160,77 @@ {"wcscasecmp", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, {"strncasecmp",{NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, {"wcsncasecmp",{NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, - {"strlen", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, - {"wcslen", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, - - {"memchr", {YRET_YARGS, NRET_NARGS, NRET_NARGS, YRET_YNARGS, true}}, - {"wmemchr", {YRET_YARGS, NRET_NARGS, NRET_NARGS, YRET_YNARGS, true}}, - {"memrchr", {YRET_YARGS, NRET_NARGS, NRET_NARGS, YRET_YNARGS, true}}, - {"strchr", {YRET_YARGS, NRET_NARGS, NRET_NARGS, YRET_YNARGS, true}}, - {"wcschr", {YRET_YARGS, NRET_NARGS, NRET_NARGS, YRET_YNARGS, true}}, - {"strrchr", {YRET_YARGS, NRET_NARGS, NRET_NARGS, YRET_YNARGS, true}}, - {"wcsrchr", {YRET_YARGS, NRET_NARGS, NRET_NARGS, YRET_YNARGS, true}}, - {"strchrhul", {YRET_YARGS, NRET_NARGS, NRET_NARGS, YRET_YNARGS, true}}, - {"strcat", {YRET_YARGS, YRET_YARGS, NRET_NARGS, YRET_YARGS, true}}, - {"strncat", {YRET_YARGS, YRET_YARGS, NRET_NARGS, YRET_YARGS, true}}, - + + {"strcat", {NRET_YARGS, YRET_YARGS, NRET_NARGS, YRET_YARGS, true}}, + {"strncat", {NRET_YARGS, YRET_YARGS, NRET_NARGS, YRET_YARGS, true}}, + {"strcpy", {NRET_YARGS, YRET_YARGS, NRET_NARGS, YRET_YARGS, true}}, + {"stpcpy", {NRET_YARGS, YRET_YARGS, NRET_NARGS, YRET_YARGS, true}}, + {"wcscpy", {NRET_YARGS, YRET_YARGS, NRET_NARGS, YRET_YARGS, true}}, + {"strncpy", {NRET_YARGS, YRET_YARGS, NRET_NARGS, YRET_YARGS, true}}, + {"wcsncpy", {NRET_YARGS, YRET_YARGS, NRET_NARGS, YRET_YARGS, true}}, + {"memcpy", {NRET_YARGS, YRET_YARGS, NRET_NARGS, YRET_YARGS, true}}, + {"memccpy", {NRET_YARGS, YRET_YARGS, NRET_NARGS, YRET_YARGS, true}}, + {"wmemccpy", {NRET_YARGS, YRET_YARGS, NRET_NARGS, YRET_YARGS, true}}, + {"memmove", {NRET_YARGS, YRET_YARGS, NRET_NARGS, YRET_YARGS, true}}, + + {"bcopy", {NRET_YARGS, NRET_YARGS, NRET_NARGS, NRET_YARGS, true}}, + {"bcmp", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, true}}, + + {"strerror", {NRET_YARGS, YRET_NARGS, NRET_NARGS, NRET_NARGS, true}}, {"strstr", {NRET_YARGS, YRET_NARGS, NRET_NARGS, YRET_YNARGS, true}}, + {"wcsstr", {NRET_YARGS, YRET_NARGS, NRET_NARGS, YRET_YNARGS, true}}, {"strspn", {NRET_YARGS, YRET_NARGS, NRET_NARGS, NRET_NARGS, true}}, + {"wcsspn", {NRET_YARGS, YRET_NARGS, NRET_NARGS, NRET_NARGS, true}}, + {"strcspn", {NRET_YARGS, YRET_NARGS, NRET_NARGS, NRET_NARGS, true}}, + {"wcscspn", {NRET_YARGS, YRET_NARGS, NRET_NARGS, NRET_NARGS, true}}, {"strtok", {NRET_YARGS, YRET_YARGS, NRET_NARGS, YRET_YNARGS, true}}, - {"strncpy", {YRET_YARGS, YRET_YARGS, NRET_NARGS, YRET_YARGS, true}}, - {"memccpy", {YRET_YARGS, YRET_YARGS, NRET_NARGS, YRET_YARGS, true}}, - {"memcpy", {YRET_YARGS, YRET_YARGS, NRET_NARGS, YRET_YARGS, true}}, - {"memmove", {YRET_YARGS, YRET_YARGS, NRET_NARGS, YRET_YARGS, true}}, - {"bcopy", {NRET_YARGS, NRET_YARGS, NRET_NARGS, NRET_YARGS, true}}, - {"wmemccpy", {YRET_YARGS, YRET_YARGS, NRET_NARGS, YRET_YARGS, true}}, - {"wcscpy", {YRET_YARGS, YRET_YARGS, NRET_NARGS, YRET_YARGS, true}}, - {"wcsncpy", {YRET_YARGS, YRET_YARGS, NRET_NARGS, YRET_YARGS, true}}, + {"strpbrk", {NRET_YARGS, YRET_NARGS, NRET_NARGS, YRET_YNARGS, true}}, + {"wcspbrk", {NRET_YARGS, YRET_NARGS, NRET_NARGS, YRET_YNARGS, true}}, + {"strchr", {NRET_YARGS, YRET_NARGS, NRET_NARGS, YRET_YNARGS, true}}, + {"wcschr", {NRET_YARGS, YRET_NARGS, NRET_NARGS, YRET_YNARGS, true}}, + {"strrchr", {NRET_YARGS, YRET_NARGS, NRET_NARGS, YRET_YNARGS, true}}, + {"wcsrchr", {NRET_YARGS, YRET_NARGS, NRET_NARGS, YRET_YNARGS, true}}, + {"strchrnul", {NRET_YARGS, YRET_NARGS, NRET_NARGS, YRET_YNARGS, true}}, + {"wcschrnul", {NRET_YARGS, YRET_NARGS, NRET_NARGS, YRET_YNARGS, true}}, + + {"memchr", {NRET_YARGS, YRET_NARGS, NRET_NARGS, YRET_YNARGS, true}}, + {"wmemchr", {NRET_YARGS, YRET_NARGS, NRET_NARGS, YRET_YNARGS, true}}, + {"memrchr", {NRET_YARGS, YRET_NARGS, NRET_NARGS, YRET_YNARGS, true}}, + + {"memalign", {NRET_NARGS, YRET_NARGS, YRET_NARGS, NRET_NARGS, false}}, + //{"posix_memalign", {NRET_YARGS, YRET_YNARGS, NRET_NARGS, NRET_NARGS, false}}, + + {"perror", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + + {"feof", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"fflush", {NRET_YARGS, NRET_YARGS, NRET_NARGS, NRET_NARGS, false}}, + {"fpurge", {NRET_YARGS, NRET_YARGS, NRET_NARGS, NRET_NARGS, false}}, + {"fclose", {NRET_YARGS, NRET_YARGS, NRET_NARGS, NRET_NARGS, false}}, + {"fopen", {NRET_YARGS, YRET_NARGS, YRET_NARGS, NRET_NARGS, false}}, + {"ftell", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"fseek", {NRET_YARGS, NRET_YARGS, NRET_NARGS, NRET_NARGS, true}}, + {"ferror", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, {"fwrite", {NRET_YARGS, NRET_NYARGS, NRET_NARGS, NRET_NARGS, false}}, - {"write", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, {"fread", {NRET_NYARGS, NRET_YARGS, NRET_NARGS, NRET_NARGS, false}}, - {"fseek", {NRET_YARGS, YRET_YNARGS, NRET_NARGS, NRET_NARGS, false}}, - {"fflush", {NRET_YARGS, NRET_YARGS, NRET_NARGS, NRET_NARGS, false}}, - {"fclose", {NRET_YARGS, NRET_YARGS, NRET_NARGS, NRET_NARGS, false}}, - {"fopen", {NRET_YARGS, YRET_NARGS, YRET_NARGS, NRET_NARGS, false}}, - {"open", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, - {"fileno", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, - {"unlink", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, - {"perror", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, {"__errno_location", {NRET_NARGS, YRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"puts", {NRET_YARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"gets", {NRET_NARGS, YRET_YARGS, NRET_NARGS, YRET_YNARGS, false}}, + {"fgets", {NRET_NYARGS, YRET_YNARGS, NRET_NARGS, YRET_YNARGS, false}}, + {"getc", {NRET_YNARGS, YRET_YNARGS, NRET_NARGS, NRET_NARGS, false}}, + {"ungetc", {NRET_YNARGS, YRET_YARGS, NRET_NARGS, NRET_NARGS, false}}, + {"_IO_getc", {NRET_YNARGS, YRET_YNARGS, NRET_NARGS, NRET_NARGS, false}}, + {"fgetc", {NRET_YNARGS, YRET_YNARGS, NRET_NARGS, NRET_NARGS, false}}, + {"putc", {NRET_NARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"_IO_putc", {NRET_NARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"putchar", {NRET_NARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, + {"fputs", {NRET_YARGS, NRET_NYARGS, NRET_NARGS, NRET_NARGS, false}}, + {"fputc", {NRET_YARGS, NRET_NYARGS, NRET_NARGS, NRET_NARGS, false}}, + + // SAFECode Intrinsics {"sc.lscheck", {NRET_NARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, {"sc.lscheckui", {NRET_NARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, @@ -193,20 +245,6 @@ {"sc.pool_argvregister", {NRET_NARGS, NRET_NARGS, NRET_NARGS, NRET_NARGS, false}}, #if 0 - {"remove", {false, false, false, true, false, false, false, false, false}}, - {"unlink", {false, false, false, true, false, false, false, false, false}}, - {"rename", {false, false, false, true, false, false, false, false, false}}, - {"execl", {false, false, false, true, false, false, false, false, false}}, - {"execlp", {false, false, false, true, false, false, false, false, false}}, - {"execle", {false, false, false, true, false, false, false, false, false}}, - {"execv", {false, false, false, true, false, false, false, false, false}}, - {"execvp", {false, false, false, true, false, false, false, false, false}}, - {"chmod", {false, false, false, true, false, false, false, false, false}}, - {"create", {false, false, false, true, false, false, false, false, false}}, - {"truncate", {false, false, false, true, false, false, false, false, false}}, - {"chdir", {false, false, false, true, false, false, false, false, false}}, - {"mkdir", {false, false, false, true, false, false, false, false, false}}, - {"rmdir", {false, false, false, true, false, false, false, false, false}}, {"pipe", {false, false, false, false, true, false, false, false, false}}, {"wait", {false, false, false, false, true, false, false, false, false}}, {"getrusage", {false, false, false, false, true, false, false, false, false}}, @@ -557,3 +595,12 @@ return false; } + +/* + + functions to add + freopen + strftime + strtoul + + */ From aggarwa4 at illinois.edu Sat Feb 19 07:33:26 2011 From: aggarwa4 at illinois.edu (Arushi Aggarwal) Date: Sat, 19 Feb 2011 13:33:26 -0000 Subject: [llvm-commits] [poolalloc] r126028 - /poolalloc/trunk/lib/AssistDS/MergeGEP.cpp Message-ID: <20110219133326.9550F2A6C12C@llvm.org> Author: aggarwa4 Date: Sat Feb 19 07:33:26 2011 New Revision: 126028 URL: http://llvm.org/viewvc/llvm-project?rev=126028&view=rev Log: Merge GEPs even if they are not arrays. Helps in some cases. Modified: poolalloc/trunk/lib/AssistDS/MergeGEP.cpp Modified: poolalloc/trunk/lib/AssistDS/MergeGEP.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/MergeGEP.cpp?rev=126028&r1=126027&r2=126028&view=diff ============================================================================== --- poolalloc/trunk/lib/AssistDS/MergeGEP.cpp (original) +++ poolalloc/trunk/lib/AssistDS/MergeGEP.cpp Sat Feb 19 07:33:26 2011 @@ -42,8 +42,8 @@ if(!(isa(I))) continue; GetElementPtrInst *GEP = cast(I); - if(!isa(GEP->getType()->getElementType())) - continue; + // if(!isa(GEP->getType()->getElementType())) + // continue; std::vector worklist; for (Value::use_iterator UI = GEP->use_begin(), UE = GEP->use_end(); UI != UE; ++UI){ From aggarwa4 at illinois.edu Sat Feb 19 07:34:20 2011 From: aggarwa4 at illinois.edu (Arushi Aggarwal) Date: Sat, 19 Feb 2011 13:34:20 -0000 Subject: [llvm-commits] [poolalloc] r126029 - /poolalloc/trunk/lib/AssistDS/SimplifyGEP.cpp Message-ID: <20110219133420.5639B2A6C12E@llvm.org> Author: aggarwa4 Date: Sat Feb 19 07:34:20 2011 New Revision: 126029 URL: http://llvm.org/viewvc/llvm-project?rev=126029&view=rev Log: Some code stolen from InstCombine, to help DSA. Added: poolalloc/trunk/lib/AssistDS/SimplifyGEP.cpp Added: poolalloc/trunk/lib/AssistDS/SimplifyGEP.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/SimplifyGEP.cpp?rev=126029&view=auto ============================================================================== --- poolalloc/trunk/lib/AssistDS/SimplifyGEP.cpp (added) +++ poolalloc/trunk/lib/AssistDS/SimplifyGEP.cpp Sat Feb 19 07:34:20 2011 @@ -0,0 +1,173 @@ +#define DEBUG_TYPE "simplifygep" + +#include "llvm/Instructions.h" +#include "llvm/Module.h" +#include "llvm/Pass.h" +#include "llvm/Instructions.h" +#include "llvm/Constants.h" +#include "llvm/Support/GetElementPtrTypeIterator.h" +#include "llvm/Support/FormattedStream.h" +#include "llvm/Support/Debug.h" +#include "llvm/Operator.h" +#include "llvm/Target/TargetData.h" + +#include + +using namespace llvm; + +namespace { + static void preprocess(Module& M) { + for (Module::iterator F = M.begin(); F != M.end(); ++F){ + for (Function::iterator B = F->begin(), FE = F->end(); B != FE; ++B) { + for (BasicBlock::iterator I = B->begin(), BE = B->end(); I != BE; I++) { + if(!(isa(I))) + continue; + GetElementPtrInst *GEP = cast(I); + if(BitCastInst *BI = dyn_cast(GEP->getOperand(0))) { + if(Constant *C = dyn_cast(BI->getOperand(0))) { + GEP->setOperand(0, ConstantExpr::getBitCast(C, BI->getType())); + } + } + } + } + } + } + class SimplifyGEP : public ModulePass { + private: + TargetData * TD; + public: + static char ID; + SimplifyGEP() : ModulePass(&ID) {} + bool runOnModule(Module& M) { + TD = &getAnalysis(); + preprocess(M); + //bool changed = false; + for (Module::iterator F = M.begin(); F != M.end(); ++F){ + for (Function::iterator B = F->begin(), FE = F->end(); B != FE; ++B) { + for (BasicBlock::iterator I = B->begin(), BE = B->end(); I != BE; I++) { + if(!(isa(I))) + continue; + GetElementPtrInst *GEP = cast(I); + Value *PtrOp = GEP->getOperand(0); + Value *StrippedPtr = PtrOp->stripPointerCasts(); + if (StrippedPtr != PtrOp) { + const PointerType *StrippedPtrTy =cast(StrippedPtr->getType()); + bool HasZeroPointerIndex = false; + if (ConstantInt *C = dyn_cast(GEP->getOperand(1))) + HasZeroPointerIndex = C->isZero(); + if (HasZeroPointerIndex) { + const PointerType *CPTy = cast(PtrOp->getType()); + if (const ArrayType *CATy = + dyn_cast(CPTy->getElementType())) { + if (CATy->getElementType() == StrippedPtrTy->getElementType()) { + SmallVector Idx(GEP->idx_begin()+1, GEP->idx_end()); + GetElementPtrInst *Res = + GetElementPtrInst::Create(StrippedPtr, Idx.begin(), + Idx.end(), GEP->getName(), GEP); + Res->setIsInBounds(GEP->isInBounds()); + GEP->replaceAllUsesWith(Res); + continue; + } + + if (const ArrayType *XATy = + dyn_cast(StrippedPtrTy->getElementType())){ + if (CATy->getElementType() == XATy->getElementType()) { + GEP->setOperand(0, StrippedPtr); + continue; + } + } + } + } else if (GEP->getNumOperands() == 2) { + // Transform things like: + // %t = getelementptr i32* bitcast ([2 x i32]* %str to i32*), i32 %V + // into: %t1 = getelementptr [2 x i32]* %str, i32 0, i32 %V; bitcast + const Type *SrcElTy = StrippedPtrTy->getElementType(); + const Type *ResElTy=cast(PtrOp->getType())->getElementType(); + if (TD && SrcElTy->isArrayTy() && + TD->getTypeAllocSize(cast(SrcElTy)->getElementType()) == + TD->getTypeAllocSize(ResElTy)) { + Value *Idx[2]; + Idx[0] = Constant::getNullValue(Type::getInt32Ty(GEP->getContext())); + Idx[1] = GEP->getOperand(1); + Value *NewGEP = GetElementPtrInst::Create(StrippedPtr, Idx, + Idx+2, GEP->getName(), GEP); + // V and GEP are both pointer types --> BitCast + GEP->replaceAllUsesWith(new BitCastInst(NewGEP, GEP->getType(), GEP->getName(), GEP)); + continue; + } + + // Transform things like: + // getelementptr i8* bitcast ([100 x double]* X to i8*), i32 %tmp + // (where tmp = 8*tmp2) into: + // getelementptr [100 x double]* %arr, i32 0, i32 %tmp2; bitcast + + if (TD && SrcElTy->isArrayTy() && ResElTy->isIntegerTy(8)) { + uint64_t ArrayEltSize = + TD->getTypeAllocSize(cast(SrcElTy)->getElementType()); + + // Check to see if "tmp" is a scale by a multiple of ArrayEltSize. We + // allow either a mul, shift, or constant here. + Value *NewIdx = 0; + ConstantInt *Scale = 0; + if (ArrayEltSize == 1) { + NewIdx = GEP->getOperand(1); + Scale = ConstantInt::get(cast(NewIdx->getType()), 1); + } else if (ConstantInt *CI = dyn_cast(GEP->getOperand(1))) { + NewIdx = ConstantInt::get(CI->getType(), 1); + Scale = CI; + } else if (Instruction *Inst =dyn_cast(GEP->getOperand(1))){ + if (Inst->getOpcode() == Instruction::Shl && + isa(Inst->getOperand(1))) { + ConstantInt *ShAmt = cast(Inst->getOperand(1)); + uint32_t ShAmtVal = ShAmt->getLimitedValue(64); + Scale = ConstantInt::get(cast(Inst->getType()), + 1ULL << ShAmtVal); + NewIdx = Inst->getOperand(0); + } else if (Inst->getOpcode() == Instruction::Mul && + isa(Inst->getOperand(1))) { + Scale = cast(Inst->getOperand(1)); + NewIdx = Inst->getOperand(0); + } + } + + // If the index will be to exactly the right offset with the scale taken + // out, perform the transformation. Note, we don't know whether Scale is + // signed or not. We'll use unsigned version of division/modulo + // operation after making sure Scale doesn't have the sign bit set. + if (ArrayEltSize && Scale && Scale->getSExtValue() >= 0LL && + Scale->getZExtValue() % ArrayEltSize == 0) { + Scale = ConstantInt::get(Scale->getType(), + Scale->getZExtValue() / ArrayEltSize); + if (Scale->getZExtValue() != 1) { + Constant *C = ConstantExpr::getIntegerCast(Scale, NewIdx->getType(), + false /*ZExt*/); + NewIdx = BinaryOperator::Create(BinaryOperator::Mul, NewIdx, C, "idxscale"); + } + + // Insert the new GEP instruction. + Value *Idx[2]; + Idx[0] = Constant::getNullValue(Type::getInt32Ty(GEP->getContext())); + Idx[1] = NewIdx; + Value *NewGEP = GetElementPtrInst::Create(StrippedPtr, Idx, + Idx+2, GEP->getName(), GEP); + GEP->replaceAllUsesWith(new BitCastInst(NewGEP, GEP->getType(), GEP->getName(), GEP)); + continue; + } + } + } + } + } + } + } + + return true; + } + virtual void getAnalysisUsage(AnalysisUsage &AU) const { + AU.addRequired(); + } + }; +} + +char SimplifyGEP::ID = 0; +static RegisterPass +X("simplifygep", "Simplify GEPs"); From aggarwa4 at illinois.edu Sat Feb 19 07:45:30 2011 From: aggarwa4 at illinois.edu (Arushi Aggarwal) Date: Sat, 19 Feb 2011 13:45:30 -0000 Subject: [llvm-commits] [poolalloc] r126030 - /poolalloc/trunk/test/dsa/td/ExternFuncNodeTest1.ll Message-ID: <20110219134530.7953E2A6C12C@llvm.org> Author: aggarwa4 Date: Sat Feb 19 07:45:30 2011 New Revision: 126030 URL: http://llvm.org/viewvc/llvm-project?rev=126030&view=rev Log: Fixed the lit test failure. I do not believe that global needed to be marked I, it is being marked E, which is enough. Modified: poolalloc/trunk/test/dsa/td/ExternFuncNodeTest1.ll Modified: poolalloc/trunk/test/dsa/td/ExternFuncNodeTest1.ll URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/td/ExternFuncNodeTest1.ll?rev=126030&r1=126029&r2=126030&view=diff ============================================================================== --- poolalloc/trunk/test/dsa/td/ExternFuncNodeTest1.ll (original) +++ poolalloc/trunk/test/dsa/td/ExternFuncNodeTest1.ll Sat Feb 19 07:45:30 2011 @@ -3,7 +3,8 @@ ; and that it is not inlined ; Checking that the X flag is propogated everywhere. -;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "@fp:0+IEX" +;RUN: dsaopt %s -dsa-local -analyze -verify-flags "@fp:0+EX" +;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "@fp:0+EX" ;RUN: dsaopt %s -dsa-bu -analyze -verify-flags "@fp:0+EX" ;RUN: dsaopt %s -dsa-cbu -analyze -verify-flags "@fp:0+EX" ;RUN: dsaopt %s -dsa-eq -analyze -verify-flags "@fp:0+EX" From jyasskin at google.com Sat Feb 19 12:01:15 2011 From: jyasskin at google.com (Jeffrey Yasskin) Date: Sat, 19 Feb 2011 18:01:15 -0000 Subject: [llvm-commits] [llvm] r126031 - /llvm/trunk/cmake/modules/LLVMParseArguments.cmake Message-ID: <20110219180115.C673F2A6C12C@llvm.org> Author: jyasskin Date: Sat Feb 19 12:01:15 2011 New Revision: 126031 URL: http://llvm.org/viewvc/llvm-project?rev=126031&view=rev Log: Add the PARSE_ARGUMENTS CMake macro to LLVM so I can use it to clean up add_clang_unittest's calling convention. Added: llvm/trunk/cmake/modules/LLVMParseArguments.cmake Added: llvm/trunk/cmake/modules/LLVMParseArguments.cmake URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/LLVMParseArguments.cmake?rev=126031&view=auto ============================================================================== --- llvm/trunk/cmake/modules/LLVMParseArguments.cmake (added) +++ llvm/trunk/cmake/modules/LLVMParseArguments.cmake Sat Feb 19 12:01:15 2011 @@ -0,0 +1,80 @@ +# Copied from http://www.itk.org/Wiki/CMakeMacroParseArguments under +# http://creativecommons.org/licenses/by/2.5/. +# +# The PARSE_ARGUMENTS macro will take the arguments of another macro and define +# several variables. The first argument to PARSE_ARGUMENTS is a prefix to put on +# all variables it creates. The second argument is a list of names, and the +# third argument is a list of options. Both of these lists should be quoted. The +# rest of PARSE_ARGUMENTS are arguments from another macro to be parsed. +# +# PARSE_ARGUMENTS(prefix arg_names options arg1 arg2...) +# +# For each item in options, PARSE_ARGUMENTS will create a variable with that +# name, prefixed with prefix_. So, for example, if prefix is MY_MACRO and +# options is OPTION1;OPTION2, then PARSE_ARGUMENTS will create the variables +# MY_MACRO_OPTION1 and MY_MACRO_OPTION2. These variables will be set to true if +# the option exists in the command line or false otherwise. +# +#For each item in arg_names, PARSE_ARGUMENTS will create a variable with that +#name, prefixed with prefix_. Each variable will be filled with the arguments +#that occur after the given arg_name is encountered up to the next arg_name or +#the end of the arguments. All options are removed from these +#lists. PARSE_ARGUMENTS also creates a prefix_DEFAULT_ARGS variable containing +#the list of all arguments up to the first arg_name encountered. +# +#Here is a simple, albeit impractical, example of using PARSE_ARGUMENTS that +#demonstrates its behavior. +# +# SET(arguments +# hello OPTION3 world +# LIST3 foo bar +# OPTION2 +# LIST1 fuz baz +# ) +# +# PARSE_ARGUMENTS(ARG "LIST1;LIST2;LIST3" "OPTION1;OPTION2;OPTION3" ${arguments}) +# +# PARSE_ARGUMENTS creates 7 variables and sets them as follows: +# ARG_DEFAULT_ARGS: hello;world +# ARG_LIST1: fuz;baz +# ARG_LIST2: +# ARG_LIST3: foo;bar +# ARG_OPTION1: FALSE +# ARG_OPTION2: TRUE +# ARG_OPTION3: TRUE +# +# If you don't have any options, use an empty string in its place. +# PARSE_ARGUMENTS(ARG "LIST1;LIST2;LIST3" "" ${arguments}) +# Likewise if you have no lists. +# PARSE_ARGUMENTS(ARG "" "OPTION1;OPTION2;OPTION3" ${arguments}) + +MACRO(PARSE_ARGUMENTS prefix arg_names option_names) + SET(DEFAULT_ARGS) + FOREACH(arg_name ${arg_names}) + SET(${prefix}_${arg_name}) + ENDFOREACH(arg_name) + FOREACH(option ${option_names}) + SET(${prefix}_${option} FALSE) + ENDFOREACH(option) + + SET(current_arg_name DEFAULT_ARGS) + SET(current_arg_list) + FOREACH(arg ${ARGN}) + SET(larg_names ${arg_names}) + LIST(FIND larg_names "${arg}" is_arg_name) + IF (is_arg_name GREATER -1) + SET(${prefix}_${current_arg_name} ${current_arg_list}) + SET(current_arg_name ${arg}) + SET(current_arg_list) + ELSE (is_arg_name GREATER -1) + SET(loption_names ${option_names}) + LIST(FIND loption_names "${arg}" is_option) + IF (is_option GREATER -1) + SET(${prefix}_${arg} TRUE) + ELSE (is_option GREATER -1) + SET(current_arg_list ${current_arg_list} ${arg}) + ENDIF (is_option GREATER -1) + ENDIF (is_arg_name GREATER -1) + ENDFOREACH(arg) + SET(${prefix}_${current_arg_name} ${current_arg_list}) +ENDMACRO(PARSE_ARGUMENTS) From sabre at nondot.org Sat Feb 19 13:31:39 2011 From: sabre at nondot.org (Chris Lattner) Date: Sat, 19 Feb 2011 19:31:39 -0000 Subject: [llvm-commits] [llvm] r126040 - in /llvm/trunk: lib/Transforms/Scalar/LoopIdiomRecognize.cpp test/Transforms/LoopIdiom/basic.ll Message-ID: <20110219193139.716602A6C12C@llvm.org> Author: lattner Date: Sat Feb 19 13:31:39 2011 New Revision: 126040 URL: http://llvm.org/viewvc/llvm-project?rev=126040&view=rev Log: Implement rdar://9009151, transforming strided loop stores of unsplatable values into memset_pattern16 when it is available (recent darwins). This transforms lots of strided loop stores of ints for example, like 5 in vpr: Formed memset: call void @memset_pattern16(i8* %4, i8* getelementptr inbounds ([16 x i8]* @.memset_pattern9, i32 0, i32 0), i64 %tmp25) from store to: {%3,+,4}<%11> at: store i32 3, i32* %scevgep, align 4, !tbaa !4 Modified: llvm/trunk/lib/Transforms/Scalar/LoopIdiomRecognize.cpp llvm/trunk/test/Transforms/LoopIdiom/basic.ll Modified: llvm/trunk/lib/Transforms/Scalar/LoopIdiomRecognize.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopIdiomRecognize.cpp?rev=126040&r1=126039&r2=126040&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/LoopIdiomRecognize.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/LoopIdiomRecognize.cpp Sat Feb 19 13:31:39 2011 @@ -39,6 +39,7 @@ #define DEBUG_TYPE "loop-idiom" #include "llvm/Transforms/Scalar.h" #include "llvm/IntrinsicInst.h" +#include "llvm/Module.h" #include "llvm/Analysis/AliasAnalysis.h" #include "llvm/Analysis/LoopPass.h" #include "llvm/Analysis/ScalarEvolutionExpressions.h" @@ -76,11 +77,11 @@ bool processLoopStore(StoreInst *SI, const SCEV *BECount); bool processLoopMemSet(MemSetInst *MSI, const SCEV *BECount); - bool processLoopStoreOfSplatValue(Value *DestPtr, unsigned StoreSize, - unsigned StoreAlignment, - Value *SplatValue, Instruction *TheStore, - const SCEVAddRecExpr *Ev, - const SCEV *BECount); + bool processLoopStridedStore(Value *DestPtr, unsigned StoreSize, + unsigned StoreAlignment, + Value *SplatValue, Instruction *TheStore, + const SCEVAddRecExpr *Ev, + const SCEV *BECount); bool processLoopStoreOfLoopLoad(StoreInst *SI, unsigned StoreSize, const SCEVAddRecExpr *StoreEv, const SCEVAddRecExpr *LoadEv, @@ -275,14 +276,11 @@ // validity check in mayLoopAccessLocation to be updated though. if (Stride == 0 || StoreSize != Stride->getValue()->getValue()) return false; - - // If the stored value is a byte-wise value (like i32 -1), then it may be - // turned into a memset of i8 -1, assuming that all the consecutive bytes - // are stored. A store of i32 0x01020304 can never be turned into a memset. - if (Value *SplatValue = isBytewiseValue(StoredVal)) - if (processLoopStoreOfSplatValue(StorePtr, StoreSize, SI->getAlignment(), - SplatValue, SI, StoreEv, BECount)) - return true; + + // See if we can optimize just this store in isolation. + if (processLoopStridedStore(StorePtr, StoreSize, SI->getAlignment(), + StoredVal, SI, StoreEv, BECount)) + return true; // If the stored value is a strided load in the same loop with the same stride // this this may be transformable into a memcpy. This kicks in for stuff like @@ -333,9 +331,9 @@ if (Stride == 0 || MSI->getLength() != Stride->getValue()) return false; - return processLoopStoreOfSplatValue(Pointer, (unsigned)SizeInBytes, - MSI->getAlignment(), MSI->getValue(), - MSI, Ev, BECount); + return processLoopStridedStore(Pointer, (unsigned)SizeInBytes, + MSI->getAlignment(), MSI->getValue(), + MSI, Ev, BECount); } @@ -372,22 +370,97 @@ return false; } -/// processLoopStoreOfSplatValue - We see a strided store of a memsetable value. -/// If we can transform this into a memset in the loop preheader, do so. -bool LoopIdiomRecognize:: -processLoopStoreOfSplatValue(Value *DestPtr, unsigned StoreSize, - unsigned StoreAlignment, Value *SplatValue, - Instruction *TheStore, - const SCEVAddRecExpr *Ev, const SCEV *BECount) { - // If we're not allowed to form memset, we fail. - if (!TLI->has(LibFunc::memset)) - return false; +/// getMemSetPatternValue - If a strided store of the specified value is safe to +/// turn into a memset_pattern16, return a ConstantArray of 16 bytes that should +/// be passed in. Otherwise, return null. +/// +/// Note that we don't ever attempt to use memset_pattern8 or 4, because these +/// just replicate their input array and then pass on to memset_pattern16. +static Constant *getMemSetPatternValue(Value *V, const TargetData &TD) { + // If the value isn't a constant, we can't promote it to being in a constant + // array. We could theoretically do a store to an alloca or something, but + // that doesn't seem worthwhile. + Constant *C = dyn_cast(V); + if (C == 0) return 0; + + // Only handle simple values that are a power of two bytes in size. + uint64_t Size = TD.getTypeSizeInBits(V->getType()); + if (Size == 0 || (Size & 7) || (Size & (Size-1))) + return 0; + + // Convert the constant to an integer type of the appropriate size so we can + // start hacking on it. + if (isa(V->getType())) + C = ConstantExpr::getPtrToInt(C, IntegerType::get(C->getContext(), Size)); + else if (isa(V->getType()) || V->getType()->isFloatingPointTy()) + C = ConstantExpr::getBitCast(C, IntegerType::get(C->getContext(), Size)); + else if (!isa(V->getType())) + return 0; // Unhandled type. + + // Convert to size in bytes. + Size /= 8; + + // If we couldn't fold this to an integer, we fail. We don't bother to handle + // relocatable expressions like the address of a global yet. + // FIXME! + ConstantInt *CI = dyn_cast(C); + if (CI == 0) return 0; + + APInt CVal = CI->getValue(); + + // TODO: If CI is larger than 16-bytes, we can try slicing it in half to see + // if the top and bottom are the same. + if (Size > 16) return 0; + + // If this is a big endian target (PPC) then we need to bswap. + if (TD.isBigEndian()) + CVal = CVal.byteSwap(); + + // Determine what each byte of the pattern value should be. + char Value[16]; + for (unsigned i = 0; i != 16; ++i) { + // Get the byte value we're indexing into. + unsigned CByte = i % Size; + Value[i] = (unsigned char)(CVal.getZExtValue() >> CByte); + } + + return ConstantArray::get(V->getContext(), StringRef(Value, 16), false); +} + +/// processLoopStridedStore - We see a strided store of some value. If we can +/// transform this into a memset or memset_pattern in the loop preheader, do so. +bool LoopIdiomRecognize:: +processLoopStridedStore(Value *DestPtr, unsigned StoreSize, + unsigned StoreAlignment, Value *StoredVal, + Instruction *TheStore, const SCEVAddRecExpr *Ev, + const SCEV *BECount) { - // Verify that the stored value is loop invariant. If not, we can't promote - // the memset. - if (!CurLoop->isLoopInvariant(SplatValue)) + // If the stored value is a byte-wise value (like i32 -1), then it may be + // turned into a memset of i8 -1, assuming that all the consecutive bytes + // are stored. A store of i32 0x01020304 can never be turned into a memset, + // but it can be turned into memset_pattern if the target supports it. + Value *SplatValue = isBytewiseValue(StoredVal); + Constant *PatternValue = 0; + + // If we're allowed to form a memset, and the stored value would be acceptable + // for memset, use it. + if (SplatValue && TLI->has(LibFunc::memset) && + // Verify that the stored value is loop invariant. If not, we can't + // promote the memset. + CurLoop->isLoopInvariant(SplatValue)) { + // Keep and use SplatValue. + PatternValue = 0; + } else if (TLI->has(LibFunc::memset_pattern16) && + (PatternValue = getMemSetPatternValue(StoredVal, *TD))) { + // It looks like we can use PatternValue! + SplatValue = 0; + } else { + // Otherwise, this isn't an idiom we can transform. For example, we can't + // do anything with a 3-byte store, for example. return false; + } + // Okay, we have a strided store "p[i]" of a splattable value. We can turn // this into a memset in the loop preheader now if we want. However, this @@ -415,7 +488,7 @@ // The # stored bytes is (BECount+1)*Size. Expand the trip count out to // pointer size if it isn't already. - const Type *IntPtr = TD->getIntPtrType(SplatValue->getContext()); + const Type *IntPtr = TD->getIntPtrType(DestPtr->getContext()); BECount = SE->getTruncateOrZeroExtend(BECount, IntPtr); const SCEV *NumBytesS = SE->getAddExpr(BECount, SE->getConstant(IntPtr, 1), @@ -427,8 +500,28 @@ Value *NumBytes = Expander.expandCodeFor(NumBytesS, IntPtr, Preheader->getTerminator()); - Value *NewCall = - Builder.CreateMemSet(BasePtr, SplatValue, NumBytes, StoreAlignment); + Value *NewCall; + if (SplatValue) + NewCall = Builder.CreateMemSet(BasePtr, SplatValue,NumBytes,StoreAlignment); + else { + Module *M = TheStore->getParent()->getParent()->getParent(); + Value *MSP = M->getOrInsertFunction("memset_pattern16", + Builder.getVoidTy(), + Builder.getInt8PtrTy(), + Builder.getInt8PtrTy(), IntPtr, + (void*)0); + + // Otherwise we should form a memset_pattern16. PatternValue is known to be + // an constant array of 16-bytes. Plop the value into a mergable global. + GlobalVariable *GV = new GlobalVariable(*M, PatternValue->getType(), true, + GlobalValue::InternalLinkage, + PatternValue, ".memset_pattern"); + GV->setUnnamedAddr(true); // Ok to merge these. + GV->setAlignment(16); + Value *PatternPtr = Builder.CreateConstInBoundsGEP2_32(GV, 0, 0, "pattern"); + + NewCall = Builder.CreateCall3(MSP, BasePtr, PatternPtr, NumBytes); + } DEBUG(dbgs() << " Formed memset: " << *NewCall << "\n" << " from store to: " << *Ev << " at: " << *TheStore << "\n"); Modified: llvm/trunk/test/Transforms/LoopIdiom/basic.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopIdiom/basic.ll?rev=126040&r1=126039&r2=126040&view=diff ============================================================================== --- llvm/trunk/test/Transforms/LoopIdiom/basic.ll (original) +++ llvm/trunk/test/Transforms/LoopIdiom/basic.ll Sat Feb 19 13:31:39 2011 @@ -273,3 +273,30 @@ ; CHECK-NOT: store ; CHECK: ret void } + +; On darwin10 (which is the triple in this .ll file) this loop can be turned +; into a memset_pattern call. +; rdar://9009151 +define void @test11(i32* nocapture %P) nounwind ssp { +entry: + br label %for.body + +for.body: ; preds = %entry, %for.body + %indvar = phi i64 [ 0, %entry ], [ %indvar.next, %for.body ] + %arrayidx = getelementptr i32* %P, i64 %indvar + store i32 1, i32* %arrayidx, align 4 + %indvar.next = add i64 %indvar, 1 + %exitcond = icmp eq i64 %indvar.next, 10000 + br i1 %exitcond, label %for.end, label %for.body + +for.end: ; preds = %for.body + ret void +; CHECK: @test11 +; CHECK-NEXT: entry: +; CHECK-NEXT: bitcast +; CHECK-NEXT: memset_pattern +; CHECK-NOT: store +; CHECK: ret void +} + + From sabre at nondot.org Sat Feb 19 13:35:49 2011 From: sabre at nondot.org (Chris Lattner) Date: Sat, 19 Feb 2011 19:35:49 -0000 Subject: [llvm-commits] [llvm] r126041 - in /llvm/trunk: lib/Analysis/ValueTracking.cpp test/Transforms/LoopIdiom/basic.ll Message-ID: <20110219193549.82BC52A6C12C@llvm.org> Author: lattner Date: Sat Feb 19 13:35:49 2011 New Revision: 126041 URL: http://llvm.org/viewvc/llvm-project?rev=126041&view=rev Log: Stores of null pointers should turn into memset, we weren't recognizing them as splat values. Modified: llvm/trunk/lib/Analysis/ValueTracking.cpp llvm/trunk/test/Transforms/LoopIdiom/basic.ll Modified: llvm/trunk/lib/Analysis/ValueTracking.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ValueTracking.cpp?rev=126041&r1=126040&r2=126041&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/ValueTracking.cpp (original) +++ llvm/trunk/lib/Analysis/ValueTracking.cpp Sat Feb 19 13:35:49 2011 @@ -1163,6 +1163,11 @@ Value *llvm::isBytewiseValue(Value *V) { // All byte-wide stores are splatable, even of arbitrary variables. if (V->getType()->isIntegerTy(8)) return V; + + // Handle 'null' ConstantArrayZero etc. + if (Constant *C = dyn_cast(V)) + if (C->isNullValue()) + return Constant::getNullValue(Type::getInt8Ty(V->getContext())); // Constant float and double values can be handled as integer values if the // corresponding integer value is "byteable". An important case is 0.0. Modified: llvm/trunk/test/Transforms/LoopIdiom/basic.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopIdiom/basic.ll?rev=126041&r1=126040&r2=126041&view=diff ============================================================================== --- llvm/trunk/test/Transforms/LoopIdiom/basic.ll (original) +++ llvm/trunk/test/Transforms/LoopIdiom/basic.ll Sat Feb 19 13:35:49 2011 @@ -299,4 +299,26 @@ ; CHECK: ret void } +; Store of null should turn into memset of zero. +define void @test12(i32** nocapture %P) nounwind ssp { +entry: + br label %for.body + +for.body: ; preds = %entry, %for.body + %indvar = phi i64 [ 0, %entry ], [ %indvar.next, %for.body ] + %arrayidx = getelementptr i32** %P, i64 %indvar + store i32* null, i32** %arrayidx, align 4 + %indvar.next = add i64 %indvar, 1 + %exitcond = icmp eq i64 %indvar.next, 10000 + br i1 %exitcond, label %for.end, label %for.body + +for.end: ; preds = %for.body + ret void +; CHECK: @test12 +; CHECK-NEXT: entry: +; CHECK-NEXT: bitcast +; CHECK-NEXT: call void @llvm.memset.p0i8.i64(i8* %P1, i8 0, i64 80000, i32 4, i1 false) +; CHECK-NOT: store +; CHECK: ret void +} From sabre at nondot.org Sat Feb 19 13:56:44 2011 From: sabre at nondot.org (Chris Lattner) Date: Sat, 19 Feb 2011 19:56:44 -0000 Subject: [llvm-commits] [llvm] r126044 - in /llvm/trunk: lib/Transforms/Scalar/LoopIdiomRecognize.cpp test/Transforms/LoopIdiom/basic.ll Message-ID: <20110219195644.ED2FA2A6C12C@llvm.org> Author: lattner Date: Sat Feb 19 13:56:44 2011 New Revision: 126044 URL: http://llvm.org/viewvc/llvm-project?rev=126044&view=rev Log: rewrite the memset_pattern pattern generation stuff to accept any 2/4/8/16-byte constant, including globals. This makes us generate much more "pretty" pattern globals as well because it doesn't break it down to an array of bytes all the time. This enables us to handle stores of relocatable globals. This kicks in about 48 times in 254.gap, giving us stuff like this: @.memset_pattern40 = internal constant [2 x %struct.TypHeader* (%struct.TypHeader*, %struct.TypHeader*)*] [%struct.TypHeader* (%struct.TypHeader*, %struct .TypHeader*)* @IsFalse, %struct.TypHeader* (%struct.TypHeader*, %struct.TypHeader*)* @IsFalse], align 16 ... call void @memset_pattern16(i8* %scevgep5859, i8* bitcast ([2 x %struct.TypHeader* (%struct.TypHeader*, %struct.TypHeader*)*]* @.memset_pattern40 to i8* ), i64 %tmp75) nounwind Modified: llvm/trunk/lib/Transforms/Scalar/LoopIdiomRecognize.cpp llvm/trunk/test/Transforms/LoopIdiom/basic.ll Modified: llvm/trunk/lib/Transforms/Scalar/LoopIdiomRecognize.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopIdiomRecognize.cpp?rev=126044&r1=126043&r2=126044&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/LoopIdiomRecognize.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/LoopIdiomRecognize.cpp Sat Feb 19 13:56:44 2011 @@ -388,43 +388,24 @@ if (Size == 0 || (Size & 7) || (Size & (Size-1))) return 0; - // Convert the constant to an integer type of the appropriate size so we can - // start hacking on it. - if (isa(V->getType())) - C = ConstantExpr::getPtrToInt(C, IntegerType::get(C->getContext(), Size)); - else if (isa(V->getType()) || V->getType()->isFloatingPointTy()) - C = ConstantExpr::getBitCast(C, IntegerType::get(C->getContext(), Size)); - else if (!isa(V->getType())) - return 0; // Unhandled type. + // Don't care enough about darwin/ppc to implement this. + if (TD.isBigEndian()) + return 0; // Convert to size in bytes. Size /= 8; - - // If we couldn't fold this to an integer, we fail. We don't bother to handle - // relocatable expressions like the address of a global yet. - // FIXME! - ConstantInt *CI = dyn_cast(C); - if (CI == 0) return 0; - APInt CVal = CI->getValue(); - // TODO: If CI is larger than 16-bytes, we can try slicing it in half to see - // if the top and bottom are the same. + // if the top and bottom are the same (e.g. for vectors and large integers). if (Size > 16) return 0; - - // If this is a big endian target (PPC) then we need to bswap. - if (TD.isBigEndian()) - CVal = CVal.byteSwap(); - - // Determine what each byte of the pattern value should be. - char Value[16]; - for (unsigned i = 0; i != 16; ++i) { - // Get the byte value we're indexing into. - unsigned CByte = i % Size; - Value[i] = (unsigned char)(CVal.getZExtValue() >> CByte); - } - return ConstantArray::get(V->getContext(), StringRef(Value, 16), false); + // If the constant is exactly 16 bytes, just use it. + if (Size == 16) return C; + + // Otherwise, we'll use an array of the constants. + unsigned ArraySize = 16/Size; + ArrayType *AT = ArrayType::get(V->getType(), ArraySize); + return ConstantArray::get(AT, std::vector(ArraySize, C)); } @@ -518,8 +499,7 @@ PatternValue, ".memset_pattern"); GV->setUnnamedAddr(true); // Ok to merge these. GV->setAlignment(16); - Value *PatternPtr = Builder.CreateConstInBoundsGEP2_32(GV, 0, 0, "pattern"); - + Value *PatternPtr = ConstantExpr::getBitCast(GV, Builder.getInt8PtrTy()); NewCall = Builder.CreateCall3(MSP, BasePtr, PatternPtr, NumBytes); } Modified: llvm/trunk/test/Transforms/LoopIdiom/basic.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopIdiom/basic.ll?rev=126044&r1=126043&r2=126044&view=diff ============================================================================== --- llvm/trunk/test/Transforms/LoopIdiom/basic.ll (original) +++ llvm/trunk/test/Transforms/LoopIdiom/basic.ll Sat Feb 19 13:56:44 2011 @@ -277,7 +277,7 @@ ; On darwin10 (which is the triple in this .ll file) this loop can be turned ; into a memset_pattern call. ; rdar://9009151 -define void @test11(i32* nocapture %P) nounwind ssp { +define void @test11_pattern(i32* nocapture %P) nounwind ssp { entry: br label %for.body @@ -291,7 +291,7 @@ for.end: ; preds = %for.body ret void -; CHECK: @test11 +; CHECK: @test11_pattern ; CHECK-NEXT: entry: ; CHECK-NEXT: bitcast ; CHECK-NEXT: memset_pattern @@ -322,3 +322,28 @@ ; CHECK: ret void } + at G = global i32 5 + +; This store-of-address loop can be turned into a memset_pattern call. +; rdar://9009151 +define void @test13_pattern(i32** nocapture %P) nounwind ssp { +entry: + br label %for.body + +for.body: ; preds = %entry, %for.body + %indvar = phi i64 [ 0, %entry ], [ %indvar.next, %for.body ] + %arrayidx = getelementptr i32** %P, i64 %indvar + store i32* @G, i32** %arrayidx, align 4 + %indvar.next = add i64 %indvar, 1 + %exitcond = icmp eq i64 %indvar.next, 10000 + br i1 %exitcond, label %for.end, label %for.body + +for.end: ; preds = %for.body + ret void +; CHECK: @test13_pattern +; CHECK-NEXT: entry: +; CHECK-NEXT: bitcast +; CHECK-NEXT: memset_pattern +; CHECK-NOT: store +; CHECK: ret void +} From sabre at nondot.org Sat Feb 19 15:06:37 2011 From: sabre at nondot.org (Chris Lattner) Date: Sat, 19 Feb 2011 21:06:37 -0000 Subject: [llvm-commits] [llvm] r126047 - in /llvm/trunk: lib/Target/X86/X86InstrInfo.td test/MC/X86/x86-64.s Message-ID: <20110219210637.1220D2A6C12C@llvm.org> Author: lattner Date: Sat Feb 19 15:06:36 2011 New Revision: 126047 URL: http://llvm.org/viewvc/llvm-project?rev=126047&view=rev Log: implement PR9264: disambiguating 'bt mem, imm' as a btl. This is reasonable to do since all bt-mem forms do the same thing. Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.td llvm/trunk/test/MC/X86/x86-64.s Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.td?rev=126047&r1=126046&r2=126047&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86InstrInfo.td (original) +++ llvm/trunk/lib/Target/X86/X86InstrInfo.td Sat Feb 19 15:06:36 2011 @@ -1403,6 +1403,9 @@ def : InstAlias<"aad", (AAD8i8 10)>; def : InstAlias<"aam", (AAM8i8 10)>; +// Disambiguate the mem/imm form of bt-without-a-suffix as btl. +def : InstAlias<"bt $imm, $mem", (BT32mi8 i32mem:$mem, i32i8imm:$imm)>; + // clr aliases. def : InstAlias<"clrb $reg", (XOR8rr GR8 :$reg, GR8 :$reg)>; def : InstAlias<"clrw $reg", (XOR16rr GR16:$reg, GR16:$reg)>; Modified: llvm/trunk/test/MC/X86/x86-64.s URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/X86/x86-64.s?rev=126047&r1=126046&r2=126047&view=diff ============================================================================== --- llvm/trunk/test/MC/X86/x86-64.s (original) +++ llvm/trunk/test/MC/X86/x86-64.s Sat Feb 19 15:06:36 2011 @@ -648,6 +648,10 @@ // CHECK: encoding: [0x75,A] jnz 0 +// PR9264 +btl $1, 0 // CHECK: btl $1, 0 # encoding: [0x0f,0xba,0x24,0x25,0x00,0x00,0x00,0x00,0x01] +bt $1, 0 // CHECK: btl $1, 0 # encoding: [0x0f,0xba,0x24,0x25,0x00,0x00,0x00,0x00,0x01] + // rdar://8017515 btq $0x01,%rdx // CHECK: btq $1, %rdx From akyrtzi at gmail.com Sat Feb 19 15:19:04 2011 From: akyrtzi at gmail.com (Argyrios Kyrtzidis) Date: Sat, 19 Feb 2011 13:19:04 -0800 Subject: [llvm-commits] [llvm] r126019 - in /llvm/trunk/include/llvm/ADT: PointerIntPair.h PointerUnion.h In-Reply-To: <4D5F8CE8.50809@free.fr> References: <20110219035558.F2A772A6C12C@llvm.org> <4D5F8CE8.50809@free.fr> Message-ID: <37AF1DDF-3583-402C-9BEA-E108AFB00230@gmail.com> On Feb 19, 2011, at 1:27 AM, Duncan Sands wrote: > Hi Argyrios, > >> Allow getting the address of the value in a PointerUnion or PointerIntPair if one is >> confident enough that he knows what he is doing. > > this sounds like a bad idea to me - why do you need it? It's less bad than what we were doing here: http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20110214/039048.html > > Ciao, Duncan. > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From zwarich at apple.com Sat Feb 19 15:44:35 2011 From: zwarich at apple.com (Cameron Zwarich) Date: Sat, 19 Feb 2011 21:44:35 -0000 Subject: [llvm-commits] [llvm] r126051 - /llvm/trunk/utils/valgrind/x86_64-pc-linux-gnu.supp Message-ID: <20110219214435.8C2382A6C12C@llvm.org> Author: zwarich Date: Sat Feb 19 15:44:35 2011 New Revision: 126051 URL: http://llvm.org/viewvc/llvm-project?rev=126051&view=rev Log: Try to fix the MC/AsmParser/section.s failure on the llvm-x86_64-linux-vg_leak bot. I am not sure if this is valid Valgrind exclusion file syntax, but the Internet seems to think so. Modified: llvm/trunk/utils/valgrind/x86_64-pc-linux-gnu.supp Modified: llvm/trunk/utils/valgrind/x86_64-pc-linux-gnu.supp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/valgrind/x86_64-pc-linux-gnu.supp?rev=126051&r1=126050&r2=126051&view=diff ============================================================================== --- llvm/trunk/utils/valgrind/x86_64-pc-linux-gnu.supp (original) +++ llvm/trunk/utils/valgrind/x86_64-pc-linux-gnu.supp Sat Feb 19 15:44:35 2011 @@ -11,19 +11,19 @@ { ADDRESS_IN_RANGE/Invalid read of size 4 Memcheck:Addr4 - obj:/usr/bin/python2.5 + obj:/usr/bin/python* } { ADDRESS_IN_RANGE/Invalid read of size 4 Memcheck:Value8 - obj:/usr/bin/python2.5 + obj:/usr/bin/python* } { ADDRESS_IN_RANGE/Conditional jump or move depends on uninitialised value Memcheck:Cond - obj:/usr/bin/python2.5 + obj:/usr/bin/python* } { @@ -42,5 +42,5 @@ We don't care if python leaks Memcheck:Leak fun:malloc - obj:/usr/bin/python2.5 + obj:/usr/bin/python* } From rafael.espindola at gmail.com Sat Feb 19 15:49:57 2011 From: rafael.espindola at gmail.com (Rafael Espindola) Date: Sat, 19 Feb 2011 21:49:57 -0000 Subject: [llvm-commits] [llvm] r126052 - /llvm/trunk/tools/gold/gold-plugin.cpp Message-ID: <20110219214957.3BD1A2A6C12C@llvm.org> Author: rafael Date: Sat Feb 19 15:49:57 2011 New Revision: 126052 URL: http://llvm.org/viewvc/llvm-project?rev=126052&view=rev Log: Add modules to codegen as soon as possible. This reduces the link time of libxul from 12m31.084s to 7m1.359s. Modified: llvm/trunk/tools/gold/gold-plugin.cpp Modified: llvm/trunk/tools/gold/gold-plugin.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/gold/gold-plugin.cpp?rev=126052&r1=126051&r2=126052&view=diff ============================================================================== --- llvm/trunk/tools/gold/gold-plugin.cpp (original) +++ llvm/trunk/tools/gold/gold-plugin.cpp Sat Feb 19 15:49:57 2011 @@ -56,7 +56,6 @@ int gold_version = 0; struct claimed_file { - lto_module_t M; void *handle; std::vector syms; }; @@ -65,6 +64,7 @@ std::string output_name = ""; std::list Modules; std::vector Cleanup; + lto_code_gen_t code_gen; } namespace options { @@ -236,6 +236,8 @@ return LDPS_ERR; } + code_gen = lto_codegen_create(); + return LDPS_OK; } @@ -277,6 +279,11 @@ return LDPS_OK; } M = lto_module_create_from_memory(buf, file->filesize); + if (!M) { + (*message)(LDPL_ERROR, "Failed to create LLVM module: %s", + lto_get_error_message()); + return LDPS_ERR; + } free(buf); } else { // FIXME: We should not need to pass -1 as the file size, but there @@ -299,29 +306,22 @@ *claimed = 1; Modules.resize(Modules.size() + 1); claimed_file &cf = Modules.back(); - cf.M = M; - - if (!cf.M) { - (*message)(LDPL_ERROR, "Failed to create LLVM module: %s", - lto_get_error_message()); - return LDPS_ERR; - } if (!options::triple.empty()) - lto_module_set_target_triple(cf.M, options::triple.c_str()); + lto_module_set_target_triple(M, options::triple.c_str()); cf.handle = file->handle; - unsigned sym_count = lto_module_get_num_symbols(cf.M); + unsigned sym_count = lto_module_get_num_symbols(M); cf.syms.reserve(sym_count); for (unsigned i = 0; i != sym_count; ++i) { - lto_symbol_attributes attrs = lto_module_get_symbol_attribute(cf.M, i); + lto_symbol_attributes attrs = lto_module_get_symbol_attribute(M, i); if ((attrs & LTO_SYMBOL_SCOPE_MASK) == LTO_SYMBOL_SCOPE_INTERNAL) continue; cf.syms.push_back(ld_plugin_symbol()); ld_plugin_symbol &sym = cf.syms.back(); - sym.name = const_cast(lto_module_get_symbol_name(cf.M, i)); + sym.name = const_cast(lto_module_get_symbol_name(M, i)); sym.version = NULL; int scope = attrs & LTO_SYMBOL_SCOPE_MASK; @@ -379,6 +379,7 @@ } } + lto_codegen_add_module(code_gen, M); return LDPS_OK; } @@ -387,12 +388,6 @@ /// been overridden by a native object file. Then, perform optimization and /// codegen. static ld_plugin_status all_symbols_read_hook(void) { - lto_code_gen_t cg = lto_codegen_create(); - - for (std::list::iterator I = Modules.begin(), - E = Modules.end(); I != E; ++I) - lto_codegen_add_module(cg, I->M); - std::ofstream api_file; if (options::generate_api_file) { api_file.open("apifile.txt", std::ofstream::out | std::ofstream::trunc); @@ -410,7 +405,7 @@ (*get_symbols)(I->handle, I->syms.size(), &I->syms[0]); for (unsigned i = 0, e = I->syms.size(); i != e; i++) { if (I->syms[i].resolution == LDPR_PREVAILING_DEF) { - lto_codegen_add_must_preserve_symbol(cg, I->syms[i].name); + lto_codegen_add_must_preserve_symbol(code_gen, I->syms[i].name); anySymbolsPreserved = true; if (options::generate_api_file) @@ -424,15 +419,15 @@ if (!anySymbolsPreserved) { // All of the IL is unnecessary! - lto_codegen_dispose(cg); + lto_codegen_dispose(code_gen); return LDPS_OK; } - lto_codegen_set_pic_model(cg, output_type); - lto_codegen_set_debug_model(cg, LTO_DEBUG_MODEL_DWARF); + lto_codegen_set_pic_model(code_gen, output_type); + lto_codegen_set_debug_model(code_gen, LTO_DEBUG_MODEL_DWARF); if (!options::as_path.empty()) { sys::Path p = sys::Program::FindProgramByName(options::as_path); - lto_codegen_set_assembler_path(cg, p.c_str()); + lto_codegen_set_assembler_path(code_gen, p.c_str()); } if (!options::as_args.empty()) { std::vector as_args_p; @@ -440,20 +435,19 @@ E = options::as_args.end(); I != E; ++I) { as_args_p.push_back(I->c_str()); } - lto_codegen_set_assembler_args(cg, &as_args_p[0], as_args_p.size()); + lto_codegen_set_assembler_args(code_gen, &as_args_p[0], as_args_p.size()); } if (!options::mcpu.empty()) - lto_codegen_set_cpu(cg, options::mcpu.c_str()); + lto_codegen_set_cpu(code_gen, options::mcpu.c_str()); // Pass through extra options to the code generator. if (!options::extra.empty()) { for (std::vector::iterator it = options::extra.begin(); it != options::extra.end(); ++it) { - lto_codegen_debug_options(cg, (*it).c_str()); + lto_codegen_debug_options(code_gen, (*it).c_str()); } } - if (options::generate_bc_file != options::BC_NO) { std::string path; if (options::generate_bc_file == options::BC_ONLY) @@ -462,14 +456,14 @@ path = options::bc_path; else path = output_name + ".bc"; - bool err = lto_codegen_write_merged_modules(cg, path.c_str()); + bool err = lto_codegen_write_merged_modules(code_gen, path.c_str()); if (err) (*message)(LDPL_FATAL, "Failed to write the output file."); if (options::generate_bc_file == options::BC_ONLY) exit(0); } size_t bufsize = 0; - const char *buffer = static_cast(lto_codegen_compile(cg, + const char *buffer = static_cast(lto_codegen_compile(code_gen, &bufsize)); std::string ErrMsg; @@ -502,7 +496,7 @@ } objFile.keep(); - lto_codegen_dispose(cg); + lto_codegen_dispose(code_gen); if ((*add_input_file)(objPath) != LDPS_OK) { (*message)(LDPL_ERROR, "Unable to add .o file to the link."); From eli.friedman at gmail.com Sat Feb 19 15:54:28 2011 From: eli.friedman at gmail.com (Eli Friedman) Date: Sat, 19 Feb 2011 21:54:28 -0000 Subject: [llvm-commits] [llvm] r126054 - /llvm/trunk/lib/Target/X86/README.txt Message-ID: <20110219215428.698892A6C12C@llvm.org> Author: efriedma Date: Sat Feb 19 15:54:28 2011 New Revision: 126054 URL: http://llvm.org/viewvc/llvm-project?rev=126054&view=rev Log: Minor x86 README updates. Modified: llvm/trunk/lib/Target/X86/README.txt Modified: llvm/trunk/lib/Target/X86/README.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/README.txt?rev=126054&r1=126053&r2=126054&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/README.txt (original) +++ llvm/trunk/lib/Target/X86/README.txt Sat Feb 19 15:54:28 2011 @@ -710,23 +710,17 @@ { return !full_add(a, b).second; } Should compile to: + addl %esi, %edi + setae %al + movzbl %al, %eax + ret - - _Z11no_overflowjj: - addl %edi, %esi - setae %al - ret - -FIXME: That code looks wrong; bool return is normally defined as zext. - -on x86-64, not: - -__Z11no_overflowjj: - addl %edi, %esi - cmpl %edi, %esi - setae %al - movzbl %al, %eax - ret +on x86-64, instead of the rather stupid-looking: + addl %esi, %edi + setb %al + xorb $1, %al + movzbl %al, %eax + ret //===---------------------------------------------------------------------===// @@ -994,10 +988,10 @@ instead of: _foo: - movl $255, %eax - orl 4(%esp), %eax - andl $65535, %eax - ret + movl $65280, %eax + andl 4(%esp), %eax + orl $255, %eax + ret //===---------------------------------------------------------------------===// From ajclinto at gmail.com Sat Feb 19 15:13:44 2011 From: ajclinto at gmail.com (Andrew Clinton) Date: Sat, 19 Feb 2011 16:13:44 -0500 Subject: [llvm-commits] Patch to delete PHI nodes with multiple uses Message-ID: This is a simple patch to improve RecursivelyDeleteDeadPHINode so that it will delete PHIs that have multiple identical uses (self references). The DeletePHIs.cpp is a pass to test it, along with delete-phis.ll. I'm not sure whether this test needs to be added to the baseline or if so, where to put it. Run the test with: opt -load ../../../Debug+Asserts/lib/LLVMDeletePHIs.so < delete-phis.ll -delete-phis -S Andrew -------------- next part -------------- A non-text attachment was scrubbed... Name: deletephis.diff Type: text/x-patch Size: 1646 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110219/1b902b20/attachment.bin -------------- next part -------------- A non-text attachment was scrubbed... Name: DeletePHIs.cpp Type: text/x-c++src Size: 1317 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110219/1b902b20/attachment-0001.bin -------------- next part -------------- A non-text attachment was scrubbed... Name: delete-phis.ll Type: application/octet-stream Size: 369 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110219/1b902b20/attachment.obj From eli.friedman at gmail.com Sat Feb 19 16:34:48 2011 From: eli.friedman at gmail.com (Eli Friedman) Date: Sat, 19 Feb 2011 14:34:48 -0800 Subject: [llvm-commits] [PATCH] Patch (WIP) to custom-lower 64-bit relational comparisons on x86-32 In-Reply-To: <9B03BD52-6B0C-4784-8FC1-02C6EAC9B57D@apple.com> References: <9B03BD52-6B0C-4784-8FC1-02C6EAC9B57D@apple.com> Message-ID: On Thu, Feb 17, 2011 at 3:22 PM, Chris Lattner wrote: > > On Feb 16, 2011, at 4:25 PM, Eli Friedman wrote: >> I'm mainly looking for feedback as to whether this seems like >> generally a good idea... I haven't seen any compiler use this >> particular implementation of relational comparisons. > > This looks pretty spiffy to me. ?A couple of requests though: > > 1. Please make this work for i128 on x86-64. > 2. Please change the if/else sequence to use a switch with a ?default case that explodes. > 4. Please fit in 80 columns > 8. I think you only need to do the setOperationAction when building for 32-bit. > 16. Does the code handle weird conditions like "COND_P"? COND_P can't show up here. Updated patch attached; I think this is close to commit-quality. -Eli -------------- next part -------------- Index: test/CodeGen/X86/sext-i1.ll =================================================================== --- test/CodeGen/X86/sext-i1.ll (revision 126022) +++ test/CodeGen/X86/sext-i1.ll (working copy) @@ -39,7 +39,8 @@ ; 32: t3: ; 32: cmpl $1 ; 32: sbbl -; 32: cmpl +; 32: subl +; 32: sbbl ; 32: xorl ; 64: t3: Index: test/CodeGen/X86/long-setcc.ll =================================================================== --- test/CodeGen/X86/long-setcc.ll (revision 126022) +++ test/CodeGen/X86/long-setcc.ll (working copy) @@ -1,18 +1,35 @@ -; RUN: llc < %s -march=x86 | grep cmp | count 1 -; RUN: llc < %s -march=x86 | grep shr | count 1 -; RUN: llc < %s -march=x86 | grep xor | count 1 +; RUN: llc < %s -march=x86 | FileCheck %s -define i1 @t1(i64 %x) nounwind { - %B = icmp slt i64 %x, 0 - ret i1 %B +; General case +define i1 @t1(i64 %x, i64 %y) nounwind { +; CHECK: @t1 +; CHECK: subl +; CHECK: sbbl +; CHECK: setl %al + %B = icmp slt i64 %x, %y + ret i1 %B } +; Some special cases define i1 @t2(i64 %x) nounwind { - %tmp = icmp ult i64 %x, 4294967296 - ret i1 %tmp +; CHECK: @t2 +; CHECK: shrl $31, %eax + %B = icmp slt i64 %x, 0 + ret i1 %B } -define i1 @t3(i32 %x) nounwind { - %tmp = icmp ugt i32 %x, -1 - ret i1 %tmp +define i1 @t3(i64 %x) nounwind { +; CHECK: @t3 +; CHECX: cmpl $0 +; CHECX: sete %al + %tmp = icmp ult i64 %x, 4294967296 + ret i1 %tmp } + +define i1 @t4(i64 %x) nounwind { +; CHECK: @t4 +; CHECX: cmpl $0 +; CHECX: setne %al + %tmp = icmp ugt i64 %x, 4294967295 + ret i1 %tmp +} Index: lib/Target/X86/X86ISelLowering.cpp =================================================================== --- lib/Target/X86/X86ISelLowering.cpp (revision 126022) +++ lib/Target/X86/X86ISelLowering.cpp (working copy) @@ -446,12 +446,13 @@ setOperationAction(ISD::SETCC , MVT::i8 , Custom); setOperationAction(ISD::SETCC , MVT::i16 , Custom); setOperationAction(ISD::SETCC , MVT::i32 , Custom); + setOperationAction(ISD::SETCC , MVT::i64 , Custom); setOperationAction(ISD::SETCC , MVT::f32 , Custom); setOperationAction(ISD::SETCC , MVT::f64 , Custom); setOperationAction(ISD::SETCC , MVT::f80 , Custom); if (Subtarget->is64Bit()) { setOperationAction(ISD::SELECT , MVT::i64 , Custom); - setOperationAction(ISD::SETCC , MVT::i64 , Custom); + setOperationAction(ISD::SETCC , MVT::i128 , Custom); } setOperationAction(ISD::EH_RETURN , MVT::Other, Custom); @@ -2836,7 +2837,7 @@ } else if (SetCCOpcode == ISD::SETLT && RHSC->isNullValue()) { // X < 0 -> X == 0, jump on sign. return X86::COND_S; - } else if (SetCCOpcode == ISD::SETLT && RHSC->getZExtValue() == 1) { + } else if (SetCCOpcode == ISD::SETLT && RHSC->isOne()) { // X < 1 -> X <= 0 RHS = DAG.getConstant(0, RHS.getValueType()); return X86::COND_LE; @@ -7367,7 +7368,8 @@ // Lower (X & (1 << N)) == 0 to BT(X, N). // Lower ((X >>u N) & 1) != 0 to BT(X, N). // Lower ((X >>s N) & 1) != 0 to BT(X, N). - if (Op0.getOpcode() == ISD::AND && Op0.hasOneUse() && + if (isTypeLegal(Op0.getValueType()) && + Op0.getOpcode() == ISD::AND && Op0.hasOneUse() && Op1.getOpcode() == ISD::Constant && cast(Op1)->isNullValue() && (CC == ISD::SETEQ || CC == ISD::SETNE)) { @@ -7379,7 +7381,7 @@ // Look for X == 0, X == 1, X != 0, or X != 1. We can simplify some forms of // these. if (Op1.getOpcode() == ISD::Constant && - (cast(Op1)->getZExtValue() == 1 || + (cast(Op1)->isOne() || cast(Op1)->isNullValue()) && (CC == ISD::SETEQ || CC == ISD::SETNE)) { @@ -7402,6 +7404,73 @@ if (X86CC == X86::COND_INVALID) return SDValue(); + if ((!Subtarget->is64Bit() && Op0.getValueType() == MVT::i64) || + (Subtarget->is64Bit() && Op0.getValueType() == MVT::i128)) { + switch (X86CC) { + case X86::COND_E: + case X86::COND_NE: + case X86::COND_S: + case X86::COND_NS: + // Just use the generic lowering, which works well on x86. + return SDValue(); + case X86::COND_B: + case X86::COND_AE: + case X86::COND_L: + case X86::COND_GE: + // Use SBB-based lowering. + break; + case X86::COND_A: + // Use SBB-based lowering; commute so ZF isn't used. + X86CC = X86::COND_B; + std::swap(Op0, Op1); + break; + case X86::COND_BE: + // Use SBB-based lowering; commute so ZF isn't used. + X86CC = X86::COND_AE; + std::swap(Op0, Op1); + break; + case X86::COND_G: + // Use SBB-based lowering; commute so ZF isn't used. + X86CC = X86::COND_L; + std::swap(Op0, Op1); + break; + case X86::COND_LE: + // Use SBB-based lowering; commute so ZF isn't used. + X86CC = X86::COND_GE; + std::swap(Op0, Op1); + break; + default: + assert(0 && "Unexpected X86CC."); + return SDValue(); + } + MVT HalfType = getPointerTy(); + // FIXME: Refactor this code out to implement ISD::SADDO and friends. + SDValue Op0Low = DAG.getNode(ISD::EXTRACT_ELEMENT, dl, HalfType, + Op0, DAG.getIntPtrConstant(0)); + SDValue Op1Low = DAG.getNode(ISD::EXTRACT_ELEMENT, dl, HalfType, + Op1, DAG.getIntPtrConstant(0)); + SDValue Op0High = DAG.getNode(ISD::EXTRACT_ELEMENT, dl, HalfType, + Op0, DAG.getIntPtrConstant(1)); + SDValue Op1High = DAG.getNode(ISD::EXTRACT_ELEMENT, dl, HalfType, + Op1, DAG.getIntPtrConstant(1)); + // Redirect some cases which will simplify to the generic expansion; + // X86ISD::SUB and X86ISD::SBB are not optimized well at the moment. + // FIXME: We really need to add DAGCombines for SUB/SBB/etc. + if (Op1Low.getOpcode() == ISD::Constant && + cast(Op1Low)->isNullValue()) + return SDValue(); + if (Op0Low.getOpcode() == ISD::Constant && + cast(Op0Low)->isAllOnesValue()) + return SDValue(); + SDValue res1, res2; + SDVTList VTList = DAG.getVTList(HalfType, MVT::i32); + res1 = DAG.getNode(X86ISD::SUB, dl, VTList, Op0Low, Op1Low).getValue(1); + res2 = DAG.getNode(X86ISD::SBB, dl, VTList, Op0High, Op1High, + res1).getValue(1); + return DAG.getNode(X86ISD::SETCC, dl, MVT::i8, + DAG.getConstant(X86CC, MVT::i8), res2); + } + SDValue EFLAGS = EmitCmp(Op0, Op1, X86CC, DAG); return DAG.getNode(X86ISD::SETCC, dl, MVT::i8, DAG.getConstant(X86CC, MVT::i8), EFLAGS); From eli.friedman at gmail.com Sat Feb 19 16:42:40 2011 From: eli.friedman at gmail.com (Eli Friedman) Date: Sat, 19 Feb 2011 22:42:40 -0000 Subject: [llvm-commits] [llvm] r126058 - in /llvm/trunk: lib/Transforms/InstCombine/InstCombineVectorOps.cpp test/Transforms/InstCombine/2011-02-16-InsertelementHang.ll Message-ID: <20110219224240.8EF5D2A6C12C@llvm.org> Author: efriedma Date: Sat Feb 19 16:42:40 2011 New Revision: 126058 URL: http://llvm.org/viewvc/llvm-project?rev=126058&view=rev Log: PR9218: SimplifyDemandedVectorElts can return a non-null value that is not the instruction passed in. Make sure to account for this correctly, instead of looping infinitely. Added: llvm/trunk/test/Transforms/InstCombine/2011-02-16-InsertelementHang.ll Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineVectorOps.cpp Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineVectorOps.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineVectorOps.cpp?rev=126058&r1=126057&r2=126058&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/InstCombine/InstCombineVectorOps.cpp (original) +++ llvm/trunk/lib/Transforms/InstCombine/InstCombineVectorOps.cpp Sat Feb 19 16:42:40 2011 @@ -426,8 +426,11 @@ unsigned VWidth = cast(VecOp->getType())->getNumElements(); APInt UndefElts(VWidth, 0); APInt AllOnesEltMask(APInt::getAllOnesValue(VWidth)); - if (SimplifyDemandedVectorElts(&IE, AllOnesEltMask, UndefElts)) + if (Value *V = SimplifyDemandedVectorElts(&IE, AllOnesEltMask, UndefElts)) { + if (V != &IE) + return ReplaceInstUsesWith(IE, V); return &IE; + } return 0; } @@ -451,7 +454,9 @@ APInt UndefElts(VWidth, 0); APInt AllOnesEltMask(APInt::getAllOnesValue(VWidth)); - if (SimplifyDemandedVectorElts(&SVI, AllOnesEltMask, UndefElts)) { + if (Value *V = SimplifyDemandedVectorElts(&SVI, AllOnesEltMask, UndefElts)) { + if (V != &SVI) + return ReplaceInstUsesWith(SVI, V); LHS = SVI.getOperand(0); RHS = SVI.getOperand(1); MadeChange = true; Added: llvm/trunk/test/Transforms/InstCombine/2011-02-16-InsertelementHang.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2011-02-16-InsertelementHang.ll?rev=126058&view=auto ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/2011-02-16-InsertelementHang.ll (added) +++ llvm/trunk/test/Transforms/InstCombine/2011-02-16-InsertelementHang.ll Sat Feb 19 16:42:40 2011 @@ -0,0 +1,11 @@ +; RUN: opt < %s -instcombine -S | FileCheck %s +; PR9218 + +%vec2x2 = type { <2 x double>, <2 x double> } + +define %vec2x2 @split(double) nounwind alwaysinline { +; CHECK: @split +; CHECK: ret %vec2x2 undef + %vba = insertelement <2 x double> undef, double %0, i32 2 + ret <2 x double> %vba, <2 x double> %vba +} From rafael.espindola at gmail.com Sat Feb 19 17:14:06 2011 From: rafael.espindola at gmail.com (=?ISO-8859-1?Q?Rafael_=C1vila_de_Esp=EDndola?=) Date: Sat, 19 Feb 2011 18:14:06 -0500 Subject: [llvm-commits] [lto][patch] Remove weak attempt of tracking symbols defined in module level assembly Message-ID: <4D604EBE.4050807@gmail.com> I noticed that when given a module with module asm "\09.if\093 < 10" module asm "\09.globl\09_ZN14nsXPTCStubBase5Stub3Ev" module asm "\09.endif" libLTO would report a symbol whose name started with a tab. I was surprised that a symbol was reported at all. Looking in the libLTO source code shows that it has a very basic support for trying to guess what symbols are defined in an inline assembly. It does a series of searches for ".globl"! IMHO weak heuristics like this cause more harm than good. LLVM should not understand the assembly string or it should use MC to represent the assembly code in a parsed form. In any case, the logic should not be in libLTO :-) The attached patch removes the current heuristic. Cheers, Rafael -------------- next part -------------- A non-text attachment was scrubbed... Name: noasm.patch Type: text/x-patch Size: 2654 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20110219/e9c51acc/attachment.bin From clattner at apple.com Sat Feb 19 17:35:32 2011 From: clattner at apple.com (Chris Lattner) Date: Sat, 19 Feb 2011 15:35:32 -0800 Subject: [llvm-commits] [PATCH] Patch (WIP) to custom-lower 64-bit relational comparisons on x86-32 In-Reply-To: References: <9B03BD52-6B0C-4784-8FC1-02C6EAC9B57D@apple.com> Message-ID: On Feb 19, 2011, at 2:34 PM, Eli Friedman wrote: >> >> This looks pretty spiffy to me. A couple of requests though: >> >> 1. Please make this work for i128 on x86-64. >> 2. Please change the if/else sequence to use a switch with a default case that explodes. >> 4. Please fit in 80 columns >> 8. I think you only need to do the setOperationAction when building for 32-bit. >> 16. Does the code handle weird conditions like "COND_P"? > > COND_P can't show up here. > > Updated patch attached; I think this is close to commit-quality. Looks good to me, I'd appreciate if it the dagcombine fixme could be addressed in a subsequent patch though. -Chris From clattner at apple.com Sat Feb 19 17:39:02 2011 From: clattner at apple.com (Chris Lattner) Date: Sat, 19 Feb 2011 15:39:02 -0800 Subject: [llvm-commits] [lto][patch] Remove weak attempt of tracking symbols defined in module level assembly In-Reply-To: <4D604EBE.4050807@gmail.com> References: <4D604EBE.4050807@gmail.com> Message-ID: On Feb 19, 2011, at 3:14 PM, Rafael ?vila de Esp?ndola wrote: > I noticed that when given a module with > > module asm "\09.if\093 < 10" > module asm "\09.globl\09_ZN14nsXPTCStubBase5Stub3Ev" > module asm "\09.endif" > > libLTO would report a symbol whose name started with a tab. I was > surprised that a symbol was reported at all. > > Looking in the libLTO source code shows that it has a very basic support > for trying to guess what symbols are defined in an inline assembly. It > does a series of searches for ".globl"! > > IMHO weak heuristics like this cause more harm than good. LLVM should > not understand the assembly string or it should use MC to represent the > assembly code in a parsed form. In any case, the logic should not be in > libLTO :-) I agree that the heuristic is a gross hack, but this will break building llvm itself with LTO, since the JIT defines a symbol (for the compilation callback) in file scope inline asm. I think that the right longer term answer is to use the MC parser with a custom mcstreamer to pick out symbol definitions. -Chris From nicholas at mxc.ca Sat Feb 19 19:44:40 2011 From: nicholas at mxc.ca (Nick Lewycky) Date: Sat, 19 Feb 2011 17:44:40 -0800 Subject: [llvm-commits] Patch to delete PHI nodes with multiple uses In-Reply-To: References: Message-ID: <4D607208.3040202@mxc.ca> Andrew Clinton wrote: > This is a simple patch to improve RecursivelyDeleteDeadPHINode so that > it will delete PHIs that have multiple identical uses (self > references). Cool! I have some review comments: +// Check whether the uses of a value are all the same. This is similar to +// Instruction::hasOneUse() except this will also return true when there are +// multiple uses that all refer to the same value. +static bool +AreAllUsesEqual(Instruction *J) +{ The previous three lines all fit on one. Also, why "J"? "I" isn't used in this function. Also, since this is a new function, please start the name with an initial lowercase letter (http://llvm.org/docs/CodingStandards.html#ll_naming is newer than most of the code, in case you're wondering). + Value::use_iterator UI = J->use_begin(); + Value::use_iterator UE = J->use_end(); + if (UI == UE) + return false; + + for (++UI; UI != UE; ++UI) + { + if (*UI != *J->use_begin()) Could you hoist the computation of *J->use_begin() out of the loop? + return false; + } + return true; +} > The DeletePHIs.cpp is a pass to test it, along with delete-phis.ll. > I'm not sure whether this test needs to be added to the baseline or if > so, where to put it. Run the test with: The delete-phis.ll test is convincing enough, I don't think this warrants keeping an entire pass -- but if you do want to run this method over some code, I suggest writing a unit test for it under unittests/. You can produce a Function then call RecursivelyDeleteDeadPHINode on an instruction and check the result. Please post an updated patch. Do you want me to commit this for you? Nick > opt -load ../../../Debug+Asserts/lib/LLVMDeletePHIs.so< > delete-phis.ll -delete-phis -S > > Andrew > > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From nicholas at mxc.ca Sat Feb 19 20:03:04 2011 From: nicholas at mxc.ca (Nick Lewycky) Date: Sun, 20 Feb 2011 02:03:04 -0000 Subject: [llvm-commits] [llvm] r126065 - /llvm/trunk/docs/CodingStandards.html Message-ID: <20110220020304.C0E652A6C12C@llvm.org> Author: nicholas Date: Sat Feb 19 20:03:04 2011 New Revision: 126065 URL: http://llvm.org/viewvc/llvm-project?rev=126065&view=rev Log: Fix typo. Modified: llvm/trunk/docs/CodingStandards.html Modified: llvm/trunk/docs/CodingStandards.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CodingStandards.html?rev=126065&r1=126064&r2=126065&view=diff ============================================================================== --- llvm/trunk/docs/CodingStandards.html (original) +++ llvm/trunk/docs/CodingStandards.html Sat Feb 19 20:03:04 2011 @@ -1053,7 +1053,7 @@
- Don't valuate end() every time through a loop + Don't evaluate end() every time through a loop

From rafael.espindola at gmail.com Sat Feb 19 20:35:06 2011 From: rafael.espindola at gmail.com (=?ISO-8859-1?Q?Rafael_=C1vila_de_Esp=EDndola?=) Date: Sat, 19 Feb 2011 21:35:06 -0500 Subject: [llvm-commits] [lto][patch] Remove weak attempt of tracking symbols defined in module level assembly In-Reply-To: References: <4D604EBE.4050807@gmail.com> Message-ID: <4D607DDA.6040102@gmail.com> > I agree that the heuristic is a gross hack, but this will break > building llvm itself with LTO, since the JIT defines a symbol (for > the compilation callback) in file scope inline asm. Why would this break the build? If a symbol is not present in the IL but shows up in the final .o produce by LTO, the linker should still put in in the binary. I just tried a clang bootstrap with LTO and this patch and the dynamic symbol table of lli contains the symbol: 6923: 00000000004f4ed0 130 FUNC GLOBAL DEFAULT 13 X86CompilationCallback If this is a limitation of the Apple linker, can this code be made conditional on a Mach-O target? > I think that the right longer term answer is to use the MC parser > with a custom mcstreamer to pick out symbol definitions. I am not fully decided. Just some observations: *) Having this logic in libLTO causes surprising results like when the gnu nm using the LTO plugin prints a symbol but llvm's own llvm-nm doesn't. *) This would add another expensive step to an already expensive stage. Both of those problems could be avoided with an explicit symbol table in the .bc files, but then the logic for parsing the assembly and finding definitions and references would have to be in the IL assembler so that simple tools like llvm-as still produce the correct result. > -Chris Cheers, Rafael From ofv at wanadoo.es Sat Feb 19 20:55:27 2011 From: ofv at wanadoo.es (Oscar Fuentes) Date: Sun, 20 Feb 2011 02:55:27 -0000 Subject: [llvm-commits] [llvm] r126068 - in /llvm/trunk: cmake/modules/ lib/Target/ lib/Target/ARM/ lib/Target/Alpha/ lib/Target/Blackfin/ lib/Target/CBackend/ lib/Target/CellSPU/ lib/Target/CppBackend/ lib/Target/MBlaze/ lib/Target/MSP430/ lib/Target/Mips/ lib/Target/PTX/ lib/Target/PowerPC/ lib/Target/Sparc/ lib/Target/SystemZ/ lib/Target/X86/ lib/Target/XCore/ Message-ID: <20110220025528.1CFD02A6C12C@llvm.org> Author: ofv Date: Sat Feb 19 20:55:27 2011 New Revision: 126068 URL: http://llvm.org/viewvc/llvm-project?rev=126068&view=rev Log: Use explicit add_subdirectory's for LLVM target sublibraries instead of testing for its presence at cmake time. This way the build automatically regenerates the makefiles when a svn update brings in a new sublibrary. Modified: llvm/trunk/cmake/modules/AddLLVM.cmake llvm/trunk/lib/Target/ARM/CMakeLists.txt llvm/trunk/lib/Target/Alpha/CMakeLists.txt llvm/trunk/lib/Target/Blackfin/CMakeLists.txt llvm/trunk/lib/Target/CBackend/CMakeLists.txt llvm/trunk/lib/Target/CMakeLists.txt llvm/trunk/lib/Target/CellSPU/CMakeLists.txt llvm/trunk/lib/Target/CppBackend/CMakeLists.txt llvm/trunk/lib/Target/MBlaze/CMakeLists.txt llvm/trunk/lib/Target/MSP430/CMakeLists.txt llvm/trunk/lib/Target/Mips/CMakeLists.txt llvm/trunk/lib/Target/PTX/CMakeLists.txt llvm/trunk/lib/Target/PowerPC/CMakeLists.txt llvm/trunk/lib/Target/Sparc/CMakeLists.txt llvm/trunk/lib/Target/SystemZ/CMakeLists.txt llvm/trunk/lib/Target/X86/CMakeLists.txt llvm/trunk/lib/Target/XCore/CMakeLists.txt Modified: llvm/trunk/cmake/modules/AddLLVM.cmake URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=126068&r1=126067&r2=126068&view=diff ============================================================================== --- llvm/trunk/cmake/modules/AddLLVM.cmake (original) +++ llvm/trunk/cmake/modules/AddLLVM.cmake Sat Feb 19 20:55:27 2011 @@ -121,5 +121,5 @@ if ( TABLEGEN_OUTPUT ) add_dependencies(LLVM${target_name} ${target_name}Table_gen) endif (TABLEGEN_OUTPUT) - set(CURRENT_LLVM_TARGET LLVM${target_name} PARENT_SCOPE) + set( CURRENT_LLVM_TARGET LLVM${target_name} ) endmacro(add_llvm_target) Modified: llvm/trunk/lib/Target/ARM/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/CMakeLists.txt?rev=126068&r1=126067&r2=126068&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/CMakeLists.txt (original) +++ llvm/trunk/lib/Target/ARM/CMakeLists.txt Sat Feb 19 20:55:27 2011 @@ -62,3 +62,8 @@ PROPERTY COMPILE_FLAGS "/Od" ) endif() + +add_subdirectory(TargetInfo) +add_subdirectory(AsmParser) +add_subdirectory(Disassembler) +add_subdirectory(InstPrinter) Modified: llvm/trunk/lib/Target/Alpha/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Alpha/CMakeLists.txt?rev=126068&r1=126067&r2=126068&view=diff ============================================================================== --- llvm/trunk/lib/Target/Alpha/CMakeLists.txt (original) +++ llvm/trunk/lib/Target/Alpha/CMakeLists.txt Sat Feb 19 20:55:27 2011 @@ -24,3 +24,5 @@ AlphaTargetMachine.cpp AlphaSelectionDAGInfo.cpp ) + +add_subdirectory(TargetInfo) Modified: llvm/trunk/lib/Target/Blackfin/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Blackfin/CMakeLists.txt?rev=126068&r1=126067&r2=126068&view=diff ============================================================================== --- llvm/trunk/lib/Target/Blackfin/CMakeLists.txt (original) +++ llvm/trunk/lib/Target/Blackfin/CMakeLists.txt Sat Feb 19 20:55:27 2011 @@ -24,3 +24,5 @@ BlackfinTargetMachine.cpp BlackfinSelectionDAGInfo.cpp ) + +add_subdirectory(TargetInfo) Modified: llvm/trunk/lib/Target/CBackend/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CBackend/CMakeLists.txt?rev=126068&r1=126067&r2=126068&view=diff ============================================================================== --- llvm/trunk/lib/Target/CBackend/CMakeLists.txt (original) +++ llvm/trunk/lib/Target/CBackend/CMakeLists.txt Sat Feb 19 20:55:27 2011 @@ -1,3 +1,5 @@ add_llvm_target(CBackend CBackend.cpp ) + +add_subdirectory(TargetInfo) Modified: llvm/trunk/lib/Target/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CMakeLists.txt?rev=126068&r1=126067&r2=126068&view=diff ============================================================================== --- llvm/trunk/lib/Target/CMakeLists.txt (original) +++ llvm/trunk/lib/Target/CMakeLists.txt Sat Feb 19 20:55:27 2011 @@ -22,30 +22,20 @@ foreach(t ${LLVM_TARGETS_TO_BUILD}) message(STATUS "Targeting ${t}") add_subdirectory(${t}) - add_subdirectory(${t}/TargetInfo) set( td ${LLVM_MAIN_SRC_DIR}/lib/Target/${t} ) file(GLOB asmp_file "${td}/*AsmPrinter.cpp") if( asmp_file ) set(LLVM_ENUM_ASM_PRINTERS "${LLVM_ENUM_ASM_PRINTERS}LLVM_ASM_PRINTER(${t})\n") endif() - if( EXISTS ${td}/InstPrinter/CMakeLists.txt ) - add_subdirectory(${t}/InstPrinter) - endif() if( EXISTS ${td}/AsmParser/CMakeLists.txt ) - add_subdirectory(${t}/AsmParser) set(LLVM_ENUM_ASM_PARSERS "${LLVM_ENUM_ASM_PARSERS}LLVM_ASM_PARSER(${t})\n") endif() if( EXISTS ${td}/Disassembler/CMakeLists.txt ) - add_subdirectory(${t}/Disassembler) set(LLVM_ENUM_DISASSEMBLERS "${LLVM_ENUM_DISASSEMBLERS}LLVM_DISASSEMBLER(${t})\n") endif() - if( EXISTS ${td}/Utils/CMakeLists.txt ) - add_subdirectory(${td}/Utils) - endif() - set(CURRENT_LLVM_TARGET) endforeach(t) # Produce llvm/Config/AsmPrinters.def Modified: llvm/trunk/lib/Target/CellSPU/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CellSPU/CMakeLists.txt?rev=126068&r1=126067&r2=126068&view=diff ============================================================================== --- llvm/trunk/lib/Target/CellSPU/CMakeLists.txt (original) +++ llvm/trunk/lib/Target/CellSPU/CMakeLists.txt Sat Feb 19 20:55:27 2011 @@ -25,3 +25,5 @@ SPUSelectionDAGInfo.cpp SPUNopFiller.cpp ) + +add_subdirectory(TargetInfo) Modified: llvm/trunk/lib/Target/CppBackend/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CppBackend/CMakeLists.txt?rev=126068&r1=126067&r2=126068&view=diff ============================================================================== --- llvm/trunk/lib/Target/CppBackend/CMakeLists.txt (original) +++ llvm/trunk/lib/Target/CppBackend/CMakeLists.txt Sat Feb 19 20:55:27 2011 @@ -1,3 +1,5 @@ add_llvm_target(CppBackend CPPBackend.cpp ) + +add_subdirectory(TargetInfo) Modified: llvm/trunk/lib/Target/MBlaze/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/MBlaze/CMakeLists.txt?rev=126068&r1=126067&r2=126068&view=diff ============================================================================== --- llvm/trunk/lib/Target/MBlaze/CMakeLists.txt (original) +++ llvm/trunk/lib/Target/MBlaze/CMakeLists.txt Sat Feb 19 20:55:27 2011 @@ -33,3 +33,8 @@ MBlazeELFWriterInfo.cpp MBlazeMCCodeEmitter.cpp ) + +add_subdirectory(AsmParser) +add_subdirectory(Disassembler) +add_subdirectory(InstPrinter) +add_subdirectory(TargetInfo) Modified: llvm/trunk/lib/Target/MSP430/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/MSP430/CMakeLists.txt?rev=126068&r1=126067&r2=126068&view=diff ============================================================================== --- llvm/trunk/lib/Target/MSP430/CMakeLists.txt (original) +++ llvm/trunk/lib/Target/MSP430/CMakeLists.txt Sat Feb 19 20:55:27 2011 @@ -24,3 +24,6 @@ MSP430AsmPrinter.cpp MSP430MCInstLower.cpp ) + +add_subdirectory(InstPrinter) +add_subdirectory(TargetInfo) Modified: llvm/trunk/lib/Target/Mips/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/CMakeLists.txt?rev=126068&r1=126067&r2=126068&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/CMakeLists.txt (original) +++ llvm/trunk/lib/Target/Mips/CMakeLists.txt Sat Feb 19 20:55:27 2011 @@ -24,3 +24,5 @@ MipsTargetObjectFile.cpp MipsSelectionDAGInfo.cpp ) + +add_subdirectory(TargetInfo) Modified: llvm/trunk/lib/Target/PTX/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PTX/CMakeLists.txt?rev=126068&r1=126067&r2=126068&view=diff ============================================================================== --- llvm/trunk/lib/Target/PTX/CMakeLists.txt (original) +++ llvm/trunk/lib/Target/PTX/CMakeLists.txt Sat Feb 19 20:55:27 2011 @@ -22,3 +22,5 @@ PTXSubtarget.cpp PTXTargetMachine.cpp ) + +add_subdirectory(TargetInfo) Modified: llvm/trunk/lib/Target/PowerPC/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/CMakeLists.txt?rev=126068&r1=126067&r2=126068&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/CMakeLists.txt (original) +++ llvm/trunk/lib/Target/PowerPC/CMakeLists.txt Sat Feb 19 20:55:27 2011 @@ -32,3 +32,6 @@ PPCTargetMachine.cpp PPCSelectionDAGInfo.cpp ) + +add_subdirectory(InstPrinter) +add_subdirectory(TargetInfo) Modified: llvm/trunk/lib/Target/Sparc/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/CMakeLists.txt?rev=126068&r1=126067&r2=126068&view=diff ============================================================================== --- llvm/trunk/lib/Target/Sparc/CMakeLists.txt (original) +++ llvm/trunk/lib/Target/Sparc/CMakeLists.txt Sat Feb 19 20:55:27 2011 @@ -24,3 +24,5 @@ SparcTargetMachine.cpp SparcSelectionDAGInfo.cpp ) + +add_subdirectory(TargetInfo) Modified: llvm/trunk/lib/Target/SystemZ/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/SystemZ/CMakeLists.txt?rev=126068&r1=126067&r2=126068&view=diff ============================================================================== --- llvm/trunk/lib/Target/SystemZ/CMakeLists.txt (original) +++ llvm/trunk/lib/Target/SystemZ/CMakeLists.txt Sat Feb 19 20:55:27 2011 @@ -22,3 +22,5 @@ SystemZTargetMachine.cpp SystemZSelectionDAGInfo.cpp ) + +add_subdirectory(TargetInfo) Modified: llvm/trunk/lib/Target/X86/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/CMakeLists.txt?rev=126068&r1=126067&r2=126068&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/CMakeLists.txt (original) +++ llvm/trunk/lib/Target/X86/CMakeLists.txt Sat Feb 19 20:55:27 2011 @@ -57,3 +57,8 @@ add_llvm_target(X86CodeGen ${sources}) +add_subdirectory(AsmParser) +add_subdirectory(Disassembler) +add_subdirectory(InstPrinter) +add_subdirectory(TargetInfo) +add_subdirectory(Utils) Modified: llvm/trunk/lib/Target/XCore/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/CMakeLists.txt?rev=126068&r1=126067&r2=126068&view=diff ============================================================================== --- llvm/trunk/lib/Target/XCore/CMakeLists.txt (original) +++ llvm/trunk/lib/Target/XCore/CMakeLists.txt Sat Feb 19 20:55:27 2011 @@ -23,3 +23,5 @@ XCoreTargetObjectFile.cpp XCoreSelectionDAGInfo.cpp ) + +add_subdirectory(TargetInfo) From wilsons at start.ca Sat Feb 19 21:51:07 2011 From: wilsons at start.ca (Stephen Wilson) Date: Sun, 20 Feb 2011 03:51:07 -0000 Subject: [llvm-commits] [llvm] r126070 - /llvm/trunk/Makefile.rules Message-ID: <20110220035108.040FA2A6C12C@llvm.org> Author: wilsons Date: Sat Feb 19 21:51:07 2011 New Revision: 126070 URL: http://llvm.org/viewvc/llvm-project?rev=126070&view=rev Log: Do not try to descend into optional build directories if they do not exist. This makes the build logic symmetric for both the in tree and out of tree cases. Modified: llvm/trunk/Makefile.rules Modified: llvm/trunk/Makefile.rules URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=126070&r1=126069&r2=126070&view=diff ============================================================================== --- llvm/trunk/Makefile.rules (original) +++ llvm/trunk/Makefile.rules Sat Feb 19 21:51:07 2011 @@ -840,7 +840,9 @@ else $(RecursiveTargets):: $(Verb) for dir in $(OPTIONAL_DIRS); do \ - ($(MAKE) -C$$dir $@ ) || exit 1; \ + if [ -d $(PROJ_SRC_DIR)/$$dir ]; then\ + ($(MAKE) -C$$dir $@ ) || exit 1; \ + fi \ done endif endif From wilsons at start.ca Sat Feb 19 22:17:15 2011 From: wilsons at start.ca (Stephen Wilson) Date: Sun, 20 Feb 2011 04:17:15 -0000 Subject: [llvm-commits] [llvm] r126071 - /llvm/trunk/tools/Makefile Message-ID: <20110220041715.B826F2A6C12C@llvm.org> Author: wilsons Date: Sat Feb 19 22:17:15 2011 New Revision: 126071 URL: http://llvm.org/viewvc/llvm-project?rev=126071&view=rev Log: This patch lets LLDB build as an LLVM subproject. LLDB is not built in parallel with the rest of the tools directory as it depends on Clang. This patch was first applied in r125956 and subsequently reverted in r125964 as it broke in-tree builds. Makefile.rules was fixed up in r126070 to handle missing optional directories for the in-tree case, so it should be safe now to bring this patch back in. Modified: llvm/trunk/tools/Makefile Modified: llvm/trunk/tools/Makefile URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/Makefile?rev=126071&r1=126070&r2=126071&view=diff ============================================================================== --- llvm/trunk/tools/Makefile (original) +++ llvm/trunk/tools/Makefile Sat Feb 19 22:17:15 2011 @@ -12,6 +12,10 @@ # Build clang if present. OPTIONAL_PARALLEL_DIRS := clang +# Build LLDB if present. Note LLDB must be built last as it depends on the +# wider LLVM infrastructure (including Clang). +OPTIONAL_DIRS := lldb + # NOTE: The tools

Abstract:

Published:

Download Presentation:

Download

Install

Login

Login

Welcome to the LLVM Lab Dashboard!

Current Status

Latest Release

Welcome to the LLVM Lab Dashboard!

Example Phase Popups

Phase 4 - r123456

Example Phase Popups

Welcome to the LLVM Laboratory!

Sponsors

Welcome to the LLVM Lab Dashboard!

Admin

Add Machine

Latest Release

Example Phase Popups

Latest Release

Welcome to the LLVM Lab Dashboard!

Latest Release

Example Phase Popups

Phase 4 - r123456

Phase {{ phase.number }} {{ phase.name }} - r{{ source_stamp }}

Current Status

Current Status

Current Status

Current Status ({% + call timing_popup_link(None) %}T{% endcall %})

Recent Activity

Phase {{ phase.number }} {{ phase.name }} - r{{ source_stamp }}

{{ phase.name }} + (Phase {{ phase.number }}) - + r{{ source_stamp }}