[llvm] r321527 - Fix tests after move to utohexstr.

Benjamin Kramer via llvm-commits llvm-commits at lists.llvm.org
Thu Dec 28 09:00:38 PST 2017


Author: d0k
Date: Thu Dec 28 09:00:37 2017
New Revision: 321527

URL: http://llvm.org/viewvc/llvm-project?rev=321527&view=rev
Log:
Fix tests after move to utohexstr.

Modified:
    llvm/trunk/test/Analysis/DemandedBits/basic.ll
    llvm/trunk/test/Analysis/DemandedBits/intrinsics.ll
    llvm/trunk/test/CodeGen/X86/branch_instruction_and_target_split_perf_nops.mir
    llvm/trunk/test/MC/ARM/branch-disassemble.s
    llvm/trunk/test/tools/llvm-cov/cov-comdat.test
    llvm/trunk/test/tools/llvm-objdump/X86/hex-displacement.test
    llvm/trunk/tools/llvm-readobj/COFFDumper.cpp

Modified: llvm/trunk/test/Analysis/DemandedBits/basic.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/DemandedBits/basic.ll?rev=321527&r1=321526&r2=321527&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/DemandedBits/basic.ll (original)
+++ llvm/trunk/test/Analysis/DemandedBits/basic.ll Thu Dec 28 09:00:37 2017
@@ -1,9 +1,9 @@
 ; RUN: opt -S -demanded-bits -analyze < %s | FileCheck %s
 ; RUN: opt -S -disable-output -passes="print<demanded-bits>" < %s 2>&1 | FileCheck %s
  
-; CHECK-DAG: DemandedBits: 0xFF for   %1 = add nsw i32 %a, 5
-; CHECK-DAG: DemandedBits: 0xFF for   %3 = trunc i32 %2 to i8
-; CHECK-DAG: DemandedBits: 0xFF for   %2 = mul nsw i32 %1, %b
+; CHECK-DAG: DemandedBits: 0xff for   %1 = add nsw i32 %a, 5
+; CHECK-DAG: DemandedBits: 0xff for   %3 = trunc i32 %2 to i8
+; CHECK-DAG: DemandedBits: 0xff for   %2 = mul nsw i32 %1, %b
 define i8 @test_mul(i32 %a, i32 %b) {
   %1 = add nsw i32 %a, 5
   %2 = mul nsw i32 %1, %b

Modified: llvm/trunk/test/Analysis/DemandedBits/intrinsics.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/DemandedBits/intrinsics.ll?rev=321527&r1=321526&r2=321527&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/DemandedBits/intrinsics.ll (original)
+++ llvm/trunk/test/Analysis/DemandedBits/intrinsics.ll Thu Dec 28 09:00:37 2017
@@ -1,9 +1,9 @@
 ; RUN: opt -S -demanded-bits -analyze < %s | FileCheck %s
 ; RUN: opt -S -disable-output -passes="print<demanded-bits>" < %s 2>&1 | FileCheck %s
 
-; CHECK-DAG: DemandedBits: 0xFF000000 for   %1 = or i32 %x, 1
-; CHECK-DAG: DemandedBits: 0xFF for   %2 = call i32 @llvm.bitreverse.i32(i32 %1)
-; CHECK-DAG: DemandedBits: 0xFF for   %3 = trunc i32 %2 to i8
+; CHECK-DAG: DemandedBits: 0xff000000 for   %1 = or i32 %x, 1
+; CHECK-DAG: DemandedBits: 0xff for   %2 = call i32 @llvm.bitreverse.i32(i32 %1)
+; CHECK-DAG: DemandedBits: 0xff for   %3 = trunc i32 %2 to i8
 define i8 @test_bswap(i32 %x) {
   %1 = or i32 %x, 1
   %2 = call i32 @llvm.bswap.i32(i32 %1)
@@ -12,9 +12,9 @@ define i8 @test_bswap(i32 %x) {
 }
 declare i32 @llvm.bswap.i32(i32)
 
-; CHECK-DAG: DemandedBits: 0xFF000000 for   %1 = or i32 %x, 1
-; CHECK-DAG: DemandedBits: 0xFF for   %2 = call i32 @llvm.bswap.i32(i32 %1)
-; CHECK-DAG: DemandedBits: 0xFF for   %3 = trunc i32 %2 to i8
+; CHECK-DAG: DemandedBits: 0xff000000 for   %1 = or i32 %x, 1
+; CHECK-DAG: DemandedBits: 0xff for   %2 = call i32 @llvm.bswap.i32(i32 %1)
+; CHECK-DAG: DemandedBits: 0xff for   %3 = trunc i32 %2 to i8
 define i8 @test_bitreverse(i32 %x) {
   %1 = or i32 %x, 1
   %2 = call i32 @llvm.bitreverse.i32(i32 %1)

Modified: llvm/trunk/test/CodeGen/X86/branch_instruction_and_target_split_perf_nops.mir
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/branch_instruction_and_target_split_perf_nops.mir?rev=321527&r1=321526&r2=321527&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/branch_instruction_and_target_split_perf_nops.mir (original)
+++ llvm/trunk/test/CodeGen/X86/branch_instruction_and_target_split_perf_nops.mir Thu Dec 28 09:00:37 2017
@@ -57,7 +57,7 @@
 # 	return w;
 # }
 #
-# CHECK:       129:       eb 13   jmp     19 <ifElse+0x7E>
+# CHECK:       129:       eb 13   jmp     19 <ifElse+0x7e>
 # CHECK:       12e:       eb a0   jmp     -96 <ifElse+0x10>
 # CHECK:       132:       eb 9c   jmp     -100 <ifElse+0x10>
 # CHECK:       137:       eb 97   jmp     -105 <ifElse+0x10>

Modified: llvm/trunk/test/MC/ARM/branch-disassemble.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/branch-disassemble.s?rev=321527&r1=321526&r2=321527&view=diff
==============================================================================
--- llvm/trunk/test/MC/ARM/branch-disassemble.s (original)
+++ llvm/trunk/test/MC/ARM/branch-disassemble.s Thu Dec 28 09:00:37 2017
@@ -7,8 +7,8 @@
 @ RUN:   | FileCheck %s -check-prefix CHECK-THUMB
 
 b.w .Lbranch
-@ CHECK-ARM: b #4 <$a.0+0xC>
-@ CHECK-THUMB: b.w #8 <$t.0+0xC>
+@ CHECK-ARM: b #4 <$a.0+0xc>
+@ CHECK-THUMB: b.w #8 <$t.0+0xc>
 adds r0, r1, #42
 adds r1, r2, #42
 .Lbranch:

Modified: llvm/trunk/test/tools/llvm-cov/cov-comdat.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/cov-comdat.test?rev=321527&r1=321526&r2=321527&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-cov/cov-comdat.test (original)
+++ llvm/trunk/test/tools/llvm-cov/cov-comdat.test Thu Dec 28 09:00:37 2017
@@ -9,7 +9,7 @@ REQUIRES: shell
 
 // RUN: llvm-cov show %S/Inputs/binary-formats.v1.linux64l -instr-profile %S/Inputs/elf_binary_comdat.profdata -path-equivalence=/tmp,%S/Inputs %S/Inputs/instrprof-comdat.h -dump 2> %t.err | FileCheck --check-prefix=HEADER %S/Inputs/instrprof-comdat.h
 // RUN: FileCheck --check-prefix=ERROR -input-file %t.err %s
-// ERROR: hash-mismatch: No profile record found for 'main' with hash = 0xA
+// ERROR: hash-mismatch: No profile record found for 'main' with hash = 0xa
 
 // RUN: llvm-cov show %S/Inputs/binary-formats.v2.linux64l -instr-profile %S/Inputs/elf_binary_comdat.profdata -path-equivalence=/root/llvm/test/tools,%S/.. %S/Inputs/instrprof-comdat.h | FileCheck --check-prefix=HEADER %S/Inputs/instrprof-comdat.h
 // RUN: llvm-cov show %S/Inputs/binary-formats.v2.linux32l -instr-profile %S/Inputs/elf_binary_comdat.profdata -path-equivalence=/root/llvm/R/../test/tools,%S/.. %S/Inputs/instrprof-comdat.h | FileCheck --check-prefix=HEADER %S/Inputs/instrprof-comdat.h

Modified: llvm/trunk/test/tools/llvm-objdump/X86/hex-displacement.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/X86/hex-displacement.test?rev=321527&r1=321526&r2=321527&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objdump/X86/hex-displacement.test (original)
+++ llvm/trunk/test/tools/llvm-objdump/X86/hex-displacement.test Thu Dec 28 09:00:37 2017
@@ -3,4 +3,4 @@
 
 # RUN: llvm-objdump -d %p/Inputs/hello.exe.macho-i386 | FileCheck %s
 
-# CHECK: 1f47:   e8 00 00 00 00  calll   0 <_main+0xC>
+# CHECK: 1f47:   e8 00 00 00 00  calll   0 <_main+0xc>

Modified: llvm/trunk/tools/llvm-readobj/COFFDumper.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-readobj/COFFDumper.cpp?rev=321527&r1=321526&r2=321527&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-readobj/COFFDumper.cpp (original)
+++ llvm/trunk/tools/llvm-readobj/COFFDumper.cpp Thu Dec 28 09:00:37 2017
@@ -767,7 +767,7 @@ void COFFDumper::printRVATable(uint64_t
   for (uintptr_t I = TableStart; I < TableEnd; I += EntrySize) {
     uint32_t RVA = *reinterpret_cast<const ulittle32_t *>(I);
     raw_ostream &OS = W.startLine();
-    OS << "0x" << Twine::utohexstr(Obj->getImageBase() + RVA);
+    OS << "0x" << W.hex(Obj->getImageBase() + RVA);
     if (PrintExtra)
       PrintExtra(OS, reinterpret_cast<const uint8_t *>(I));
     OS << '\n';




More information about the llvm-commits mailing list