From 6807778e52e04386ae1b546242f9cc2036e75989 Mon Sep 17 00:00:00 2001 From: Yonghong Song Date: Sat, 9 Sep 2017 00:11:13 +0000 Subject: [PATCH] bpf: fix test failures due to previous bpf change of assembly code syntax Signed-off-by: Yonghong Song llvm-svn: 312840 --- llvm/test/CodeGen/BPF/intrinsics.ll | 2 +- llvm/test/CodeGen/BPF/rodata_1.ll | 4 ++-- llvm/test/CodeGen/BPF/rodata_2.ll | 2 +- llvm/test/CodeGen/BPF/select_ri.ll | 2 +- llvm/test/CodeGen/BPF/undef.ll | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/llvm/test/CodeGen/BPF/intrinsics.ll b/llvm/test/CodeGen/BPF/intrinsics.ll index 88aba805adad..18d14a08fd9a 100644 --- a/llvm/test/CodeGen/BPF/intrinsics.ll +++ b/llvm/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/llvm/test/CodeGen/BPF/rodata_1.ll b/llvm/test/CodeGen/BPF/rodata_1.ll index 5566f76bb75c..9aa9e8c57805 100644 --- a/llvm/test/CodeGen/BPF/rodata_1.ll +++ b/llvm/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 = ll +; CHECK: r1 = g1 ; CHECK: r2 = 0 ; CHECK: *(u8 *)(r1 + 1) = r2 ; CHECK: r3 = 1 ; CHECK: *(u8 *)(r1 + 2) = r3 -; CHECK: r1 = ll +; CHECK: r1 = g2 ; CHECK: *(u32 *)(r1 + 8) = r3 ret i32 0 } diff --git a/llvm/test/CodeGen/BPF/rodata_2.ll b/llvm/test/CodeGen/BPF/rodata_2.ll index 74b3c3640c3f..86b80118bc13 100644 --- a/llvm/test/CodeGen/BPF/rodata_2.ll +++ b/llvm/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 = ll +; CHECK: r1 = g ; CHECK: r2 = 0 ; CHECK: *(u32 *)(r1 + 28) = r2 ; CHECK: r3 = 3 diff --git a/llvm/test/CodeGen/BPF/select_ri.ll b/llvm/test/CodeGen/BPF/select_ri.ll index c4ac376502b8..b802b64b7281 100644 --- a/llvm/test/CodeGen/BPF/select_ri.ll +++ b/llvm/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 = ll +; CHECK: r1 = b ; CHECK: r1 = *(u32 *)(r1 + 0) ; CHECK: if r1 == 0 goto ret i32 %. diff --git a/llvm/test/CodeGen/BPF/undef.ll b/llvm/test/CodeGen/BPF/undef.ll index fa8165464215..6b9948619d86 100644 --- a/llvm/test/CodeGen/BPF/undef.ll +++ b/llvm/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 = ll +; CHECK: r1 = routing ; CHECK: call bpf_map_lookup_elem ; CHECK: exit %key = alloca %struct.routing_key_2, align 1