[lld][WebAssembly] Use llvm-objdump to test __wasm_init_memory

[tlively]

Summary

Rather than depending on the hex dump from obj2yaml. Now the test shows the
expected function body in a human readable format.

[sbc100]

lld/test/wasm/data-segments.ll

33

It looks like most of the tests in test/ELF use -d --no-show-raw-insn .. but I guess --no-leading-addr is good too. Maybe both ?

[tlively]

• Add --no-show-raw-insn

lld/test/wasm/data-segments.ll

33

Oh nice, I had missed that option. This is much better now.

[sbc100]

lld/test/wasm/data-segments.ll

171

Kind of shame there are so many differences here between the PIC/no-PIC and 64/32-bit.

Do you think this more useful than just having completely separate blocks (with duplication)?

I wonder if you could do -DINT=i32 / -DINT=i64 to remove at least one level of splitting here?

227

We weren’t able to create the releas

[sbc100]

lld/test/wasm/data-segments.ll

227

Oops, somehow this much have been in my paste buffer.. please ignore.

[tlively]

• Remove i32/i64 duplication

[tlively]

lld/test/wasm/data-segments.ll

171

I removed one level of splitting, as you suggested. Let me know if you think it looks reasonable, otherwise I can fully duplicate the function between PIC and non-PIC code as well.

[sbc100]

Nice. I wonder how much of the yaml output is still useful to include here?

[tlively]

In D109730#3000591, @sbc100 wrote:

Nice. I wonder how much of the yaml output is still useful to include here?

It looks like llvm-objdump doesn't yet handle --disassemble-all (it seems to think all the different sections contain functions), so the YAML still seems good for making sure the rest of the file structure is correct.

lld/test/wasm/data-segments.ll

 ; RUN: obj2yaml %t.bulk-mem.wasm | FileCheck %s --check-prefixes ACTIVE,ACTIVE32
 
 ; bulk memory, unshared memory, wasm64 => active segments
 ; RUN: wasm-ld -mwasm64 -no-gc-sections --no-entry %t.bulk-mem64.o -o %t.bulk-mem64.wasm
 ; RUN: obj2yaml %t.bulk-mem64.wasm | FileCheck %s --check-prefixes ACTIVE,ACTIVE64
 
 ; atomics, bulk memory, shared memory => passive segments
 ; RUN: wasm-ld -no-gc-sections --no-entry --shared-memory --max-memory=131072 %t.atomics.bulk-mem.o -o %t.atomics.bulk-mem.wasm
-; RUN: obj2yaml %t.atomics.bulk-mem.wasm | FileCheck %s --check-prefixes PASSIVE,PASSIVE32
+; RUN: obj2yaml %t.atomics.bulk-mem.wasm | FileCheck %s --check-prefix PASSIVE
+; RUN: llvm-objdump --disassemble-symbols=__wasm_init_memory --no-show-raw-insn --no-leading-addr %t.atomics.bulk-mem.wasm | FileCheck %s --check-prefixes DIS,NOPIC-DIS -DPTR=i32
 
 ; atomics, bulk memory, shared memory, wasm64 => passive segments
 ; RUN: wasm-ld -mwasm64 -no-gc-sections --no-entry --shared-memory --max-memory=131072 %t.atomics.bulk-mem64.o -o %t.atomics.bulk-mem64.wasm
-; RUN: obj2yaml %t.atomics.bulk-mem64.wasm | FileCheck %s --check-prefixes PASSIVE,PASSIVE64
+; RUN: obj2yaml %t.atomics.bulk-mem64.wasm | FileCheck %s --check-prefix PASSIVE
+; RUN: llvm-objdump --disassemble-symbols=__wasm_init_memory --no-show-raw-insn --no-leading-addr %t.atomics.bulk-mem64.wasm | FileCheck %s --check-prefixes DIS,NOPIC-DIS -DPTR=i64
 
 ; Also test in combination with PIC/pie
 ; RUN: wasm-ld --experimental-pic -pie -no-gc-sections --no-entry --shared-memory --max-memory=131072 %t.atomics.bulk-mem.pic.o -o %t.pic.wasm
 ; RUN: obj2yaml %t.pic.wasm | FileCheck %s --check-prefixes PASSIVE-PIC,PASSIVE32-PIC
+; RUN: llvm-objdump --disassemble-symbols=__wasm_init_memory --no-show-raw-insn --no-leading-addr %t.pic.wasm | FileCheck %s --check-prefixes DIS,PIC-DIS -DPTR=i32
 
 ; Also test in combination with PIC/pie + wasm64
 ; RUN: wasm-ld -mwasm64 --experimental-pic -pie -no-gc-sections --no-entry --shared-memory --max-memory=131072 %t.atomics.bulk-mem.pic-mem64.o -o %t.pic-mem64.wasm
 ; RUN: obj2yaml %t.pic-mem64.wasm | FileCheck %s --check-prefixes PASSIVE-PIC,PASSIVE64-PIC
+; RUN: llvm-objdump --disassemble-symbols=__wasm_init_memory --no-show-raw-insn --no-leading-addr %t.pic-mem64.wasm | FileCheck %s --check-prefixes DIS,PIC-DIS -DPTR=i64
 
 @a = hidden global [6 x i8] c"hello\00", align 1
 @b = hidden global [8 x i8] c"goodbye\00", align 1
 @c = hidden global [10000 x i8] zeroinitializer, align 1
 @d = hidden global i32 42, align 4
 
 @e = private constant [9 x i8] c"constant\00", align 1
 @f = private constant i8 43, align 4

 ; PASSIVE-NEXT:      - Index:           0
 ; PASSIVE-NEXT:        Locals:          []
 ; PASSIVE-NEXT:        Body:            0B
 ; PASSIVE-NEXT:      - Index:           1
 ; PASSIVE-NEXT:        Locals:          []
 ; PASSIVE-NEXT:        Body:            0B
 ; PASSIVE-NEXT:      - Index:           2
 ; PASSIVE-NEXT:        Locals:          []
-; PASSIVE32-NEXT:        Body:             02400240024041B4D60041004101FE4802000E020001020B4180084100410DFC08000041900841004114FC08010041B4D6004102FE17020041B4D600417FFE0002001A0C010B41B4D6004101427FFE0102001A0BFC0900FC09010B
-; PASSIVE64-NEXT:        Body:            02400240024042B4D60041004101FE4802000E020001020B4280084100410DFC08000042900841004114FC08010042B4D6004102FE17020042B4D600417FFE0002001A0C010B42B4D6004101427FFE0102001A0BFC0900FC09010B
+; PASSIVE-NEXT:        Body:            {{.*}}
 ; PASSIVE-NEXT:  - Type:            DATA
 ; PASSIVE-NEXT:    Segments:
 ; PASSIVE-NEXT:      - SectionOffset:   3
 ; PASSIVE-NEXT:        InitFlags:       1
 ; PASSIVE-NEXT:        Content:         636F6E7374616E74000000002B
 ; PASSIVE-NEXT:      - SectionOffset:   18
 ; PASSIVE-NEXT:        InitFlags:       1
 ; PASSIVE-NEXT:        Content:         68656C6C6F00676F6F646279650000002A000000

 ; PASSIVE-PIC-NEXT:        Body:            10030B
 ; PASSIVE-PIC-NEXT:      - Index:           1
 ; PASSIVE-PIC-NEXT:        Locals:          []
 ; PASSIVE-PIC-NEXT:        Body:            0B
 ; PASSIVE-PIC-NEXT:      - Index:           2
 ; PASSIVE-PIC-NEXT:        Locals:
 ; PASSIVE32-PIC-NEXT:          - Type:            I32
 ; PASSIVE64-PIC-NEXT:          - Type:            I64
-; PASSIVE-PIC-NEXT:            Count:           1
-; PASSIVE32-PIC-NEXT:          Body:            230141B4CE006A2100024002400240200041004101FE4802000E020001020B410023016A4100410DFC080000411023016A41004114FC08010020004102FE1702002000417FFE0002001A0C010B20004101427FFE0102001A0BFC0900FC09010B
-; PASSIVE64-PIC-NEXT:          Body:            230142B4CE007C2100024002400240200041004101FE4802000E020001020B420023017C4100410DFC080000421023017C41004114FC08010020004102FE1702002000417FFE0002001A0C010B20004101427FFE0102001A0BFC0900FC09010B
+; PASSIVE-PIC-NEXT:              Count:           1
+; PASSIVE-PIC-NEXT:        Body:            {{.*}}
 ; PASSIVE-PIC-NEXT:      - Index:           3
 ; PASSIVE-PIC-NEXT:        Locals:          []
 ; PASSIVE-PIC-NEXT:        Body:            0B
 ; PASSIVE-PIC-NEXT:  - Type:            DATA
 ; PASSIVE-PIC-NEXT:    Segments:
 ; PASSIVE-PIC-NEXT:      - SectionOffset:   3
 ; PASSIVE-PIC-NEXT:        InitFlags:       1
 ; PASSIVE-PIC-NEXT:        Content:         636F6E7374616E74000000002B
 ; PASSIVE-PIC-NEXT:      - SectionOffset:   18
 ; PASSIVE-PIC-NEXT:        InitFlags:       1
 ; PASSIVE-PIC-NEXT:        Content:         68656C6C6F00676F6F646279650000002A000000
 ; PASSIVE-PIC-NEXT:  - Type:            CUSTOM
 ; PASSIVE-PIC-NEXT:    Name:            name
 ; PASSIVE-PIC-NEXT:    FunctionNames:
 ; PASSIVE-PIC-NEXT:      - Index:           0
 ; PASSIVE-PIC-NEXT:        Name:            __wasm_call_ctors
 ; PASSIVE-PIC-NEXT:      - Index:           1
 ; PASSIVE-PIC-NEXT:        Name:            __wasm_init_tls
 ; PASSIVE-PIC-NEXT:      - Index:           2
 ; PASSIVE-PIC-NEXT:        Name:            __wasm_init_memory
 ; PASSIVE-PIC-NEXT:      - Index:           3
 ; PASSIVE-PIC-NEXT:        Name:            __wasm_apply_data_relocs
+
+; DIS-LABEL:       <__wasm_init_memory>:
+
+; PIC-DIS:           .local [[PTR]]
+; PIC-DIS-NEXT:      global.get      1
+; PIC-DIS-NEXT:      [[PTR]].const   10036
+; PIC-DIS-NEXT:      [[PTR]].add
+; PIC-DIS-NEXT:      local.set       0
+
+; DIS:               block
+; DIS-NEXT:           block
+; DIS-NEXT:            block
+
+; NOPIC-DIS-NEXT:       [[PTR]].const   11060
+; PIC-DIS-NEXT:         local.get       0
+
+; DIS-NEXT:             i32.const       0
+; DIS-NEXT:             i32.const       1
+; DIS-NEXT:             i32.atomic.rmw.cmpxchg  0
+; DIS-NEXT:             br_table        {0, 1, 2}      # 1:     down to label1
+; DIS-NEXT:                                            # 2:     down to label0
+; DIS-NEXT:            end
+
+; NOPIC-DIS-NEXT:      [[PTR]].const   1024
+; PIC-DIS-NEXT:        [[PTR]].const   0
+; PIC-DIS-NEXT:        global.get      1
+; PIC-DIS-NEXT:        [[PTR]].add
+
+; DIS-NEXT:            i32.const       0
+; DIS-NEXT:            i32.const       13
+; DIS-NEXT:            memory.init     0, 0
+
+; NOPIC-DIS-NEXT:      [[PTR]].const   1040
+; PIC-DIS-NEXT:        [[PTR]].const   16
+; PIC-DIS-NEXT:        global.get      1
+; PIC-DIS-NEXT:        [[PTR]].add
+
+; DIS-NEXT:            i32.const       0
+; DIS-NEXT:            i32.const       20
+; DIS-NEXT:            memory.init     1, 0
+
+; NOPIC-DIS-NEXT:      [[PTR]].const   11060
+; PIC-DIS-NEXT:        local.get       0
+
+; DIS-NEXT:            i32.const       2
+; DIS-NEXT:            i32.atomic.store        0
+
+; NOPIC-DIS-NEXT:      [[PTR]].const   11060
+; PIC-DIS-NEXT:        local.get       0
+
+; DIS-NEXT:            i32.const       -1
+; DIS-NEXT:            memory.atomic.notify    0
+; DIS-NEXT:            drop
+; DIS-NEXT:            br              1               # 1:     down to label1
+; DIS-NEXT:           end
+
+; NOPIC-DIS-NEXT:     [[PTR]].const   11060
+; PIC-DIS-NEXT:       local.get       0
+
+; DIS-NEXT:           i32.const       1
+; DIS-NEXT:           i64.const       -1
+; DIS-NEXT:           memory.atomic.wait32    0
+; DIS-NEXT:           drop
+; DIS-NEXT:          end
+; DIS-NEXT:          data.drop       0
+; DIS-NEXT:          data.drop       1
+; DIS-NEXT:         end