diff --git a/llvm/test/Analysis/IRSimilarityIdentifier/basic.ll b/llvm/test/Analysis/IRSimilarityIdentifier/basic.ll
index ff934f1745f47..79ae402e9f9f5 100644
--- a/llvm/test/Analysis/IRSimilarityIdentifier/basic.ll
+++ b/llvm/test/Analysis/IRSimilarityIdentifier/basic.ll
@@ -6,69 +6,69 @@
 
 ; CHECK: 4 candidates of length 2.  Found in:
 ; CHECK-NEXT:  Function: turtle, Basic Block: (unnamed)
-; CHECK-NEXT:    Start Instruction:   store i32 5, i32* %5, align 4
-; CHECK-NEXT:      End Instruction:   store i32 6, i32* %6, align 4
+; CHECK-NEXT:    Start Instruction:   store i32 5, ptr %5, align 4
+; CHECK-NEXT:      End Instruction:   store i32 6, ptr %6, align 4
 ; CHECK-NEXT:  Function: cat, Basic Block: entry
-; CHECK-NEXT:    Start Instruction:   store i32 4, i32* %4, align 4
-; CHECK-NEXT:      End Instruction:   store i32 5, i32* %5, align 4
+; CHECK-NEXT:    Start Instruction:   store i32 4, ptr %4, align 4
+; CHECK-NEXT:      End Instruction:   store i32 5, ptr %5, align 4
 ; CHECK-NEXT:  Function: fish, Basic Block: entry
-; CHECK-NEXT:    Start Instruction:   store i32 4, i32* %4, align 4
-; CHECK-NEXT:      End Instruction:   store i32 5, i32* %5, align 4
+; CHECK-NEXT:    Start Instruction:   store i32 4, ptr %4, align 4
+; CHECK-NEXT:      End Instruction:   store i32 5, ptr %5, align 4
 ; CHECK-NEXT:  Function: dog, Basic Block: entry
-; CHECK-NEXT:    Start Instruction:   store i32 4, i32* %4, align 4
-; CHECK-NEXT:      End Instruction:   store i32 5, i32* %5, align 4
+; CHECK-NEXT:    Start Instruction:   store i32 4, ptr %4, align 4
+; CHECK-NEXT:      End Instruction:   store i32 5, ptr %5, align 4
 ; CHECK-NEXT:4 candidates of length 3.  Found in:
 ; CHECK-NEXT:  Function: turtle, Basic Block: (unnamed)
-; CHECK-NEXT:    Start Instruction:   store i32 4, i32* %4, align 4
-; CHECK-NEXT:      End Instruction:   store i32 6, i32* %6, align 4
+; CHECK-NEXT:    Start Instruction:   store i32 4, ptr %4, align 4
+; CHECK-NEXT:      End Instruction:   store i32 6, ptr %6, align 4
 ; CHECK-NEXT:  Function: cat, Basic Block: entry
-; CHECK-NEXT:    Start Instruction:   store i32 3, i32* %3, align 4
-; CHECK-NEXT:      End Instruction:   store i32 5, i32* %5, align 4
+; CHECK-NEXT:    Start Instruction:   store i32 3, ptr %3, align 4
+; CHECK-NEXT:      End Instruction:   store i32 5, ptr %5, align 4
 ; CHECK-NEXT:  Function: fish, Basic Block: entry
-; CHECK-NEXT:    Start Instruction:   store i32 3, i32* %3, align 4
-; CHECK-NEXT:      End Instruction:   store i32 5, i32* %5, align 4
+; CHECK-NEXT:    Start Instruction:   store i32 3, ptr %3, align 4
+; CHECK-NEXT:      End Instruction:   store i32 5, ptr %5, align 4
 ; CHECK-NEXT:  Function: dog, Basic Block: entry
-; CHECK-NEXT:    Start Instruction:   store i32 3, i32* %3, align 4
-; CHECK-NEXT:      End Instruction:   store i32 5, i32* %5, align 4
+; CHECK-NEXT:    Start Instruction:   store i32 3, ptr %3, align 4
+; CHECK-NEXT:      End Instruction:   store i32 5, ptr %5, align 4
 ; CHECK-NEXT:4 candidates of length 4.  Found in:
 ; CHECK-NEXT:  Function: turtle, Basic Block: (unnamed)
-; CHECK-NEXT:    Start Instruction:   store i32 3, i32* %3, align 4
-; CHECK-NEXT:      End Instruction:   store i32 6, i32* %6, align 4
+; CHECK-NEXT:    Start Instruction:   store i32 3, ptr %3, align 4
+; CHECK-NEXT:      End Instruction:   store i32 6, ptr %6, align 4
 ; CHECK-NEXT:  Function: cat, Basic Block: entry
-; CHECK-NEXT:    Start Instruction:   store i32 2, i32* %2, align 4
-; CHECK-NEXT:      End Instruction:   store i32 5, i32* %5, align 4
+; CHECK-NEXT:    Start Instruction:   store i32 2, ptr %2, align 4
+; CHECK-NEXT:      End Instruction:   store i32 5, ptr %5, align 4
 ; CHECK-NEXT:  Function: fish, Basic Block: entry
-; CHECK-NEXT:    Start Instruction:   store i32 2, i32* %2, align 4
-; CHECK-NEXT:      End Instruction:   store i32 5, i32* %5, align 4
+; CHECK-NEXT:    Start Instruction:   store i32 2, ptr %2, align 4
+; CHECK-NEXT:      End Instruction:   store i32 5, ptr %5, align 4
 ; CHECK-NEXT:  Function: dog, Basic Block: entry
-; CHECK-NEXT:    Start Instruction:   store i32 2, i32* %2, align 4
-; CHECK-NEXT:      End Instruction:   store i32 5, i32* %5, align 4
+; CHECK-NEXT:    Start Instruction:   store i32 2, ptr %2, align 4
+; CHECK-NEXT:      End Instruction:   store i32 5, ptr %5, align 4
 ; CHECK-NEXT:4 candidates of length 5.  Found in:
 ; CHECK-NEXT:  Function: turtle, Basic Block: (unnamed)
-; CHECK-NEXT:    Start Instruction:   store i32 2, i32* %2, align 4
-; CHECK-NEXT:      End Instruction:   store i32 6, i32* %6, align 4
+; CHECK-NEXT:    Start Instruction:   store i32 2, ptr %2, align 4
+; CHECK-NEXT:      End Instruction:   store i32 6, ptr %6, align 4
 ; CHECK-NEXT:  Function: cat, Basic Block: entry
-; CHECK-NEXT:    Start Instruction:   store i32 1, i32* %1, align 4
-; CHECK-NEXT:      End Instruction:   store i32 5, i32* %5, align 4
+; CHECK-NEXT:    Start Instruction:   store i32 1, ptr %1, align 4
+; CHECK-NEXT:      End Instruction:   store i32 5, ptr %5, align 4
 ; CHECK-NEXT:  Function: fish, Basic Block: entry
-; CHECK-NEXT:    Start Instruction:   store i32 1, i32* %1, align 4
-; CHECK-NEXT:      End Instruction:   store i32 5, i32* %5, align 4
+; CHECK-NEXT:    Start Instruction:   store i32 1, ptr %1, align 4
+; CHECK-NEXT:      End Instruction:   store i32 5, ptr %5, align 4
 ; CHECK-NEXT:  Function: dog, Basic Block: entry
-; CHECK-NEXT:    Start Instruction:   store i32 1, i32* %1, align 4
-; CHECK-NEXT:      End Instruction:   store i32 5, i32* %5, align 4
+; CHECK-NEXT:    Start Instruction:   store i32 1, ptr %1, align 4
+; CHECK-NEXT:      End Instruction:   store i32 5, ptr %5, align 4
 ; CHECK-NEXT:4 candidates of length 6.  Found in:
 ; CHECK-NEXT:  Function: turtle, Basic Block: (unnamed)
-; CHECK-NEXT:    Start Instruction:   store i32 1, i32* %1, align 4
-; CHECK-NEXT:      End Instruction:   store i32 6, i32* %6, align 4
+; CHECK-NEXT:    Start Instruction:   store i32 1, ptr %1, align 4
+; CHECK-NEXT:      End Instruction:   store i32 6, ptr %6, align 4
 ; CHECK-NEXT:  Function: cat, Basic Block: entry
-; CHECK-NEXT:    Start Instruction:   store i32 6, i32* %0, align 4
-; CHECK-NEXT:      End Instruction:   store i32 5, i32* %5, align 4
+; CHECK-NEXT:    Start Instruction:   store i32 6, ptr %0, align 4
+; CHECK-NEXT:      End Instruction:   store i32 5, ptr %5, align 4
 ; CHECK-NEXT:  Function: fish, Basic Block: entry
-; CHECK-NEXT:    Start Instruction:   store i32 6, i32* %0, align 4
-; CHECK-NEXT:      End Instruction:   store i32 5, i32* %5, align 4
+; CHECK-NEXT:    Start Instruction:   store i32 6, ptr %0, align 4
+; CHECK-NEXT:      End Instruction:   store i32 5, ptr %5, align 4
 ; CHECK-NEXT:  Function: dog, Basic Block: entry
-; CHECK-NEXT:    Start Instruction:   store i32 6, i32* %0, align 4
-; CHECK-NEXT:      End Instruction:   store i32 5, i32* %5, align 4
+; CHECK-NEXT:    Start Instruction:   store i32 6, ptr %0, align 4
+; CHECK-NEXT:      End Instruction:   store i32 5, ptr %5, align 4
 
 define linkonce_odr void @fish() {
 entry:
@@ -78,12 +78,12 @@ entry:
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   %5 = alloca i32, align 4
-  store i32 6, i32* %0, align 4
-  store i32 1, i32* %1, align 4
-  store i32 2, i32* %2, align 4
-  store i32 3, i32* %3, align 4
-  store i32 4, i32* %4, align 4
-  store i32 5, i32* %5, align 4
+  store i32 6, ptr %0, align 4
+  store i32 1, ptr %1, align 4
+  store i32 2, ptr %2, align 4
+  store i32 3, ptr %3, align 4
+  store i32 4, ptr %4, align 4
+  store i32 5, ptr %5, align 4
   ret void
 }
 
@@ -94,12 +94,12 @@ define void @turtle() {
   %4 = alloca i32, align 4
   %5 = alloca i32, align 4
   %6 = alloca i32, align 4
-  store i32 1, i32* %1, align 4
-  store i32 2, i32* %2, align 4
-  store i32 3, i32* %3, align 4
-  store i32 4, i32* %4, align 4
-  store i32 5, i32* %5, align 4
-  store i32 6, i32* %6, align 4
+  store i32 1, ptr %1, align 4
+  store i32 2, ptr %2, align 4
+  store i32 3, ptr %3, align 4
+  store i32 4, ptr %4, align 4
+  store i32 5, ptr %5, align 4
+  store i32 6, ptr %6, align 4
   ret void
 }
 
@@ -111,12 +111,12 @@ entry:
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   %5 = alloca i32, align 4
-  store i32 6, i32* %0, align 4
-  store i32 1, i32* %1, align 4
-  store i32 2, i32* %2, align 4
-  store i32 3, i32* %3, align 4
-  store i32 4, i32* %4, align 4
-  store i32 5, i32* %5, align 4
+  store i32 6, ptr %0, align 4
+  store i32 1, ptr %1, align 4
+  store i32 2, ptr %2, align 4
+  store i32 3, ptr %3, align 4
+  store i32 4, ptr %4, align 4
+  store i32 5, ptr %5, align 4
   ret void
 }
 
@@ -128,11 +128,11 @@ entry:
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   %5 = alloca i32, align 4
-  store i32 6, i32* %0, align 4
-  store i32 1, i32* %1, align 4
-  store i32 2, i32* %2, align 4
-  store i32 3, i32* %3, align 4
-  store i32 4, i32* %4, align 4
-  store i32 5, i32* %5, align 4
+  store i32 6, ptr %0, align 4
+  store i32 1, ptr %1, align 4
+  store i32 2, ptr %2, align 4
+  store i32 3, ptr %3, align 4
+  store i32 4, ptr %4, align 4
+  store i32 5, ptr %5, align 4
   ret void
 }
diff --git a/llvm/test/Analysis/IRSimilarityIdentifier/different.ll b/llvm/test/Analysis/IRSimilarityIdentifier/different.ll
index 6ee49b206bf47..701af7e21b32e 100644
--- a/llvm/test/Analysis/IRSimilarityIdentifier/different.ll
+++ b/llvm/test/Analysis/IRSimilarityIdentifier/different.ll
@@ -7,18 +7,18 @@
 
 ; CHECK: 2 candidates of length 3.  Found in:
 ; CHECK-NEXT:   Function: turtle, Basic Block: (unnamed)
-; CHECK-NEXT:     Start Instruction:   %b = load i32, i32* %1, align 4
-; CHECK-NEXT:       End Instruction:   %d = load i32, i32* %3, align 4
+; CHECK-NEXT:     Start Instruction:   %b = load i32, ptr %1, align 4
+; CHECK-NEXT:       End Instruction:   %d = load i32, ptr %3, align 4
 ; CHECK-NEXT:   Function: turtle, Basic Block: (unnamed)
-; CHECK-NEXT:     Start Instruction:   %a = load i32, i32* %0, align 4
-; CHECK-NEXT:       End Instruction:   %c = load i32, i32* %2, align 4
+; CHECK-NEXT:     Start Instruction:   %a = load i32, ptr %0, align 4
+; CHECK-NEXT:       End Instruction:   %c = load i32, ptr %2, align 4
 ; CHECK-NEXT: 2 candidates of length 5.  Found in:
 ; CHECK-NEXT:   Function: fish, Basic Block: entry
-; CHECK-NEXT:     Start Instruction:   store i32 6, i32* %0, align 4
-; CHECK-NEXT:       End Instruction:   store i32 4, i32* %4, align 4
+; CHECK-NEXT:     Start Instruction:   store i32 6, ptr %0, align 4
+; CHECK-NEXT:       End Instruction:   store i32 4, ptr %4, align 4
 ; CHECK-NEXT:   Function: fish, Basic Block: entry
-; CHECK-NEXT:     Start Instruction:   store i32 1, i32* %1, align 4
-; CHECK-NEXT:       End Instruction:   store i32 5, i32* %5, align 4
+; CHECK-NEXT:     Start Instruction:   store i32 1, ptr %1, align 4
+; CHECK-NEXT:       End Instruction:   store i32 5, ptr %5, align 4
 
 define linkonce_odr void @fish() {
 entry:
@@ -28,19 +28,19 @@ entry:
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   %5 = alloca i32, align 4
-  store i32 6, i32* %0, align 4
-  store i32 1, i32* %1, align 4
-  store i32 2, i32* %2, align 4
-  store i32 3, i32* %3, align 4
-  store i32 4, i32* %4, align 4
-  store i32 5, i32* %5, align 4
+  store i32 6, ptr %0, align 4
+  store i32 1, ptr %1, align 4
+  store i32 2, ptr %2, align 4
+  store i32 3, ptr %3, align 4
+  store i32 4, ptr %4, align 4
+  store i32 5, ptr %5, align 4
   ret void
 }
 
-define void @turtle(i32* %0, i32* %1, i32* %2, i32* %3) {
-  %a = load i32, i32* %0
-  %b = load i32, i32* %1
-  %c = load i32, i32* %2
-  %d = load i32, i32* %3
+define void @turtle(ptr %0, ptr %1, ptr %2, ptr %3) {
+  %a = load i32, ptr %0
+  %b = load i32, ptr %1
+  %c = load i32, ptr %2
+  %d = load i32, ptr %3
   ret void
 }