Merge pull request #246 from jubitaneja/power2-edit

renaming power of two from 'p' to '2'
google · Mar 7, 2017 · 5faed54 · 5faed54
2 parents 4f87031 + 48b7baf
commit 5faed54
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 24 deletions.
diff --git a/lib/Inst/Inst.cpp b/lib/Inst/Inst.cpp
@@ -275,7 +275,7 @@ std::string Inst::getMoreKnownBitsString(bool NonZero, bool NonNegative, bool Po
   if (NonNegative)
     Str.append("n");
   if (PowOfTwo)
-    Str.append("p");
+    Str.append("2");
   return Str;
 }
 

diff --git a/lib/Parser/Parser.cpp b/lib/Parser/Parser.cpp
@@ -214,7 +214,7 @@ Token Lexer::getNextToken(std::string &ErrStr) {
       ++Begin;
       KnownBitsFlag = true;
     }
-    while (!KnownBitsFlag && (*Begin == 'n' || *Begin == 'z' || *Begin == 'p')) {
+    while (!KnownBitsFlag && (*Begin == 'n' || *Begin == 'z' || *Begin == '2')) {
       ++Begin;
       MoreKnownBitsFlag = true;
     }
@@ -227,7 +227,7 @@ Token Lexer::getNextToken(std::string &ErrStr) {
       return Token{Token::Error, Begin, 0, APInt()};
     }
     if (Begin == NumBegin) {
-      ErrStr = "invalid, expected [0|1|x]+ or [n|z|p]";
+      ErrStr = "invalid, expected [0|1|x]+ or [n|z|2]";
       return Token{Token::Error, Begin, 0, APInt()};
     }
     Token T;
@@ -931,9 +931,9 @@ bool Parser::parseLine(std::string &ErrStr) {
 		  return false;
 		}
                 NonNegative = true;
-	      } else if (CurTok.PatternString[i] == 'p') {
+	      } else if (CurTok.PatternString[i] == '2') {
 		if (PowOfTwo) {
-		  ErrStr = makeErrStr(TP, "repeated 'p' flag");
+		  ErrStr = makeErrStr(TP, "repeated '2' flag");
 		  return false;
 		}
                 PowOfTwo = true;

diff --git a/test/Tool/more-knownbits10.opt b/test/Tool/more-knownbits10.opt
@@ -4,7 +4,7 @@
 ; RUN: FileCheck %s < %t
 
 ; CHECK: LGTM
-%0:i32 = var (p)
+%0:i32 = var (2)
 %1:i32 = var
 %2:i32 = shlnw %0, %1
 %3:i32 = ctpop %2

diff --git a/test/Tool/more-knownbits11.opt b/test/Tool/more-knownbits11.opt
@@ -4,7 +4,7 @@
 ; RUN: FileCheck %s < %t
 
 ; CHECK: LGTM
-%0:i8 = var (p)
+%0:i8 = var (2)
 %1:i8 = var
 %2:i8 = udivexact %0, %1
 %3:i8 = ctpop %2

diff --git a/test/Tool/more-knownbits16.opt b/test/Tool/more-knownbits16.opt
@@ -3,10 +3,10 @@
 ; RUN: %souper-check %solver -infer-rhs -print-replacement %s > %t1 2>&1
 ; RUN: FileCheck %s < %t1
 
-; CHECK: %0:i8 = var (znp)
+; CHECK: %0:i8 = var (zn2)
 ; CHECK-NEXT: %1:i1 = sle 1:i8, %0
 ; CHECK-NEXT: cand %1 1:i1
 
-%0:i8 = var (nzp)
+%0:i8 = var (nz2)
 %1:i1 = sle 1:i8, %0
 infer %1
diff --git a/test/Tool/more-knownbits17.opt b/test/Tool/more-knownbits17.opt
@@ -3,10 +3,10 @@
 ; RUN: %souper-check %solver -infer-rhs -print-replacement %s > %t1 2>&1
 ; RUN: FileCheck %s < %t1
 
-; CHECK: %0:i16 = var (np)
+; CHECK: %0:i16 = var (n2)
 ; CHECK-NEXT: %1:i1 = slt 0:i16, %0
 ; CHECK-NEXT: cand %1 1:i1
 
-%0:i16 = var (np)
+%0:i16 = var (n2)
 %1:i1 = slt 0:i16, %0
 infer %1
diff --git a/test/Tool/more-knownbits5.opt b/test/Tool/more-knownbits5.opt
@@ -3,14 +3,14 @@
 ; RUN: %souper-check %solver -infer-rhs -print-replacement %s > %t 2>&1
 ; RUN: FileCheck %s < %t
 
-; CHECK: %0:i16 = var (p)
+; CHECK: %0:i16 = var (2)
 ; CHECK-NEXT: %1:i16 = var
 ; CHECK-NEXT: %2:i16 = udivexact %0, %1
 ; CHECK-NEXT: %3:i16 = ctpop %2
 ; CHECK-NEXT: %4:i1 = eq 1:i16, %3
 ; CHECK-NEXT: cand %4 1:i1
 
-%0:i16 = var (p)
+%0:i16 = var (2)
 %1:i16 = var
 %2:i16 = udivexact %0, %1
 %3:i16 = ctpop %2

diff --git a/test/Tool/more-knownbits6.opt b/test/Tool/more-knownbits6.opt
@@ -4,7 +4,7 @@
 ; RUN: FileCheck %s < %t
 
 ; CHECK: LGTM
-%0:i64 = var (p)
+%0:i64 = var (2)
 %1:i64 = ctpop %0
 %2:i1 = eq %1, 1:i64
 cand %2 1:i1
diff --git a/test/Tool/more-knownbits7.opt b/test/Tool/more-knownbits7.opt
@@ -4,7 +4,7 @@
 ; RUN: FileCheck %s < %t
 
 ; CHECK: LGTM
-%0:i32 = var (p)
+%0:i32 = var (2)
 %1:i32 = var
 %2:i32 = lshrexact %0, %1
 %3:i32 = ctpop %2

diff --git a/test/Tool/more-knownbits8.opt b/test/Tool/more-knownbits8.opt
@@ -4,7 +4,7 @@
 ; RUN: FileCheck %s < %t
 
 ; CHECK: LGTM
-%0:i64 = var (p)
+%0:i64 = var (2)
 %1:i64 = var
 %2:i64 = and %0, %1
 %3:i1 = eq %2, %0

diff --git a/test/Tool/more-knownbits9.opt b/test/Tool/more-knownbits9.opt
@@ -4,7 +4,7 @@
 ; RUN: FileCheck %s < %t
 
 ; CHECK: LGTM
-%0:i32 = var (p)
+%0:i32 = var (2)
 %1:i32 = add %0, %0
 %2:i32 = udiv %1, 2:i32
 %3:i1 = eq %2, %0

diff --git a/unittests/Parser/ParserTests.cpp b/unittests/Parser/ParserTests.cpp
@@ -79,13 +79,13 @@ TEST(ParserTest, Errors) {
       { "%0:i4 = var (0012)\n",
         "<input>:1:17: invalid knownbits string" },
       { "%0:i4 = var (2345)\n",
-        "<input>:1:14: invalid, expected [0|1|x]+ or [n|z|p]" },
+        "<input>:1:15: invalid more knownbits string" },
       { "%0:i4 = var (01xa)\n",
         "<input>:1:17: invalid knownbits string" },
       { "%0:i4 = var (xxx)\n",
         "<input>:1:1: knownbits pattern must be of same length as var width" },
       { "%0:i4 = var ()\n",
-        "<input>:1:14: invalid, expected [0|1|x]+ or [n|z|p]" },
+        "<input>:1:14: invalid, expected [0|1|x]+ or [n|z|2]" },
       { "%0:i4 = var (10x0\n",
         "<input>:1:18: invalid knownbits string" },
       { "%0:i4 = var (10\nx0)\n",
@@ -104,12 +104,12 @@ TEST(ParserTest, Errors) {
       { "%0:i4 = var (0011 (zn)\n",
         "<input>:1:18: invalid knownbits string" },
       { "%0:i4 = var (a)\n",
-        "<input>:1:14: invalid, expected [0|1|x]+ or [n|z|p]" },
-      { "%0:i4 = var (znp\n",
+        "<input>:1:14: invalid, expected [0|1|x]+ or [n|z|2]" },
+      { "%0:i4 = var (zn2\n",
         "<input>:1:17: invalid more knownbits string" },
-      { "%0:i8 = var (znpp)\n",
-        "<input>:1:1: repeated 'p' flag" },
-      { "%0:i8 = var (px)\n",
+      { "%0:i8 = var (zn22)\n",
+        "<input>:1:1: repeated '2' flag" },
+      { "%0:i8 = var (2x)\n",
         "<input>:1:15: invalid more knownbits string" },
 
       // type checking