[llvm] r326445 - [WebAssembly] Update pre-generated test files to match latest llc output. NFC.

Nicholas Wilson via llvm-commits llvm-commits at lists.llvm.org
Thu Mar 1 07:55:59 PST 2018


Author: ncw
Date: Thu Mar  1 07:55:59 2018
New Revision: 326445

URL: http://llvm.org/viewvc/llvm-project?rev=326445&view=rev
Log:
[WebAssembly] Update pre-generated test files to match latest llc output. NFC.

The ordering of llc's output was changed in rL326334.

Differential Revision: https://reviews.llvm.org/D43941

Modified:
    llvm/trunk/test/Object/Inputs/trivial-object-test.wasm
    llvm/trunk/test/Object/obj2yaml.test
    llvm/trunk/test/Object/objdump-relocations.test
    llvm/trunk/test/tools/llvm-objdump/Inputs/trivial.obj.wasm
    llvm/trunk/test/tools/llvm-objdump/WebAssembly/symbol-table.test
    llvm/trunk/test/tools/llvm-objdump/wasm.txt
    llvm/trunk/test/tools/llvm-readobj/Inputs/trivial.obj.wasm
    llvm/trunk/test/tools/llvm-readobj/relocations.test
    llvm/trunk/test/tools/llvm-readobj/sections.test
    llvm/trunk/test/tools/llvm-readobj/symbols.test

Modified: llvm/trunk/test/Object/Inputs/trivial-object-test.wasm
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/Inputs/trivial-object-test.wasm?rev=326445&r1=326444&r2=326445&view=diff
==============================================================================
Binary files llvm/trunk/test/Object/Inputs/trivial-object-test.wasm (original) and llvm/trunk/test/Object/Inputs/trivial-object-test.wasm Thu Mar  1 07:55:59 2018 differ

Modified: llvm/trunk/test/Object/obj2yaml.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/obj2yaml.test?rev=326445&r1=326444&r2=326445&view=diff
==============================================================================
--- llvm/trunk/test/Object/obj2yaml.test (original)
+++ llvm/trunk/test/Object/obj2yaml.test Thu Mar  1 07:55:59 2018
@@ -654,20 +654,20 @@ WASM-NEXT:     Name:            linking
 WASM-NEXT:     SymbolTable:
 WASM-NEXT:       - Index:           0
 WASM-NEXT:         Kind:            FUNCTION
-WASM-NEXT:         Name:            puts
-WASM-NEXT:         Flags:           [ UNDEFINED ]
-WASM-NEXT:         Function:        0
+WASM-NEXT:         Name:            main
+WASM-NEXT:         Flags:           [  ]
+WASM-NEXT:         Function:        2
 WASM-NEXT:       - Index:           1
-WASM:              Name:            SomeOtherFunction
-WASM:            - Index:           2
-WASM:              Name:            main
-WASM:            - Index:           3
 WASM-NEXT:         Kind:            DATA
 WASM-NEXT:         Name:            .L.str
 WASM-NEXT:         Flags:           [ BINDING_LOCAL ]
 WASM-NEXT:         Segment:         0
-WASM-NEXT:         Size:        13
-WASM-NEXT:       - Index:           4
+WASM-NEXT:         Size:            13
+WASM-NEXT:       - Index:           2
+WASM:              Name:            puts
+WASM:            - Index:           3
+WASM:              Name:            SomeOtherFunction
+WASM:            - Index:           4
 WASM:              Name:            var
 WASM:          SegmentInfo:
 WASM-NEXT:       - Index:           0

Modified: llvm/trunk/test/Object/objdump-relocations.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/objdump-relocations.test?rev=326445&r1=326444&r2=326445&view=diff
==============================================================================
--- llvm/trunk/test/Object/objdump-relocations.test (original)
+++ llvm/trunk/test/Object/objdump-relocations.test Thu Mar  1 07:55:59 2018
@@ -60,9 +60,9 @@ ELF-MIPSEL: R_MIPS_CALL16 puts
 ELF-MIPSEL: R_MIPS_CALL16 SomeOtherFunction
 
 WASM:      CODE
-WASM-NEXT: R_WEBASSEMBLY_MEMORY_ADDR_SLEB 3+0
-WASM-NEXT: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 0+0
-WASM-NEXT: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 1+0
+WASM-NEXT: R_WEBASSEMBLY_MEMORY_ADDR_SLEB 1+0
+WASM-NEXT: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 2+0
+WASM-NEXT: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 3+0
 
 ELF-complex-x86-64: .text
 ELF-complex-x86-64-NEXT: R_X86_64_8 .data-4

Modified: llvm/trunk/test/tools/llvm-objdump/Inputs/trivial.obj.wasm
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/Inputs/trivial.obj.wasm?rev=326445&r1=326444&r2=326445&view=diff
==============================================================================
Binary files llvm/trunk/test/tools/llvm-objdump/Inputs/trivial.obj.wasm (original) and llvm/trunk/test/tools/llvm-objdump/Inputs/trivial.obj.wasm Thu Mar  1 07:55:59 2018 differ

Modified: llvm/trunk/test/tools/llvm-objdump/WebAssembly/symbol-table.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/WebAssembly/symbol-table.test?rev=326445&r1=326444&r2=326445&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objdump/WebAssembly/symbol-table.test (original)
+++ llvm/trunk/test/tools/llvm-objdump/WebAssembly/symbol-table.test Thu Mar  1 07:55:59 2018
@@ -1,8 +1,8 @@
 RUN: llvm-objdump -t %p/../Inputs/trivial.obj.wasm | FileCheck %s
 
 CHECK:      SYMBOL TABLE:
-CHECK-NEXT: 00000000 g     F *UND*	puts
-CHECK-NEXT: 00000000 g     F *UND*	SomeOtherFunction
 CHECK-NEXT: 00000002 g     F CODE	main
 CHECK-NEXT: 00000000 l       DATA	.L.str
+CHECK-NEXT: 00000000 g     F *UND*	puts
+CHECK-NEXT: 00000000 g     F *UND*	SomeOtherFunction
 CHECK-NEXT: 00000010 g       DATA	var

Modified: llvm/trunk/test/tools/llvm-objdump/wasm.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/wasm.txt?rev=326445&r1=326444&r2=326445&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objdump/wasm.txt (original)
+++ llvm/trunk/test/tools/llvm-objdump/wasm.txt Thu Mar  1 07:55:59 2018
@@ -8,7 +8,7 @@
 # CHECK-NEXT:  3 CODE          00000019 0000000000000000 TEXT
 # CHECK-NEXT:  4 DATA          0000001c 0000000000000000 DATA
 # CHECK-NEXT:  5 reloc.CODE    00000017 0000000000000000
-# CHECK-NEXT:  6 linking       0000005c 0000000000000000
+# CHECK-NEXT:  6 linking       00000055 0000000000000000
 
 # RUN: llvm-objdump -p %p/Inputs/trivial.obj.wasm | FileCheck %s -check-prefix CHECK-HEADER
 

Modified: llvm/trunk/test/tools/llvm-readobj/Inputs/trivial.obj.wasm
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/Inputs/trivial.obj.wasm?rev=326445&r1=326444&r2=326445&view=diff
==============================================================================
Binary files llvm/trunk/test/tools/llvm-readobj/Inputs/trivial.obj.wasm (original) and llvm/trunk/test/tools/llvm-readobj/Inputs/trivial.obj.wasm Thu Mar  1 07:55:59 2018 differ

Modified: llvm/trunk/test/tools/llvm-readobj/relocations.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/relocations.test?rev=326445&r1=326444&r2=326445&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/relocations.test (original)
+++ llvm/trunk/test/tools/llvm-readobj/relocations.test Thu Mar  1 07:55:59 2018
@@ -291,18 +291,18 @@ WASM-NEXT:   Section (4) CODE {
 WASM-NEXT:     Relocation {
 WASM-NEXT:       Type: R_WEBASSEMBLY_MEMORY_ADDR_SLEB (4)
 WASM-NEXT:       Offset: 0x4
-WASM-NEXT:       Index: 0x3
+WASM-NEXT:       Index: 0x1
 WASM-NEXT:       Addend: 0
 WASM-NEXT:     }
 WASM-NEXT:     Relocation {
 WASM-NEXT:       Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB (0)
 WASM-NEXT:       Offset: 0xA
-WASM-NEXT:       Index: 0x0
+WASM-NEXT:       Index: 0x2
 WASM-NEXT:     }
 WASM-NEXT:     Relocation {
 WASM-NEXT:       Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB (0)
 WASM-NEXT:       Offset: 0x11
-WASM-NEXT:       Index: 0x1
+WASM-NEXT:       Index: 0x3
 WASM-NEXT:     }
 WASM-NEXT:   }
 WASM-NEXT: ]

Modified: llvm/trunk/test/tools/llvm-readobj/sections.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/sections.test?rev=326445&r1=326444&r2=326445&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/sections.test (original)
+++ llvm/trunk/test/tools/llvm-readobj/sections.test Thu Mar  1 07:55:59 2018
@@ -534,7 +534,7 @@ WASM-NEXT:     Name: reloc.CODE
 WASM-NEXT:   }
 WASM-NEXT:   Section {
 WASM-NEXT:     Type: CUSTOM (0x0)
-WASM-NEXT:     Size: 72
+WASM-NEXT:     Size: 65
 WASM-NEXT:     Offset: 220
 WASM-NEXT:     Name: linking
 WASM-NEXT:   }

Modified: llvm/trunk/test/tools/llvm-readobj/symbols.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/symbols.test?rev=326445&r1=326444&r2=326445&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/symbols.test (original)
+++ llvm/trunk/test/tools/llvm-readobj/symbols.test Thu Mar  1 07:55:59 2018
@@ -73,16 +73,6 @@ ELF-NEXT:   }
 
 WASM:      Symbols [
 WASM-NEXT:   Symbol {
-WASM-NEXT:     Name: puts
-WASM-NEXT:     Type: FUNCTION (0x0)
-WASM-NEXT:     Flags: 0x10
-WASM-NEXT:   }
-WASM-NEXT:   Symbol {
-WASM-NEXT:     Name: SomeOtherFunction
-WASM-NEXT:     Type: FUNCTION (0x0)
-WASM-NEXT:     Flags: 0x10
-WASM-NEXT:   }
-WASM-NEXT:   Symbol {
 WASM-NEXT:     Name: main
 WASM-NEXT:     Type: FUNCTION (0x0)
 WASM-NEXT:     Flags: 0x0
@@ -92,4 +82,14 @@ WASM-NEXT:     Name: .L.str
 WASM-NEXT:     Type: DATA (0x1)
 WASM-NEXT:     Flags: 0x2
 WASM-NEXT:   }
+WASM-NEXT:   Symbol {
+WASM-NEXT:     Name: puts
+WASM-NEXT:     Type: FUNCTION (0x0)
+WASM-NEXT:     Flags: 0x10
+WASM-NEXT:   }
+WASM-NEXT:   Symbol {
+WASM-NEXT:     Name: SomeOtherFunction
+WASM-NEXT:     Type: FUNCTION (0x0)
+WASM-NEXT:     Flags: 0x10
+WASM-NEXT:   }
 WASM-NEXT: ]




More information about the llvm-commits mailing list