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.

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

LSRA: Refactor some of the methods around creating kill set #102469

Merged
merged 8 commits into from
May 21, 2024

Conversation

kunalspathak
Copy link
Member

I did some refactoring and separated out the methods for the ones that create multiple defs vs. single def as well the one with create defs for call, and the ones that just build the killMask. This is in preparation for the upcoming work I am doing to add support for predicate registers. This patch is extracted out from #98258

@dotnet-issue-labeler dotnet-issue-labeler bot added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label May 20, 2024
Copy link
Contributor

Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch
See info in area-owners.md if you want to be subscribed.

@kunalspathak
Copy link
Member Author

TP Diffs

image
image

@kunalspathak kunalspathak marked this pull request as ready for review May 21, 2024 03:13
@kunalspathak
Copy link
Member Author

@dotnet/jit-contrib

@kunalspathak
Copy link
Member Author

@jakobbotsch - i fixed some riscv64 build errors. PTAL

@@ -131,8 +131,8 @@ ABIPassingInformation RiscV64Classifier::Classify(Compiler* comp,
regNumber secondReg = (isSecondFloat ? m_floatRegs : m_intRegs).Dequeue();

return {2, new (comp, CMK_ABI)
ABIPassingSegment[]{ABIPassingSegment::InRegister(firstReg, 0, firstSize),
ABIPassingSegment::InRegister(secondReg, offset, secondSize)}};
ABIPassingSegment[2]{ABIPassingSegment::InRegister(firstReg, 0, firstSize),
Copy link
Member

Choose a reason for hiding this comment

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

Why this change?

Copy link
Member Author

Choose a reason for hiding this comment

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

i get build error locally without it:

  [ 68%] Building CXX object jit/CMakeFiles/clrjit_unix_riscv64_x64.dir/targetriscv64.cpp.o
  /home/kpathak/git/runtime/src/coreclr/jit/targetriscv64.cpp: In member function ‘ABIPassingInformation RiscV64Classifier::Classify(Compiler*, var_types, ClassLayout*, WellKnownArg)’:
  /home/kpathak/git/runtime/src/coreclr/jit/targetriscv64.cpp:165:46: error: expected primary-expression before ‘]’ token
    165 |                            ABIPassingSegment[]{passSlot(0, TARGET_POINTER_SIZE),
        |                                              ^
  /home/kpathak/git/runtime/src/coreclr/jit/targetriscv64.cpp:166:111: error: too many initializers for ‘ABIPassingSegment [1]’
    166 |                                                passSlot(TARGET_POINTER_SIZE, passedSize - TARGET_POINTER_SIZE)}};
        |                                                                                                               ^
  make[3]: *** [jit/CMakeFiles/clrjit_unix_riscv64_x64.dir/build.make:1613: jit/CMakeFiles/clrjit_unix_riscv64_x64.dir/targetriscv64.cpp.o] Error 1
  make[2]: *** [CMakeFiles/Makefile2:2685: jit/CMakeFiles/clrjit_unix_riscv64_x64.dir/all] Error 2
  make[1]: *** [CMakeFiles/Makefile2:1681: CMakeFiles/crosscomponents.dir/rule] Error 2
  make: *** [Makefile:299: crosscomponents] Error 2

@kunalspathak
Copy link
Member Author

/ba-g failure is related to #102479

@kunalspathak kunalspathak merged commit 0709995 into dotnet:main May 21, 2024
99 of 107 checks passed
@kunalspathak kunalspathak deleted the lsra-refactor branch May 21, 2024 23:35
steveharter pushed a commit to steveharter/runtime that referenced this pull request May 28, 2024
…02469)

* refactor code around buildkill

* fix build errors

* some more errors

* jit format

* fix riscv64

* make retTypeDesc as noway_assert

* fix riscv64 errors

* jit format
Ruihan-Yin pushed a commit to Ruihan-Yin/runtime that referenced this pull request May 30, 2024
…02469)

* refactor code around buildkill

* fix build errors

* some more errors

* jit format

* fix riscv64

* make retTypeDesc as noway_assert

* fix riscv64 errors

* jit format
@github-actions github-actions bot locked and limited conversation to collaborators Jun 21, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants