From: Yonghong Song <yhs@fb.com>
Date: Sat, 9 Sep 2017 00:11:13 +0000 (+0000)
Subject: bpf: fix test failures due to previous bpf change of assembly code syntax
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=982a89e06c49835278460a0e7d7960c7e39e9283;p=llvm

bpf: fix test failures due to previous bpf change of assembly code syntax

Signed-off-by: Yonghong Song <yhs@fb.com>

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@312840 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/test/CodeGen/BPF/intrinsics.ll b/test/CodeGen/BPF/intrinsics.ll
index 88aba805ada..18d14a08fd9 100644
--- a/test/CodeGen/BPF/intrinsics.ll
+++ b/test/CodeGen/BPF/intrinsics.ll
@@ -55,7 +55,7 @@ entry:
   tail call void inttoptr (i64 4 to void (i64, i32)*)(i64 %call, i32 4) #2
   ret i32 0
 ; CHECK-LABEL: ld_pseudo:
-; CHECK: ld_pseudo r1, 2, 3 # encoding: [0x18,0x21,0x00,0x00,0x03,0x00
+; CHECK: ld_pseudo r1, 2, 3ll # encoding: [0x18,0x21,0x00,0x00,0x03,0x00
 }
 
 declare i64 @llvm.bpf.pseudo(i64, i64) #2
diff --git a/test/CodeGen/BPF/rodata_1.ll b/test/CodeGen/BPF/rodata_1.ll
index 5566f76bb75..9aa9e8c5780 100644
--- a/test/CodeGen/BPF/rodata_1.ll
+++ b/test/CodeGen/BPF/rodata_1.ll
@@ -35,12 +35,12 @@ define i32 @test() local_unnamed_addr #0 {
 entry:
     tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* getelementptr inbounds (%struct.test_t1, %struct.test_t1* @g1, i64 0, i32 0), i8* getelementptr inbounds (%struct.test_t1, %struct.test_t1* @test.t1, i64 0, i32 0), i64 3, i32 1, i1 false)
     tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* bitcast (%struct.test_t2* @g2 to i8*), i8* bitcast (%struct.test_t2* @test.t2 to i8*), i64 20, i32 4, i1 false)
-; CHECK:  r1 = <MCOperand Expr:(g1)>ll
+; CHECK:  r1 = g1
 ; CHECK:  r2 = 0
 ; CHECK:  *(u8 *)(r1 + 1) = r2
 ; CHECK:  r3 = 1
 ; CHECK:  *(u8 *)(r1 + 2) = r3
-; CHECK:  r1 = <MCOperand Expr:(g2)>ll
+; CHECK:  r1 = g2
 ; CHECK:  *(u32 *)(r1 + 8) = r3
     ret i32 0
 }
diff --git a/test/CodeGen/BPF/rodata_2.ll b/test/CodeGen/BPF/rodata_2.ll
index 74b3c3640c3..86b80118bc1 100644
--- a/test/CodeGen/BPF/rodata_2.ll
+++ b/test/CodeGen/BPF/rodata_2.ll
@@ -32,7 +32,7 @@ define i32 @test() local_unnamed_addr #0 {
 
 entry:
     tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* getelementptr inbounds (%struct.test_t2, %struct.test_t2* @g, i64 0, i32 0), i8* getelementptr inbounds (%struct.test_t2, %struct.test_t2* @test.t2, i64 0, i32 0), i64 32, i32 4, i1 false)
-; CHECK:  r1 = <MCOperand Expr:(g)>ll
+; CHECK:  r1 = g
 ; CHECK:  r2 = 0
 ; CHECK:  *(u32 *)(r1 + 28) = r2
 ; CHECK:  r3 = 3
diff --git a/test/CodeGen/BPF/select_ri.ll b/test/CodeGen/BPF/select_ri.ll
index c4ac376502b..b802b64b728 100644
--- a/test/CodeGen/BPF/select_ri.ll
+++ b/test/CodeGen/BPF/select_ri.ll
@@ -18,7 +18,7 @@ entry:
   %tobool = icmp eq i32 %0, 0
   %1 = load i32, i32* @c, align 4
   %. = select i1 %tobool, i32 0, i32 %1
-; CHECK:  r1 = <MCOperand Expr:(b)>ll
+; CHECK:  r1 = b
 ; CHECK:  r1 = *(u32 *)(r1 + 0)
 ; CHECK:  if r1 == 0 goto
   ret i32 %.
diff --git a/test/CodeGen/BPF/undef.ll b/test/CodeGen/BPF/undef.ll
index fa816546421..6b9948619d8 100644
--- a/test/CodeGen/BPF/undef.ll
+++ b/test/CodeGen/BPF/undef.ll
@@ -40,7 +40,7 @@ define i32 @ebpf_filter(%struct.__sk_buff* nocapture readnone %ebpf_packet) #0 s
 
 ; CHECK: r2 = r10
 ; CHECK: r2 += -8
-; CHECK: r1 = <MCOperand Expr:(routing)>ll
+; CHECK: r1 = routing
 ; CHECK: call bpf_map_lookup_elem
 ; CHECK: exit
   %key = alloca %struct.routing_key_2, align 1