Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix disassembler #2075

Merged
merged 9 commits into from
Aug 22, 2022
Merged

Fix disassembler #2075

merged 9 commits into from
Aug 22, 2022

Conversation

adamsitnik
Copy link
Member

@adamsitnik adamsitnik commented Aug 18, 2022 •
edited
Loading

Fixes #2074

Sample C# code:

public class Repro
{
    [Benchmark]
    public void Simple()
    {
        Empty();
        Call();
        WithThrow(false);
    }

    [MethodImpl(MethodImplOptions.NoInlining)]
    private void Empty() { }

    [Benchmark]
    public void Call() => Console.WriteLine();

    private void WithThrow(bool doThrow)
    {
        if (doThrow) throw new NotImplementedException();
    }
}

Output for ClrMD v1:

ClrMd V1

.NET 6.0.8 (6.0.822.36306), X64 RyuJIT AVX2

; BenchmarkDotNet.Samples.Repro.Simple()
       push      rbp
       sub       rsp,20
       lea       rbp,[rsp+20]
       mov       [rbp+10],rcx
       mov       rcx,[rbp+10]
       call      0000000000001D90
       mov       rcx,[rbp+10]
       call      0000000000001D98
       mov       rcx,[rbp+10]
       xor       edx,edx
       call      0000000000001DA0
       nop
       add       rsp,20
       pop       rbp
       ret
; Total bytes of code 50
; BenchmarkDotNet.Samples.Repro.Empty()
       push      rbp
       mov       rbp,rsp
       mov       [rbp+10],rcx
       pop       rbp
       ret
; Total bytes of code 10
; BenchmarkDotNet.Samples.Repro.Call()
       push      rbp
       sub       rsp,20
       lea       rbp,[rsp+20]
       mov       [rbp+10],rcx
       call      0000000000002BA8
       nop
       add       rsp,20
       pop       rbp
       ret
; Total bytes of code 26
; BenchmarkDotNet.Samples.Repro.WithThrow(Boolean)
       push      rbp
       sub       rsp,30
       lea       rbp,[rsp+30]
       xor       eax,eax
       mov       [rbp+0FFF8],rax
       mov       [rbp+10],rcx
       mov       [rbp+18],edx
       mov       ecx,[rbp+18]
       movzx     ecx,cl
       test      ecx,ecx
       je        short 00000000000092F6
       mov       rcx,offset MT_System.NotImplementedException
       call      000000000000B2D0
       mov       [rbp+0FFF8],rax
       mov       rcx,[rbp+0FFF8]
       call      0000000000006DF8
       mov       rcx,[rbp+0FFF8]
       call      00000000000055B0
       nop
       add       rsp,30
       pop       rbp
       ret
; Total bytes of code 77
; System.Console.WriteLine()
       sub       rsp,28
       call      qword ptr [38D8]
       mov       rcx,rax
       lea       r11,[3278]
       cmp       [rcx],ecx
       call      qword ptr [3278]
       nop
       add       rsp,28
       ret
; Total bytes of code 34

Method was not JITted yet.
System.NotImplementedException..ctor()

Output for ClrMD v2 before bug fix:

.NET 6.0.8 (6.0.822.36306), X64 RyuJIT AVX2

; BenchmarkDotNet.Samples.Repro.Simple()
       push      rbp
       sub       rsp,20
       lea       rbp,[rsp+20]
       mov       [rbp+10],rcx
       mov       rcx,[rbp+10]
       call      BenchmarkDotNet.Samples.Repro.Empty()
       mov       rcx,[rbp+10]
       call      BenchmarkDotNet.Samples.Repro.Call()
       mov       rcx,[rbp+10]
       xor       edx,edx
       call      BenchmarkDotNet.Samples.Repro.WithThrow(Boolean)
       nop
       add       rsp,20
       pop       rbp
       ret
       add       [rax],al
       sbb       [7FFD4CB0924C],eax
       add       [rax],edx
       add       [rax],al
       add       [rax],al
       add       [rax],al
       add       [rax],al
       add       [rax],al
       (bad)
; Total bytes of code 75
; BenchmarkDotNet.Samples.Repro.Empty()
       push      rbp
       mov       rbp,rsp
       mov       [rbp+10],rcx
       pop       rbp
       ret
       add       [rax],al
       sbb       [rcx],eax
       add       [rax],eax
       add       [rax],edx
       add       [rax],al
       add       [rax],al
       add       al,dh
       mov       bpl,1A
       std
       jg        short M01_L00
M01_L00:
       add       [rbp+48],dl
       sub       esp,20
       (bad)
; Total bytes of code 40
; BenchmarkDotNet.Samples.Repro.Call()
       push      rbp
       sub       rsp,20
       lea       rbp,[rsp+20]
       mov       [rbp+10],rcx
       call      System.Console.WriteLine()
       nop
       add       rsp,20
       pop       rbp
       ret
       add       [rax],al
       sbb       [7FFD4CB092A4],eax
       add       [rax],edx
       add       [rax],al
       add       [rax+45],dh
       mov       ch,1A
       std
       jg        short M02_L00
M02_L00:
       add       [rbp+48],dl
       (bad)
; Total bytes of code 51
; BenchmarkDotNet.Samples.Repro.WithThrow(Boolean)
       push      rbp
       sub       rsp,30
       lea       rbp,[rsp+30]
       xor       eax,eax
       mov       [rbp-8],rax
       mov       [rbp+10],rcx
       mov       [rbp+18],edx
       mov       ecx,[rbp+18]
       movzx     ecx,cl
       test      ecx,ecx
       je        short M03_L00
       mov       rcx,offset MT_System.NotImplementedException
       call      CORINFO_HELP_NEWSFAST
       mov       [rbp-8],rax
       mov       rcx,[rbp-8]
       call      System.NotImplementedException..ctor()
       mov       rcx,[rbp-8]
       call      CORINFO_HELP_THROW
M03_L00:
       nop
       add       rsp,30
       pop       rbp
       ret
       add       [rax],al
       add       [rcx],bl
       add       eax,52050002
       add       [rax],edx
       add       [rax],al
       add       [rax],al
       add       [rax],al
       add       [rax],al
       add       [rax],al
       add       [rax],al
       (bad)
; Total bytes of code 102
; System.Console.WriteLine()
       sub       rsp,28
       call      qword ptr [System.IO.ConsoleStream.ValidateRead(Byte[], Int32, Int32)]
       mov       rcx,rax
       lea       r11,[System.IO.ConsoleStream.ValidateRead(Byte[], Int32, Int32)]
       cmp       [rcx],ecx
       call      qword ptr [System.IO.ConsoleStream.ValidateRead(Byte[], Int32, Int32)]
       nop
       add       rsp,28
       ret
       int       3
       int       3
       int       3
       int       3
       int       3
       int       3
       int       3
       int       3
       int       3
       int       3
       int       3
       int       3
       int       3
       int       3
       push      rsi
       sub       rsp,20
       mov       esi,ecx
       (bad)
; Total bytes of code 60

Method was not JITted yet.
System.NotImplementedException..ctor()

Output for ClrMD v2 after bug fix:

.NET 6.0.8 (6.0.822.36306), X64 RyuJIT AVX2

; BenchmarkDotNet.Samples.Repro.Simple()
       push      rbp
       sub       rsp,20
       lea       rbp,[rsp+20]
       mov       [rbp+10],rcx
       mov       rcx,[rbp+10]
       call      BenchmarkDotNet.Samples.Repro.Empty()
       mov       rcx,[rbp+10]
       call      BenchmarkDotNet.Samples.Repro.Call()
       mov       rcx,[rbp+10]
       xor       edx,edx
       call      BenchmarkDotNet.Samples.Repro.WithThrow(Boolean)
       nop
       add       rsp,20
       pop       rbp
       ret
; Total bytes of code 50
; BenchmarkDotNet.Samples.Repro.Empty()
       push      rbp
       mov       rbp,rsp
       mov       [rbp+10],rcx
       pop       rbp
       ret
; Total bytes of code 10
; BenchmarkDotNet.Samples.Repro.Call()
       push      rbp
       sub       rsp,20
       lea       rbp,[rsp+20]
       mov       [rbp+10],rcx
       call      System.Console.WriteLine()
       nop
       add       rsp,20
       pop       rbp
       ret
; Total bytes of code 26
; BenchmarkDotNet.Samples.Repro.WithThrow(Boolean)
       push      rbp
       sub       rsp,30
       lea       rbp,[rsp+30]
       xor       eax,eax
       mov       [rbp-8],rax
       mov       [rbp+10],rcx
       mov       [rbp+18],edx
       mov       ecx,[rbp+18]
       movzx     ecx,cl
       test      ecx,ecx
       je        short M03_L00
       mov       rcx,offset MT_System.NotImplementedException
       call      CORINFO_HELP_NEWSFAST
       mov       [rbp-8],rax
       mov       rcx,[rbp-8]
       call      System.NotImplementedException..ctor()
       mov       rcx,[rbp-8]
       call      CORINFO_HELP_THROW
M03_L00:
       nop
       add       rsp,30
       pop       rbp
       ret
; Total bytes of code 77
; System.Console.WriteLine()
       sub       rsp,28
       call      qword ptr [System.IO.ConsoleStream.ValidateRead(Byte[], Int32, Int32)]
       mov       rcx,rax
       lea       r11,[System.IO.ConsoleStream.ValidateRead(Byte[], Int32, Int32)]
       cmp       [rcx],ecx
       call      qword ptr [System.IO.ConsoleStream.ValidateRead(Byte[], Int32, Int32)]
       nop
       add       rsp,28
       ret
; Total bytes of code 34

Method was not JITted yet.
System.NotImplementedException..ctor()

@adamsitnik adamsitnik added this to the v0.13.2 milestone Aug 18, 2022
@adamsitnik
Copy link
Member Author

I think I've workarounded all the ClrMD v2 bugs. When the CI finishes, I am going to merge the PR and write the release notes.

@adamsitnik adamsitnik merged commit 4924f0e into master Aug 22, 2022
@adamsitnik adamsitnik deleted the fixDisassembler branch August 22, 2022 18:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Area:Diagnosers
Projects
None yet
Milestone
v0.13.2
Development

Successfully merging this pull request may close these issues.

DisassemblyDiagnoser producing invalid disassembly
1 participant
@adamsitnik