From 741f2ab6c76ed2a52044b242111b63fcbde3a9b4 Mon Sep 17 00:00:00 2001 From: Nicholas Wilson Date: Thu, 1 Mar 2018 15:55:59 +0000 Subject: [PATCH] [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 llvm-svn: 326445 --- test/Object/Inputs/trivial-object-test.wasm | Bin 327 -> 320 bytes test/Object/obj2yaml.test | 18 ++++++++-------- test/Object/objdump-relocations.test | 6 +++--- .../llvm-objdump/Inputs/trivial.obj.wasm | Bin 327 -> 320 bytes .../WebAssembly/symbol-table.test | 4 ++-- test/tools/llvm-objdump/wasm.txt | 2 +- .../llvm-readobj/Inputs/trivial.obj.wasm | Bin 298 -> 291 bytes test/tools/llvm-readobj/relocations.test | 6 +++--- test/tools/llvm-readobj/sections.test | 2 +- test/tools/llvm-readobj/symbols.test | 20 +++++++++--------- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/test/Object/Inputs/trivial-object-test.wasm b/test/Object/Inputs/trivial-object-test.wasm index 9aba700336f0ef7ba096d783725afd7432185109..ae1c9876740f26cadbfe1a4f2043bc50e647c41c 100644 GIT binary patch delta 59 zcmX@kbbx8XU0Fs31}-KBL1u=l4Gj$p>^Yfv*_nCi97{kv)=7*a{0ssN3<8Xd49sPT MMT`tAlT{d%0oHj9v;Y7A delta 82 zcmX@Wbew6zU3X>%1}+8$K}Lo<4Gj$p>^Yfv*_nCi97{kvRt5nE1_4F}1}2u=#LPTK hCN@1Ez2cH01_oY62IjKFB1Q%l=0=c8k;$@*$^cjz6951J diff --git a/test/Object/obj2yaml.test b/test/Object/obj2yaml.test index 8b5e4ee4161..235b461ca58 100644 --- a/test/Object/obj2yaml.test +++ b/test/Object/obj2yaml.test @@ -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 diff --git a/test/Object/objdump-relocations.test b/test/Object/objdump-relocations.test index 4044a299adc..a08fc717aa8 100644 --- a/test/Object/objdump-relocations.test +++ b/test/Object/objdump-relocations.test @@ -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 diff --git a/test/tools/llvm-objdump/Inputs/trivial.obj.wasm b/test/tools/llvm-objdump/Inputs/trivial.obj.wasm index 9aba700336f0ef7ba096d783725afd7432185109..ae1c9876740f26cadbfe1a4f2043bc50e647c41c 100644 GIT binary patch delta 59 zcmX@kbbx8XU0Fs31}-KBL1u=l4Gj$p>^Yfv*_nCi97{kv)=7*a{0ssN3<8Xd49sPT MMT`tAlT{d%0oHj9v;Y7A delta 82 zcmX@Wbew6zU3X>%1}+8$K}Lo<4Gj$p>^Yfv*_nCi97{kvRt5nE1_4F}1}2u=#LPTK hCN@1Ez2cH01_oY62IjKFB1Q%l=0=c8k;$@*$^cjz6951J diff --git a/test/tools/llvm-objdump/WebAssembly/symbol-table.test b/test/tools/llvm-objdump/WebAssembly/symbol-table.test index 0dc31e1a629..43c52873c9f 100644 --- a/test/tools/llvm-objdump/WebAssembly/symbol-table.test +++ b/test/tools/llvm-objdump/WebAssembly/symbol-table.test @@ -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 diff --git a/test/tools/llvm-objdump/wasm.txt b/test/tools/llvm-objdump/wasm.txt index e31e6371ef1..5b88b63980d 100644 --- a/test/tools/llvm-objdump/wasm.txt +++ b/test/tools/llvm-objdump/wasm.txt @@ -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 diff --git a/test/tools/llvm-readobj/Inputs/trivial.obj.wasm b/test/tools/llvm-readobj/Inputs/trivial.obj.wasm index b9038c3534f50fb85608e42dbd6dcb45ae548565..416e57745c3dba8e8ab744190f3badefe8f9ac85 100644 GIT binary patch delta 86 zcmZ3*w3una6@Nws1}-KBL1u=74Gj$p>^Yfv*_nCi9J4_@76t|;mfXb5JVquqJs-W| hk|G8MUIqaM1_4IaNgxG`e0oLsDTyVCdJt(w1^~Ry6=MJZ delta 77 zcmZ3?w2EoM6=h}y1}+8$K}LoX4Gj$p>^Yfv*_nCi9J4_@76t(Z1_8#2A4TMu8$klR atdl?#BcEPTeoA6VqMn|QUU5kgBLe_5Ocg)? diff --git a/test/tools/llvm-readobj/relocations.test b/test/tools/llvm-readobj/relocations.test index 9d92c2fcb66..dbbbb76d9e8 100644 --- a/test/tools/llvm-readobj/relocations.test +++ b/test/tools/llvm-readobj/relocations.test @@ -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: ] diff --git a/test/tools/llvm-readobj/sections.test b/test/tools/llvm-readobj/sections.test index 7c38b30168a..64f295458a0 100644 --- a/test/tools/llvm-readobj/sections.test +++ b/test/tools/llvm-readobj/sections.test @@ -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: } diff --git a/test/tools/llvm-readobj/symbols.test b/test/tools/llvm-readobj/symbols.test index 47b04c91382..d6bb870942d 100644 --- a/test/tools/llvm-readobj/symbols.test +++ b/test/tools/llvm-readobj/symbols.test @@ -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: ]