<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Sun, Mar 1, 2015 at 1:05 PM, Benjamin Kramer <span dir="ltr"><<a href="mailto:benny.kra@googlemail.com" target="_blank">benny.kra@googlemail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: d0k<br>
Date: Sun Mar 1 15:05:05 2015<br>
New Revision: 230907<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=230907&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=230907&view=rev</a><br>
Log:<br>
ArrayRef: Remove the equals helper with many arguments.<br>
<br>
With initializer lists there is a really neat idiomatic way to write<br>
this, 'ArrayRef.equals({1, 2, 3, 4, 5})'. Remove the equal method which<br>
always had a hard limit on the number of arguments. I considered<br>
rewriting it with variadic templates but that's not really a good fit<br>
for a function with homogeneous arguments.<br>
<br>
'ArrayRef == {1, 2, 3, 4, 5}' would've been even more awesome, but C++11<br>
doesn't allow init lists with binary operators.<br></blockquote><div><br>Can we have an implicit ArrayRef ctor from init list? (not sure what the storage of init lists is... )<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Modified:<br>
llvm/trunk/include/llvm/ADT/ArrayRef.h<br>
llvm/trunk/lib/Target/X86/X86ISelLowering.cpp<br>
llvm/trunk/unittests/ADT/ArrayRefTest.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/ADT/ArrayRef.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/ArrayRef.h?rev=230907&r1=230906&r2=230907&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/ArrayRef.h?rev=230907&r1=230906&r2=230907&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/ADT/ArrayRef.h (original)<br>
+++ llvm/trunk/include/llvm/ADT/ArrayRef.h Sun Mar 1 15:05:05 2015<br>
@@ -11,7 +11,6 @@<br>
#define LLVM_ADT_ARRAYREF_H<br>
<br>
#include "llvm/ADT/None.h"<br>
-#include "llvm/ADT/STLExtras.h"<br>
#include "llvm/ADT/SmallVector.h"<br>
#include <vector><br>
<br>
@@ -44,19 +43,6 @@ namespace llvm {<br>
/// The number of elements.<br>
size_type Length;<br>
<br>
- /// \brief A dummy "optional" type that is only created by implicit<br>
- /// conversion from a reference to T.<br>
- ///<br>
- /// This type must *only* be used in a function argument or as a copy of<br>
- /// a function argument, as otherwise it will hold a pointer to a temporary<br>
- /// past that temporaries' lifetime.<br>
- struct TRefOrNothing {<br>
- const T *TPtr;<br>
-<br>
- TRefOrNothing() : TPtr(nullptr) {}<br>
- TRefOrNothing(const T &TRef) : TPtr(&TRef) {}<br>
- };<br>
-<br>
public:<br>
/// @name Constructors<br>
/// @{<br>
@@ -202,47 +188,6 @@ namespace llvm {<br>
}<br>
<br>
/// @}<br>
- /// @{<br>
- /// @name Convenience methods<br>
-<br>
- /// @brief Predicate for testing that the array equals the exact sequence of<br>
- /// arguments.<br>
- ///<br>
- /// Will return false if the size is not equal to the exact number of<br>
- /// arguments given or if the array elements don't equal the argument<br>
- /// elements in order. Currently supports up to 16 arguments, but can<br>
- /// easily be extended.<br>
- bool equals(TRefOrNothing Arg0 = TRefOrNothing(),<br>
- TRefOrNothing Arg1 = TRefOrNothing(),<br>
- TRefOrNothing Arg2 = TRefOrNothing(),<br>
- TRefOrNothing Arg3 = TRefOrNothing(),<br>
- TRefOrNothing Arg4 = TRefOrNothing(),<br>
- TRefOrNothing Arg5 = TRefOrNothing(),<br>
- TRefOrNothing Arg6 = TRefOrNothing(),<br>
- TRefOrNothing Arg7 = TRefOrNothing(),<br>
- TRefOrNothing Arg8 = TRefOrNothing(),<br>
- TRefOrNothing Arg9 = TRefOrNothing(),<br>
- TRefOrNothing Arg10 = TRefOrNothing(),<br>
- TRefOrNothing Arg11 = TRefOrNothing(),<br>
- TRefOrNothing Arg12 = TRefOrNothing(),<br>
- TRefOrNothing Arg13 = TRefOrNothing(),<br>
- TRefOrNothing Arg14 = TRefOrNothing(),<br>
- TRefOrNothing Arg15 = TRefOrNothing()) {<br>
- TRefOrNothing Args[] = {Arg0, Arg1, Arg2, Arg3, Arg4, Arg5,<br>
- Arg6, Arg7, Arg8, Arg9, Arg10, Arg11,<br>
- Arg12, Arg13, Arg14, Arg15};<br>
- if (size() > array_lengthof(Args))<br>
- return false;<br>
-<br>
- for (unsigned i = 0, e = size(); i != e; ++i)<br>
- if (Args[i].TPtr == nullptr || (*this)[i] != *Args[i].TPtr)<br>
- return false;<br>
-<br>
- // Either the size is exactly as many args, or the next arg must be null.<br>
- return size() == array_lengthof(Args) || Args[size()].TPtr == nullptr;<br>
- }<br>
-<br>
- /// @}<br>
};<br>
<br>
/// MutableArrayRef - Represent a mutable reference to an array (0 or more<br>
<br>
Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=230907&r1=230906&r2=230907&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=230907&r1=230906&r2=230907&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)<br>
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Sun Mar 1 15:05:05 2015<br>
@@ -19149,8 +19149,8 @@ static bool combineX86ShuffleChain(SDVal<br>
//<br>
// FIXME: Should teach these routines about AVX vector widths.<br>
if (FloatDomain && VT.getSizeInBits() == 128) {<br>
- if (Mask.equals(0, 0) || Mask.equals(1, 1)) {<br>
- bool Lo = Mask.equals(0, 0);<br>
+ if (Mask.equals({0, 0}) || Mask.equals({1, 1})) {<br>
+ bool Lo = Mask.equals({0, 0});<br>
unsigned Shuffle;<br>
MVT ShuffleVT;<br>
// Check if we have SSE3 which will let us use MOVDDUP. That instruction<br>
@@ -19179,8 +19179,8 @@ static bool combineX86ShuffleChain(SDVal<br>
return true;<br>
}<br>
if (Subtarget->hasSSE3() &&<br>
- (Mask.equals(0, 0, 2, 2) || Mask.equals(1, 1, 3, 3))) {<br>
- bool Lo = Mask.equals(0, 0, 2, 2);<br>
+ (Mask.equals({0, 0, 2, 2}) || Mask.equals({1, 1, 3, 3}))) {<br>
+ bool Lo = Mask.equals({0, 0, 2, 2});<br>
unsigned Shuffle = Lo ? X86ISD::MOVSLDUP : X86ISD::MOVSHDUP;<br>
MVT ShuffleVT = MVT::v4f32;<br>
if (Depth == 1 && Root->getOpcode() == Shuffle)<br>
@@ -19193,8 +19193,8 @@ static bool combineX86ShuffleChain(SDVal<br>
/*AddTo*/ true);<br>
return true;<br>
}<br>
- if (Mask.equals(0, 0, 1, 1) || Mask.equals(2, 2, 3, 3)) {<br>
- bool Lo = Mask.equals(0, 0, 1, 1);<br>
+ if (Mask.equals({0, 0, 1, 1}) || Mask.equals({2, 2, 3, 3})) {<br>
+ bool Lo = Mask.equals({0, 0, 1, 1});<br>
unsigned Shuffle = Lo ? X86ISD::UNPCKL : X86ISD::UNPCKH;<br>
MVT ShuffleVT = MVT::v4f32;<br>
if (Depth == 1 && Root->getOpcode() == Shuffle)<br>
@@ -19213,11 +19213,11 @@ static bool combineX86ShuffleChain(SDVal<br>
// variants as none of these have single-instruction variants that are<br>
// superior to the UNPCK formulation.<br>
if (!FloatDomain && VT.getSizeInBits() == 128 &&<br>
- (Mask.equals(0, 0, 1, 1, 2, 2, 3, 3) ||<br>
- Mask.equals(4, 4, 5, 5, 6, 6, 7, 7) ||<br>
- Mask.equals(0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7) ||<br>
- Mask.equals(8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15,<br>
- 15))) {<br>
+ (Mask.equals({0, 0, 1, 1, 2, 2, 3, 3}) ||<br>
+ Mask.equals({4, 4, 5, 5, 6, 6, 7, 7}) ||<br>
+ Mask.equals({0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7}) ||<br>
+ Mask.equals(<br>
+ {8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15}))) {<br>
bool Lo = Mask[0] == 0;<br>
unsigned Shuffle = Lo ? X86ISD::UNPCKL : X86ISD::UNPCKH;<br>
if (Depth == 1 && Root->getOpcode() == Shuffle)<br>
@@ -19706,7 +19706,7 @@ static SDValue PerformTargetShuffleCombi<br>
// See if this reduces to a PSHUFD which is no more expensive and can<br>
// combine with more operations. Note that it has to at least flip the<br>
// dwords as otherwise it would have been removed as a no-op.<br>
- if (Mask[0] == 2 && Mask[1] == 3 && Mask[2] == 0 && Mask[3] == 1) {<br>
+ if (makeArrayRef(Mask).equals({2, 3, 0, 1})) {<br>
int DMask[] = {0, 1, 2, 3};<br>
int DOffset = N.getOpcode() == X86ISD::PSHUFLW ? 0 : 2;<br>
DMask[DOffset + 0] = DOffset + 1;<br>
@@ -19745,12 +19745,8 @@ static SDValue PerformTargetShuffleCombi<br>
int MappedMask[8];<br>
for (int i = 0; i < 8; ++i)<br>
MappedMask[i] = 2 * DMask[WordMask[i] / 2] + WordMask[i] % 2;<br>
- const int UnpackLoMask[] = {0, 0, 1, 1, 2, 2, 3, 3};<br>
- const int UnpackHiMask[] = {4, 4, 5, 5, 6, 6, 7, 7};<br>
- if (std::equal(std::begin(MappedMask), std::end(MappedMask),<br>
- std::begin(UnpackLoMask)) ||<br>
- std::equal(std::begin(MappedMask), std::end(MappedMask),<br>
- std::begin(UnpackHiMask))) {<br>
+ if (makeArrayRef(MappedMask).equals({0, 0, 1, 1, 2, 2, 3, 3}) ||<br>
+ makeArrayRef(MappedMask).equals({4, 4, 5, 5, 6, 6, 7, 7})) {<br>
// We can replace all three shuffles with an unpack.<br>
V = DAG.getNode(ISD::BITCAST, DL, VT, D.getOperand(0));<br>
DCI.AddToWorklist(V.getNode());<br>
<br>
Modified: llvm/trunk/unittests/ADT/ArrayRefTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ADT/ArrayRefTest.cpp?rev=230907&r1=230906&r2=230907&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ADT/ArrayRefTest.cpp?rev=230907&r1=230906&r2=230907&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/unittests/ADT/ArrayRefTest.cpp (original)<br>
+++ llvm/trunk/unittests/ADT/ArrayRefTest.cpp Sun Mar 1 15:05:05 2015<br>
@@ -57,24 +57,24 @@ TEST(ArrayRefTest, DropBack) {<br>
TEST(ArrayRefTest, Equals) {<br>
static const int A1[] = {1, 2, 3, 4, 5, 6, 7, 8};<br>
ArrayRef<int> AR1(A1);<br>
- EXPECT_TRUE(AR1.equals(1, 2, 3, 4, 5, 6, 7, 8));<br>
- EXPECT_FALSE(AR1.equals(8, 1, 2, 4, 5, 6, 6, 7));<br>
- EXPECT_FALSE(AR1.equals(2, 4, 5, 6, 6, 7, 8, 1));<br>
- EXPECT_FALSE(AR1.equals(0, 1, 2, 4, 5, 6, 6, 7));<br>
- EXPECT_FALSE(AR1.equals(1, 2, 42, 4, 5, 6, 7, 8));<br>
- EXPECT_FALSE(AR1.equals(42, 2, 3, 4, 5, 6, 7, 8));<br>
- EXPECT_FALSE(AR1.equals(1, 2, 3, 4, 5, 6, 7, 42));<br>
- EXPECT_FALSE(AR1.equals(1, 2, 3, 4, 5, 6, 7));<br>
- EXPECT_FALSE(AR1.equals(1, 2, 3, 4, 5, 6, 7, 8, 9));<br>
+ EXPECT_TRUE(AR1.equals({1, 2, 3, 4, 5, 6, 7, 8}));<br>
+ EXPECT_FALSE(AR1.equals({8, 1, 2, 4, 5, 6, 6, 7}));<br>
+ EXPECT_FALSE(AR1.equals({2, 4, 5, 6, 6, 7, 8, 1}));<br>
+ EXPECT_FALSE(AR1.equals({0, 1, 2, 4, 5, 6, 6, 7}));<br>
+ EXPECT_FALSE(AR1.equals({1, 2, 42, 4, 5, 6, 7, 8}));<br>
+ EXPECT_FALSE(AR1.equals({42, 2, 3, 4, 5, 6, 7, 8}));<br>
+ EXPECT_FALSE(AR1.equals({1, 2, 3, 4, 5, 6, 7, 42}));<br>
+ EXPECT_FALSE(AR1.equals({1, 2, 3, 4, 5, 6, 7}));<br>
+ EXPECT_FALSE(AR1.equals({1, 2, 3, 4, 5, 6, 7, 8, 9}));<br>
<br>
ArrayRef<int> AR1a = AR1.drop_back();<br>
- EXPECT_TRUE(AR1a.equals(1, 2, 3, 4, 5, 6, 7));<br>
- EXPECT_FALSE(AR1a.equals(1, 2, 3, 4, 5, 6, 7, 8));<br>
+ EXPECT_TRUE(AR1a.equals({1, 2, 3, 4, 5, 6, 7}));<br>
+ EXPECT_FALSE(AR1a.equals({1, 2, 3, 4, 5, 6, 7, 8}));<br>
<br>
ArrayRef<int> AR1b = AR1a.slice(2, 4);<br>
- EXPECT_TRUE(AR1b.equals(3, 4, 5, 6));<br>
- EXPECT_FALSE(AR1b.equals(2, 3, 4, 5, 6));<br>
- EXPECT_FALSE(AR1b.equals(3, 4, 5, 6, 7));<br>
+ EXPECT_TRUE(AR1b.equals({3, 4, 5, 6}));<br>
+ EXPECT_FALSE(AR1b.equals({2, 3, 4, 5, 6}));<br>
+ EXPECT_FALSE(AR1b.equals({3, 4, 5, 6, 7}));<br>
}<br>
<br>
TEST(ArrayRefTest, EmptyEquals) {<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>