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

Add clrjit.natvis file #52668

Merged
merged 7 commits into from
May 14, 2021
Merged

Add clrjit.natvis file #52668

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d8853a8
Add clrjit.natvis file
kunalspathak May 12, 2021
acea8a5
Review comments
kunalspathak May 12, 2021
709e730
pass /NATVIS flag to linker
kunalspathak May 13, 2021
a210ad7
Include clrjit.natvis only for windows
kunalspathak May 13, 2021
92fbd58
Update src/coreclr/jit/CMakeLists.txt
kunalspathak May 13, 2021
d8c7a7a
Add the missing review comment
kunalspathak May 13, 2021
710fef4
minor typo
kunalspathak May 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/coreclr/jit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,10 @@ if (CLR_CMAKE_TARGET_WIN32)
vartype.h
)

# Append clrjit.natvis file
list (APPEND JIT_SOURCES
clrjit.natvis)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, we still want it so ninja can rebuild when it changes.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's a no op on platforms other than windows, you can move it under the win32 block you created


if (CLR_CMAKE_TARGET_ARCH_ARM64 OR CLR_CMAKE_TARGET_ARCH_ARM)
list (APPEND JIT_HEADERS
emitarm.h
Expand Down Expand Up @@ -362,6 +366,15 @@ convert_to_absolute_path(JIT_ARM_SOURCES ${JIT_ARM_SOURCES})
convert_to_absolute_path(JIT_I386_SOURCES ${JIT_I386_SOURCES})
convert_to_absolute_path(JIT_ARM64_SOURCES ${JIT_ARM64_SOURCES})

# Include natvis file for Windows
if (CLR_CMAKE_TARGET_WIN32)
set(JIT_NATVIS_SOURCE
clrjit.natvis
)
convert_to_absolute_path(JIT_NATVIS_SOURCE ${JIT_NATVIS_SOURCE})
add_linker_flag("/NATVIS:${JIT_NATVIS_SOURCE}")
endif(CLR_CMAKE_TARGET_WIN32)
kunalspathak marked this conversation as resolved.
Show resolved Hide resolved

set(JIT_DLL_MAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/dllmain.cpp)

if(CLR_CMAKE_TARGET_WIN32)
Expand Down
134 changes: 134 additions & 0 deletions src/coreclr/jit/clrjit.natvis
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
<?xml version="1.0" encoding="utf-8"?>

<!--
Licensed to the .NET Foundation under one or more agreements.
The .NET Foundation licenses this file to you under the MIT license.
-->


<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">

<Type Name="Compiler">
<DisplayString>[{info.compFullName,sb} ({info.compMethodHashPrivate,x})]</DisplayString>
<StringView>info.compFullName,sb</StringView>
</Type>

<Type Name="BasicBlock">
<DisplayString Condition="bbJumpKind==BBJ_COND || bbJumpKind==BBJ_ALWAYS || bbJumpKind==BBJ_LEAVE || bbJumpKind==BBJ_EHCATCHRET || bbJumpKind==BBJ_CALLFINALLY">BB{bbNum,d}->BB{bbJumpDest->bbNum,d}; {bbJumpKind,en}</DisplayString>
<DisplayString>BB{bbNum,d}; {bbJumpKind,en}</DisplayString>
</Type>

<Type Name="EHblkDsc">
<DisplayString>type={ebdHandlerType}</DisplayString>
</Type>

<!-- GenTree -->
<Type Name="GenTree">
<DisplayString>[{gtOper,en}, {gtType,en}}]</DisplayString>
</Type>
<Type Name="GenTreeIntCon">
<DisplayString>[IntCon={((GenTreeIntCon*)this)-&gt;gtIconVal, d}]</DisplayString>
</Type>
<Type Name="GenTreeDblCon">
<DisplayString>[DblCon={((GenTreeDblCon*)this)-&gt;gtDconVal, g}]</DisplayString>
</Type>
<Type Name="GenTreeStrCon">
<DisplayString>CNS_STR</DisplayString>
</Type>
<Type Name="GenTreeLngCon">
<DisplayString>[LngCon={((GenTreeLngCon*)this)-&gt;gtLconVal, l}]</DisplayString>
</Type>
<Type Name="GenTreeOp">
<DisplayString Condition="this->gtOper==GT_ASG">[{((GenTreeUnOp*)this)-&gt;gtOper,en}={this-&gt;gtOp2,na}]</DisplayString>
<DisplayString Condition="this->gtOper==GT_CAST">[{((GenTreeCast*)this)-&gt;gtCastType,en} &lt;- {((GenTreeUnOp*)this)-&gt;gtOp1-&gt;gtType,en}]</DisplayString>
<DisplayString>[{gtOper,en}, {gtType,en}]</DisplayString>
</Type>
kunalspathak marked this conversation as resolved.
Show resolved Hide resolved

<Type Name="LclVarDsc">
<DisplayString Condition="lvReason==0">[{lvType,en}]</DisplayString>
<DisplayString>[{lvType,en}-{lvReason,s}]</DisplayString>
</Type>

<Type Name="GenTreeLclVar" Inheritable="false">
<DisplayString>[{gtOper,en}, {gtType,en} V{((GenTreeLclVar*)this)-&gt;_gtLclNum,u}]</DisplayString>
</Type>

<!-- Register allocation -->
<Type Name="LinearScan">
<DisplayString>LinearScan</DisplayString>
<Expand>
<Item Name="AvailableRegs mask">this-&gt;m_AvailableRegs</Item>
<CustomListItems>
<Variable Name="reg" InitialValue="this->m_AvailableRegs" />
<Variable Name="regIndex" InitialValue="0" />
<Loop Condition="reg != 0">
<Item Condition="(reg &amp; 1) != 0">((regNumber)regIndex),en</Item>
<Exec>regIndex++</Exec>
<Exec>reg = reg >> 1</Exec>
</Loop>
</CustomListItems>
<Item Name="RegistersWithConstants mask">this-&gt;m_RegistersWithConstants</Item>
<CustomListItems>
<Variable Name="reg" InitialValue="this->m_RegistersWithConstants" />
<Variable Name="regIndex" InitialValue="0" />
<Loop Condition="reg != 0">
<Item Condition="(reg &amp; 1) != 0">((regNumber)regIndex),en</Item>
<Exec>regIndex++</Exec>
<Exec>reg = reg >> 1</Exec>
</Loop>
</CustomListItems>
</Expand>
</Type>

<Type Name="RefPosition">
<DisplayString>[#{rpNum,d} - {refType,en}]</DisplayString>
<Expand>
<Item Name="Referent" Condition="this->isPhysRegRef">(RegRecord*)this-&gt;referent</Item>
<Item Name="Referent" Condition="!this->isPhysRegRef">(Interval*)this-&gt;referent</Item>
<CustomListItems>
<Variable Name="reg" InitialValue="this->registerAssignment" />
<Variable Name="regIndex" InitialValue="0" />
<Loop Condition="reg != 0">
<Item Condition="(reg &amp; 1) != 0">((regNumber)regIndex),en</Item>
<Exec>regIndex++</Exec>
<Exec>reg = reg >> 1</Exec>
</Loop>
</CustomListItems>
</Expand>
</Type>

<Type Name="Interval">
<DisplayString Condition="this->isLocalVar">[V{this->varNum,d}, #{this->intervalIndex, d}, reg={(regNumber)physReg, en}]</DisplayString>
<DisplayString Condition="this->isConstant">[C{this->intervalIndex, d}, reg={(regNumber)physReg, en}]</DisplayString>
<DisplayString>[I{this->intervalIndex, d}, reg={(regNumber)physReg, en}]</DisplayString>
</Type>

<Type Name="RegRecord">
<DisplayString>[reg={((regNumber)regNum),en}, type={registerType, en}]</DisplayString>
<Expand>
<Item Name="[Assigned]">assignedInterval</Item>
<Item Name="[Previous]">previousInterval</Item>
</Expand>
</Type>

<!-- Emitter -->
<Type Name="insGroup">
<DisplayString Condition="igFlags &amp; 0x200">IG{igNum,d} [extend]</DisplayString>
<DisplayString>IG{igNum,d]</DisplayString>
kunalspathak marked this conversation as resolved.
Show resolved Hide resolved
</Type>

<!-- utils -->
<Type Name="jitstd::list&lt;*&gt;">
<DisplayString Condition="m_nSize > 0">Size={m_nSize}</DisplayString>
<DisplayString Condition="m_nSize == 0">Empty</DisplayString>
<Expand>
<LinkedListItems>
<Size>m_nSize</Size>
<HeadPointer>this->m_pHead</HeadPointer>
<NextPointer>this-&gt;m_pNext</NextPointer>
<ValueNode>this-&gt;m_value</ValueNode>
</LinkedListItems>
</Expand>
</Type>

</AutoVisualizer>