<div dir="ltr">On Wed, Aug 21, 2013 at 8:02 PM, Shankar Easwaran <span dir="ltr"><<a href="mailto:shankare@codeaurora.org" target="_blank">shankare@codeaurora.org</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">

<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: shankare<br>
Date: Wed Aug 21 22:02:17 2013<br>
New Revision: 188981<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=188981&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=188981&view=rev</a><br>
Log:<br>
[lld][Hexagon] Enable Hexagon sdata sorting test<br>
<br>
Modified:<br>
    lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonSectionChunks.h<br>
    lld/trunk/test/elf/hexagon-quickdata-sortcommon.test<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonSectionChunks.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonSectionChunks.h?rev=188981&r1=188980&r2=188981&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonSectionChunks.h?rev=188981&r1=188980&r2=188981&view=diff</a><br>


==============================================================================<br>
--- lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonSectionChunks.h (original)<br>
+++ lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonSectionChunks.h Wed Aug 21 22:02:17 2013<br>
@@ -54,11 +54,18 @@ template <class HexagonELFType><br>
 void SDataSection<HexagonELFType>::doPreFlight() {<br>
   // sort the atoms on the alignments they have been set<br>
   std::stable_sort(this->_atoms.begin(), this->_atoms.end(),<br>
-                   [](const lld::AtomLayout * A, const lld::AtomLayout * B) {<br>
+                                             [](const lld::AtomLayout * A,<br>
+                                                const lld::AtomLayout * B) {<br>
     const DefinedAtom *definedAtomA = cast<DefinedAtom>(A->_atom);<br>
     const DefinedAtom *definedAtomB = cast<DefinedAtom>(B->_atom);<br>
     int64_t align2A = 1 << definedAtomA->alignment().powerOf2;<br>
     int64_t align2B = 1 << definedAtomB->alignment().powerOf2;<br>
+    if (align2A == align2B) {<br>
+      if (definedAtomA->merge() == DefinedAtom::mergeAsTentative)<br>
+        return false;<br>
+      if (definedAtomB->merge() == DefinedAtom::mergeAsTentative)<br>
+        return true;<br>
+    }<br>
     return align2A < align2B;<br>
   });<br></blockquote><div><br></div><div>nit: you could have compared the shift amounts rather than the results of shifted values.</div><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">


Modified: lld/trunk/test/elf/hexagon-quickdata-sortcommon.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/hexagon-quickdata-sortcommon.test?rev=188981&r1=188980&r2=188981&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/hexagon-quickdata-sortcommon.test?rev=188981&r1=188980&r2=188981&view=diff</a><br>


==============================================================================<br>
--- lld/trunk/test/elf/hexagon-quickdata-sortcommon.test (original)<br>
+++ lld/trunk/test/elf/hexagon-quickdata-sortcommon.test Wed Aug 21 22:02:17 2013<br>
@@ -1,7 +1,6 @@<br>
 RUN: lld -flavor gnu -target hexagon -o %t1 --noinhibit-exec \<br>
 RUN:     %p/Inputs/quickdata-sortcommon-test.o.elf-hexagon<br>
 RUN: llvm-nm -n %t1 | FileCheck %s -check-prefix=quickdataSortCommon<br>
-XFAIL: *<br>
<br>
 quickdataSortCommon: 00002000 D A1<br>
 quickdataSortCommon: 00002001 D AA1<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>