This is an archive of the discontinued LLVM Phabricator instance.

Differential D88795

[lldb] [test/Register] Attempt to fix x86-fp-read.test on Darwin
ClosedPublic

Authored by mgorny on Oct 4 2020, 2:23 AM.

Details

Reviewers
JDevlieghere
labath
Commits
rGe8beb6988bab: [lldb] [test/Register] Attempt to fix x86-fp-read.test on Darwin
Summary

Darwin seems to use stmmN instead of stN. Use a regex to accept both.

Also try to actually clear st(7).

Diff Detail

Event Timeline

mgorny requested review of this revision.Oct 4 2020, 2:23 AM
mgorny created this revision.

@JDevlieghere would you be able to test if this makes the test pass on Darwin?

I suspect that the mm-xmm test is affected by the same problem but the test is not as trivially fixable there.

JDevlieghere added a comment.Oct 4 2020, 1:58 PM
In D88795#2310635, @mgorny wrote:

@JDevlieghere would you be able to test if this makes the test pass on Darwin?

I suspect that the mm-xmm test is affected by the same problem but the test is not as trivially fixable there.

Thank you. It does fix the register name, but it still fails because the output for stmm7 is different. I'm not sure if that's expected?

Expected: st{{(mm)?}}7 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00}
Actual:   stmm7        = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0xff 0xff}

Full output:

/Users/jonas/llvm/llvm-project/lldb/test/Shell/Register/x86-fp-read.test:23:14: error: CHECK-DAG: expected string not found in input
# CHECK-DAG: st{{(mm)?}}7 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00}
             ^
<stdin>:16:1: note: scanning from here
* thread #1, queue = 'com.apple.main-thread', stop reason = EXC_BREAKPOINT (code=EXC_I386_BPT, subcode=0x0)
^
<stdin>:117:2: note: possible intended match here
 stmm2 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00}
 ^

Input file: <stdin>
Check file: /Users/jonas/llvm/llvm-project/lldb/test/Shell/Register/x86-fp-read.test

-dump-input=help explains the following input dump.

Input was:
<<<<<<
          .
          .
          .
         11: Current executable set to '/Users/jonas/llvm/build-ra/tools/lldb/test/Register/Output/x86-fp-read.test.tmp' (x86_64).
         12: (lldb) command source -s 0 '/Users/jonas/llvm/llvm-project/lldb/test/Shell/Register/x86-fp-read.test'
         13: Executing commands in '/Users/jonas/llvm/llvm-project/lldb/test/Shell/Register/x86-fp-read.test'.
         14: (lldb) process launch
         15: Process 62241 stopped
         16: * thread #1, queue = 'com.apple.main-thread', stop reason = EXC_BREAKPOINT (code=EXC_I386_BPT, subcode=0x0)
dag:23'0     X~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ error: no match found
         17:  frame #0: 0x0000000100003ee1 x86-fp-read.test.tmp`main at x86-fp-read.cpp:25:3
dag:23'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         18:  22 // used as single-precision float
dag:23'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         19:  23 uint32_t zero = 0;
dag:23'0     ~~~~~~~~~~~~~~~~~~~~~~
         20:  24
dag:23'0     ~~~~
         21: -> 25 asm volatile(
dag:23'0     ~~~~~~~~~~~~~~~~~~~
          .
          .
          .
        112:  foseg = 0x7ffe
dag:23'0     ~~~~~~~~~~~~~~~
        113:  mxcsr = 0x00001f80
dag:23'0     ~~~~~~~~~~~~~~~~~~~
        114:  mxcsrmask = 0x0000ffff
dag:23'0     ~~~~~~~~~~~~~~~~~~~~~~~
        115:  stmm0 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x80 0x00 0x40}
dag:23'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
        116:  stmm1 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x3f 0x00 0x00}
dag:23'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
        117:  stmm2 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00}
dag:23'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
dag:23'1      ?                                                           possible intended match
        118:  stmm3 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x80}
dag:23'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
        119:  stmm4 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x80 0xff 0x7f}
dag:23'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
        120:  stmm5 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x80 0xff 0xff}
dag:23'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
        121:  stmm6 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0xc0 0xff 0xff}
dag:23'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
        122:  stmm7 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0xff 0xff}
dag:23'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
          .
          .
          .
>>>>>>
krytarowski added a comment.Oct 4 2020, 2:54 PM

Can we rename the register names in the darwin plugin?

mgorny updated this revision to Diff 296091.Oct 4 2020, 7:58 PM
mgorny edited the summary of this revision. (Show Details)

Please try this one. Apparently the registers aren't cleared like on other systems.

JDevlieghere accepted this revision.Oct 4 2020, 10:22 PM

That works. Thank you!

This revision is now accepted and ready to land.Oct 4 2020, 10:22 PM
mgorny added a comment.Oct 4 2020, 10:59 PM

Thanks. I won't be at a computer for the next 8 hours, so feel free to push it for me.

Closed by commit rGe8beb6988bab: [lldb] [test/Register] Attempt to fix x86-fp-read.test on Darwin (authored by mgorny, committed by JDevlieghere). · Explain WhyOct 4 2020, 11:05 PM
This revision was automatically updated to reflect the committed changes.
JDevlieghere added a commit: rGe8beb6988bab: [lldb] [test/Register] Attempt to fix x86-fp-read.test on Darwin.
Herald added a project: Restricted Project. · View Herald TranscriptOct 4 2020, 11:05 PM
Herald added a subscriber: lldb-commits. · View Herald Transcript
JDevlieghere added a comment.Oct 4 2020, 11:09 PM
In D88795#2311096, @mgorny wrote:

Thanks. I won't be at a computer for the next 8 hours, so feel free to push it for me.

Done. Thanks a lot for following up on this so quickly!

mgorny added a comment.Oct 4 2020, 11:57 PM

No problem. If you could send me logs for other tests xfailing on Darwin (particularly mm-related), I'd also be happy to take a look.

labath added a subscriber: jasonmolenda.Oct 5 2020, 12:13 AM

BTW, what's the reason for darwin using the name stmm? It would be nice if the register names were consistent across a single architecture. We could keep the "stmm" variants as the "alternate" names on darwin for a while, to avoid breaking any scripts or so...

Revision Contents

PathSize
lldb/
test/
Shell/
Register/
Inputs/
6 lines
23 lines

Diff 296098

lldb/test/Shell/Register/Inputs/x86-fp-read.cpp

#include <cstdint> #include <cstdint>
struct alignas(16) float80_raw { struct alignas(16) float80_raw {
uint64_t mantissa; uint64_t mantissa;
uint16_t sign_exp; uint16_t sign_exp;
}; };
int main() { int main() {
float80_raw st[] = { float80_raw st[] = {
{0x8000000000000000, 0x4000}, // +2.0 {0x8000000000000000, 0x4000}, // +2.0
{0x3f00000000000000, 0x0000}, // 1.654785e-4932 (denormal) {0x3f00000000000000, 0x0000}, // 1.654785e-4932 (denormal)
{0x0000000000000000, 0x0000}, // +0 {0x0000000000000000, 0x0000}, // +0
{0x0000000000000000, 0x8000}, // -0 {0x0000000000000000, 0x8000}, // -0
{0x8000000000000000, 0x7fff}, // +inf {0x8000000000000000, 0x7fff}, // +inf
{0x8000000000000000, 0xffff}, // -inf {0x8000000000000000, 0xffff}, // -inf
{0xc000000000000000, 0xffff}, // nan {0xc000000000000000, 0xffff}, // nan
// leave st7 empty to test tag word better // st7 will be freed to test tag word better
{0x0000000000000000, 0x0000}, // +0
}; };
// unmask divide-by-zero exception // unmask divide-by-zero exception
uint16_t cw = 0x037b; uint16_t cw = 0x037b;
// used as single-precision float // used as single-precision float
uint32_t zero = 0; uint32_t zero = 0;
asm volatile( asm volatile(
"finit\n\t" "finit\n\t"
"fldcw %1\n\t" "fldcw %1\n\t"
// load on stack in reverse order to make the result easier to read // load on stack in reverse order to make the result easier to read
"fldt 0x70(%0)\n\t"
"fldt 0x60(%0)\n\t" "fldt 0x60(%0)\n\t"
"fldt 0x50(%0)\n\t" "fldt 0x50(%0)\n\t"
"fldt 0x40(%0)\n\t" "fldt 0x40(%0)\n\t"
"fldt 0x30(%0)\n\t" "fldt 0x30(%0)\n\t"
"fldt 0x20(%0)\n\t" "fldt 0x20(%0)\n\t"
"fldt 0x10(%0)\n\t" "fldt 0x10(%0)\n\t"
"fldt 0x00(%0)\n\t" "fldt 0x00(%0)\n\t"
// free st7
"ffree %%st(7)\n\t"
// this should trigger a divide-by-zero // this should trigger a divide-by-zero
"fdivs (%2)\n\t" "fdivs (%2)\n\t"
"int3\n\t" "int3\n\t"
: :
: "a"(st), "m"(cw), "b"(&zero) : "a"(st), "m"(cw), "b"(&zero)
: "st" : "st"
); );
return 0; return 0;
} }

lldb/test/Shell/Register/x86-fp-read.test

# XFAIL: system-windows # XFAIL: system-windows
# XFAIL: system-darwin
# REQUIRES: native && (target-x86 || target-x86_64) # REQUIRES: native && (target-x86 || target-x86_64)
# RUN: %clangxx_host -g %p/Inputs/x86-fp-read.cpp -o %t # RUN: %clangxx_host -g %p/Inputs/x86-fp-read.cpp -o %t
# RUN: %lldb -b -s %s %t | FileCheck %s # RUN: %lldb -b -s %s %t | FileCheck %s
process launch process launch
# CHECK: Process {{.*}} stopped # CHECK: Process {{.*}} stopped
register read --all register read --all
# CHECK-DAG: fctrl = 0x037b # CHECK-DAG: fctrl = 0x037b
# CHECK-DAG: fstat = 0x8884 # CHECK-DAG: fstat = 0x8084
# TODO: the following value is incorrect, it's a bug in the way # TODO: the following value is incorrect, it's a bug in the way
# FXSAVE/XSAVE is interpreted; it should be 0xa963 once fixed # FXSAVE/XSAVE is interpreted
# CHECK-DAG: ftag = 0x00fe # CHECK-DAG: ftag = 0x007f
# CHECK-DAG: fop = 0x0033 # CHECK-DAG: fop = 0x0033
# CHECK-DAG: st0 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x80 0x00 0x40} # CHECK-DAG: st{{(mm)?}}0 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x80 0x00 0x40}
# CHECK-DAG: st1 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x3f 0x00 0x00} # CHECK-DAG: st{{(mm)?}}1 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x3f 0x00 0x00}
# CHECK-DAG: st2 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00} # CHECK-DAG: st{{(mm)?}}2 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00}
# CHECK-DAG: st3 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x80} # CHECK-DAG: st{{(mm)?}}3 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x80}
# CHECK-DAG: st4 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x80 0xff 0x7f} # CHECK-DAG: st{{(mm)?}}4 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x80 0xff 0x7f}
# CHECK-DAG: st5 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x80 0xff 0xff} # CHECK-DAG: st{{(mm)?}}5 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x80 0xff 0xff}
# CHECK-DAG: st6 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0xc0 0xff 0xff} # CHECK-DAG: st{{(mm)?}}6 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0xc0 0xff 0xff}
# CHECK-DAG: st7 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00} # CHECK-DAG: st{{(mm)?}}7 = {0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00}
# fdiv (%rbx) gets encoded into 2 bytes, int3 into 1 byte # fdiv (%rbx) gets encoded into 2 bytes, int3 into 1 byte
print (void*)($pc-3) print (void*)($pc-3)
# CHECK: (void *) $0 = [[FDIV:0x[0-9a-f]*]] # CHECK: (void *) $0 = [[FDIV:0x[0-9a-f]*]]
# TODO: we probably should not split it like this # TODO: we probably should not split it like this
print (void*)($fiseg*0x100000000 + $fioff) print (void*)($fiseg*0x100000000 + $fioff)
# CHECK: (void *) $1 = [[FDIV]] # CHECK: (void *) $1 = [[FDIV]]
print &zero print &zero
# CHECK: (uint32_t *) $2 = [[ZERO:0x[0-9a-f]*]] # CHECK: (uint32_t *) $2 = [[ZERO:0x[0-9a-f]*]]
print (uint32_t*)($foseg * 0x100000000 + $fooff) print (uint32_t*)($foseg * 0x100000000 + $fooff)
# CHECK: (uint32_t *) $3 = [[ZERO]] # CHECK: (uint32_t *) $3 = [[ZERO]]
process continue process continue
# CHECK: Process {{[0-9]+}} exited with status = 0 # CHECK: Process {{[0-9]+}} exited with status = 0