[RISC-V] Add crossgen2 for riscv64 #95188
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| namespace ILCompiler.DependencyAnalysis.RiscV64 | ||
| { | ||
| public enum AddrModeSize | ||
| { | ||
| Int8 = 1, | ||
| Int16 = 2, | ||
| Int32 = 4, | ||
| Int64 = 8, | ||
| Int128 = 16 | ||
| } | ||
|
|
||
| public struct AddrMode | ||
| { | ||
| public readonly Register BaseReg; | ||
| public readonly Register? IndexReg; | ||
| public readonly int Offset; | ||
| public readonly byte Scale; | ||
| public readonly AddrModeSize Size; | ||
|
|
||
| public AddrMode(Register baseRegister, Register? indexRegister, int offset, byte scale, AddrModeSize size) | ||
| { | ||
| BaseReg = baseRegister; | ||
| IndexReg = indexRegister; | ||
| Offset = offset; | ||
| Scale = scale; | ||
| Size = size; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| namespace ILCompiler.DependencyAnalysis.RiscV64 | ||
| { | ||
| public enum Register | ||
| { | ||
| X0, | ||
| X1, | ||
| X2, | ||
| X3, | ||
| X4, | ||
| X5, | ||
| X6, | ||
| X7, | ||
| X8, | ||
| X9, | ||
| X10, | ||
| X11, | ||
| X12, | ||
| X13, | ||
| X14, | ||
| X15, | ||
| X16, | ||
| X17, | ||
| X18, | ||
| X19, | ||
| X20, | ||
| X21, | ||
| X22, | ||
| X23, | ||
| X24, | ||
| X25, | ||
| X26, | ||
| X27, | ||
| X28, | ||
| X29, | ||
| X30, | ||
| X31, | ||
|
|
||
| None, | ||
| NoIndex = 128 | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System; | ||
| using System.Diagnostics; | ||
|
|
||
| namespace ILCompiler.DependencyAnalysis.RiscV64 | ||
| { | ||
| public struct RiscV64Emitter | ||
| { | ||
| public RiscV64Emitter(NodeFactory factory, bool relocsOnly) | ||
| { | ||
| Builder = new ObjectDataBuilder(factory, relocsOnly); | ||
| TargetRegister = new TargetRegisterMap(factory.Target.OperatingSystem); | ||
| } | ||
|
|
||
| public ObjectDataBuilder Builder; | ||
| public TargetRegisterMap TargetRegister; | ||
|
|
||
| // Assembly stub creation api. TBD, actually make this general purpose | ||
|
|
||
| //ebreak | ||
| public void EmitBreak() | ||
| { | ||
| Builder.EmitUInt(0x00100073); | ||
| } | ||
|
|
||
| public void EmitLI(Register regDst, ushort imm12) | ||
| { | ||
|
There was a problem hiding this comment. Please add assert for imm12. There was a problem hiding this comment. Thanks, I’ll fix this |
||
| EmitADDI(regDst, Register.X0, imm12); | ||
| } | ||
|
|
||
| public void EmitMOV(Register regDst, Register regSrc) | ||
| { | ||
| EmitADDI(regDst, regSrc, 0); | ||
| } | ||
|
|
||
| public void EmitMOV(Register regDst, ISymbolNode symbol) | ||
| { | ||
| Builder.EmitReloc(symbol, RelocType.IMAGE_REL_BASED_RISCV64_PC); | ||
| //auipc reg, off-hi-20bits | ||
| EmitPC(regDst); | ||
| //addi reg, reg, off-lo-12bits | ||
| EmitADDI(regDst, regDst, 0); | ||
| } | ||
|
|
||
| // auipc regDst, 0 | ||
| public void EmitPC(Register regDst) | ||
| { | ||
| Debug.Assert((uint)regDst > 0 && (uint)regDst < 32); | ||
| Builder.EmitUInt(0x00000017u | (uint)regDst << 7); | ||
| } | ||
|
|
||
| // addi regDst, regSrc, offset | ||
| public void EmitADDI(Register regDst, Register regSrc, int offset) | ||
| { | ||
| Debug.Assert((uint)regDst <= 0x1f); | ||
| Debug.Assert((uint)regSrc <= 0x1f); | ||
| Debug.Assert((offset >= -2048) && (offset <= 2047)); | ||
| Builder.EmitUInt((uint)(0x00000013u | ((uint)regSrc << 15) | ((uint)regDst << 7) | (uint)((offset & 0xfff) << 20))); | ||
| } | ||
|
|
||
| // xori regDst, regSrc, offset | ||
| public void EmitXORI(Register regDst, Register regSrc, int offset) | ||
| { | ||
| Debug.Assert((offset >= -2048) && (offset <= 2047)); | ||
| Builder.EmitUInt((uint)(0x00004013u | ((uint)regSrc << 15) | ((uint)regDst << 7) | (uint)((offset & 0xfff) << 20))); | ||
| } | ||
|
|
||
| // ld regDst, offset(regSrc) | ||
| public void EmitLD(Register regDst, Register regSrc, int offset) | ||
| { | ||
| Debug.Assert((offset >= -2048) && (offset <= 2047)); | ||
| Builder.EmitUInt((uint)(0x00003003u | ((uint)regSrc << 15) | ((uint)regDst << 7) | (uint)((offset & 0xfff) << 20))); | ||
| } | ||
|
|
||
| // jalr regDst, offset(regSrc) | ||
| public void EmitJALR(Register regDst, Register regSrc, int offset) | ||
| { | ||
| Debug.Assert((offset >= -2048) && (offset <= 2047)); | ||
| Builder.EmitUInt((uint)(0x00000067u | ((uint)regSrc << 15) | ((uint)regDst << 7) | (uint)((offset & 0xfff) << 20))); | ||
| } | ||
|
|
||
| public void EmitRET() | ||
| { | ||
| // jalr x0,0(x1) | ||
| EmitJALR(Register.X0, Register.X1, 0); | ||
| } | ||
|
|
||
| public void EmitJMP(Register reg) | ||
| { | ||
| //jalr x0, 0(reg) | ||
| EmitJALR(Register.X0, reg, 0); | ||
| } | ||
|
|
||
| public void EmitJMP(ISymbolNode symbol) | ||
| { | ||
| if (symbol.RepresentsIndirectionCell) | ||
| { | ||
| //auipc x29, 0 | ||
| EmitPC(Register.X29); | ||
| //ld x29,16(x29) | ||
| EmitLD(Register.X29, Register.X29, 16); | ||
| //ld x29,0(x29) | ||
| EmitLD(Register.X29, Register.X29, 0); | ||
| //jalr x0,0(x29) | ||
| EmitJALR(Register.X0, Register.X29, 0); | ||
|
|
||
| Builder.EmitReloc(symbol, RelocType.IMAGE_REL_BASED_DIR64); | ||
| } | ||
| else | ||
| { | ||
| Builder.EmitUInt(0x00000000); // bad code. | ||
| throw new NotImplementedException(); | ||
| } | ||
| } | ||
|
|
||
| public void EmitRETIfZero(Register regSrc) | ||
| { | ||
| // bne regSrc, x0, 8 | ||
| Builder.EmitUInt((uint)(0x00001463 | ((uint)regSrc << 15))); | ||
| EmitRET(); | ||
| } | ||
|
|
||
| public void EmitJE(Register regSrc, ISymbolNode symbol) | ||
|
There was a problem hiding this comment. I think There was a problem hiding this comment. It's actually the same as for other arches meaning that we jump over the stuff generated by emitjmp in case condition is reversed (in this case There was a problem hiding this comment. I think This is just my suggestion. You can freely choose. :) There was a problem hiding this comment. Ah, my bad, thought about the other thing, yes, you are right :) I meant that it's not |
||
| { | ||
| uint offset = symbol.RepresentsIndirectionCell ? 14u : 4u; | ||
| uint encodedOffset = ((offset & 0x1e) << 7) | ((offset & 0x7e0) << 20) | ((offset & 0x800) >> 4) | ((offset & 0x1000) << 19); | ||
|
There was a problem hiding this comment. With your encodedOffset logic, offset should be 7 << 2 : 2 << 2. Please check again. |
||
| // bne regSrc, x0, offset | ||
| Builder.EmitUInt((uint)(0x00001063 | ((uint)regSrc << 15) | encodedOffset)); | ||
| EmitJMP(symbol); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using Internal.TypeSystem; | ||
|
|
||
| namespace ILCompiler.DependencyAnalysis.RiscV64 | ||
| { | ||
| /// <summary> | ||
| /// Maps logical registers to physical registers on a specified OS. | ||
| /// </summary> | ||
| public struct TargetRegisterMap | ||
| { | ||
| public readonly Register Arg0; | ||
| public readonly Register Arg1; | ||
| public readonly Register Arg2; | ||
| public readonly Register Arg3; | ||
| public readonly Register Arg4; | ||
| public readonly Register Arg5; | ||
| public readonly Register Arg6; | ||
| public readonly Register Arg7; | ||
| public readonly Register IntraProcedureCallScratch1; | ||
| public readonly Register Result; | ||
|
|
||
| public TargetRegisterMap(TargetOS os) | ||
| { | ||
| Arg0 = Register.X10; | ||
| Arg1 = Register.X11; | ||
| Arg2 = Register.X12; | ||
| Arg3 = Register.X13; | ||
| Arg4 = Register.X14; | ||
| Arg5 = Register.X15; | ||
| Arg6 = Register.X16; | ||
| Arg7 = Register.X17; | ||
| IntraProcedureCallScratch1 = Register.X28; | ||
| Result = Register.X10; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -141,6 +141,10 @@ public SimdVectorLength GetVectorTSimdVector() | |
| { | ||
| return SimdVectorLength.None; | ||
| } | ||
| else if (_targetArchitecture == TargetArchitecture.RiscV64) | ||
| { | ||
| return SimdVectorLength.None; | ||
| } | ||
| else | ||
| { | ||
| Debug.Assert(false); // Unknown architecture | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a tracking work item for this TODO? It would be for the best to keep hard coded numbers like this one for as short as possible.