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

Update r2r version and do any removals that we wanted to do at the next R2R minimum version bump #100310

Closed
wants to merge 4 commits into from
Closed

Update r2r version and do any removals that we wanted to do at the next R2R minimum version bump #100310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
438810d
Update R2R minimum version and remove FltRound and DblRound helpers
davidwrighton Mar 26, 2024
30afbc9
Fix build break
davidwrighton Mar 26, 2024
09ec92a
Merge branch 'main' of https://github.com/dotnet/runtime into update_…
davidwrighton Mar 26, 2024
dcaee5a
Fix build break
davidwrighton Mar 26, 2024
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
2 changes: 0 additions & 2 deletions src/coreclr/inc/corinfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,8 +397,6 @@ enum CorInfoHelpFunc
CORINFO_HELP_DBL2ULNG_OVF,
CORINFO_HELP_FLTREM,
CORINFO_HELP_DBLREM,
CORINFO_HELP_FLTROUND, // unused, remove once MINIMUM_READYTORUN_MAJOR_VERSION > 9
CORINFO_HELP_DBLROUND, // unused, remove once MINIMUM_READYTORUN_MAJOR_VERSION > 9

/* Allocating a new object. Always use ICorClassInfo::getNewHelper() to decide
which is the right helper to use to allocate an object of a given type. */
Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/inc/jithelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@
JITHELPER(CORINFO_HELP_DBL2ULNG_OVF, JIT_Dbl2ULngOvf, CORINFO_HELP_SIG_8_STACK)
JITHELPER(CORINFO_HELP_FLTREM, JIT_FltRem, CORINFO_HELP_SIG_8_STACK)
JITHELPER(CORINFO_HELP_DBLREM, JIT_DblRem, CORINFO_HELP_SIG_16_STACK)
DYNAMICJITHELPER(CORINFO_HELP_FLTROUND, NULL, CORINFO_HELP_SIG_8_STACK)
DYNAMICJITHELPER(CORINFO_HELP_DBLROUND, NULL, CORINFO_HELP_SIG_16_STACK)

// Allocating a new object
JITHELPER(CORINFO_HELP_NEWFAST, JIT_New, CORINFO_HELP_SIG_REG_ONLY)
Expand Down
14 changes: 6 additions & 8 deletions src/coreclr/inc/readytorun.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
// src/coreclr/nativeaot/Runtime/inc/ModuleHeaders.h
// If you update this, ensure you run `git grep MINIMUM_READYTORUN_MAJOR_VERSION`
// and handle pending work.
#define READYTORUN_MAJOR_VERSION 0x0009
#define READYTORUN_MINOR_VERSION 0x0002
#define READYTORUN_MAJOR_VERSION 0x000A
#define READYTORUN_MINOR_VERSION 0x0000

#define MINIMUM_READYTORUN_MAJOR_VERSION 0x009
#define MINIMUM_READYTORUN_MAJOR_VERSION 0x00A

// R2R Version 2.1 adds the InliningInfo section
// R2R Version 2.2 adds the ProfileDataInfo section
Expand All @@ -34,6 +34,7 @@
// R2R Version 9.0 adds support for the Vector512 type
// R2R Version 9.1 adds new helpers to allocate objects on frozen segments
// R2R Version 9.2 adds MemZero and NativeMemSet helpers
// R2R Version 10.0 changes the algorithm for statics layout
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
// R2R Version 10.0 changes the algorithm for statics layout
// R2R Version 10.0 changes the algorithm for statics layout
// R2R 10.0 is not compatible with 9.x or earlier



struct READYTORUN_CORE_HEADER
Expand Down Expand Up @@ -403,11 +404,8 @@ enum ReadyToRunHelper
READYTORUN_HELPER_DblRem = 0xE0,
READYTORUN_HELPER_FltRem = 0xE1,

// These two helpers can be removed once MINIMUM_READYTORUN_MAJOR_VERSION is 10+
// alongside the CORINFO_HELP_FLTROUND/CORINFO_HELP_DBLROUND
// counterparts and all related code.
READYTORUN_HELPER_DblRound = 0xE2,
READYTORUN_HELPER_FltRound = 0xE3,
// Formerly READYTORUN_HELPER_DblRound = 0xE2,
// Formerly READYTORUN_HELPER_FltRound = 0xE3,

#ifdef FEATURE_EH_FUNCLETS
// Personality routines
Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/inc/readytorunhelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@ HELPER(READYTORUN_HELPER_Dbl2ULngOvf, CORINFO_HELP_DBL2ULNG_OVF,

HELPER(READYTORUN_HELPER_FltRem, CORINFO_HELP_FLTREM, )
HELPER(READYTORUN_HELPER_DblRem, CORINFO_HELP_DBLREM, )
HELPER(READYTORUN_HELPER_FltRound, CORINFO_HELP_FLTROUND, )
HELPER(READYTORUN_HELPER_DblRound, CORINFO_HELP_DBLROUND, )

#ifndef TARGET_X86
HELPER(READYTORUN_HELPER_PersonalityRoutine, CORINFO_HELP_EE_PERSONALITY_ROUTINE, OPTIMIZEFORSIZE)
Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/jit/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1542,8 +1542,6 @@ void HelperCallProperties::init()
case CORINFO_HELP_DBL2ULNG:
case CORINFO_HELP_FLTREM:
case CORINFO_HELP_DBLREM:
case CORINFO_HELP_FLTROUND:
case CORINFO_HELP_DBLROUND:

isPure = true;
noThrow = true;
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/tools/Common/Internal/Runtime/ModuleHeaders.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ internal struct ReadyToRunHeaderConstants
{
public const uint Signature = 0x00525452; // 'RTR'

public const ushort CurrentMajorVersion = 9;
public const ushort CurrentMinorVersion = 2;
public const ushort CurrentMajorVersion = 10;
public const ushort CurrentMinorVersion = 0;
}
#if READYTORUN
#pragma warning disable 0169
Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/tools/Common/Internal/Runtime/ReadyToRunConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,6 @@ public enum ReadyToRunHelper
// Floating point ops
DblRem = 0xE0,
FltRem = 0xE1,
DblRound = 0xE2,
FltRound = 0xE3,

// Personality routines
PersonalityRoutine = 0xF0,
Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/tools/Common/JitInterface/CorInfoHelpFunc.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ public enum CorInfoHelpFunc
CORINFO_HELP_DBL2ULNG_OVF,
CORINFO_HELP_FLTREM,
CORINFO_HELP_DBLREM,
CORINFO_HELP_FLTROUND,
CORINFO_HELP_DBLROUND,

/* Allocating a new object. Always use ICorClassInfo::getNewHelper() to decide
which is the right helper to use to allocate an object of a given type. */
Expand Down
6 changes: 0 additions & 6 deletions src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,12 +1167,6 @@ private ISymbolNode GetHelperFtnUncached(CorInfoHelpFunc ftnNum)
case CorInfoHelpFunc.CORINFO_HELP_DBLREM:
id = ReadyToRunHelper.DblRem;
break;
case CorInfoHelpFunc.CORINFO_HELP_FLTROUND:
id = ReadyToRunHelper.FltRound;
break;
case CorInfoHelpFunc.CORINFO_HELP_DBLROUND:
id = ReadyToRunHelper.DblRound;
break;

case CorInfoHelpFunc.CORINFO_HELP_CHKCASTANY:
id = ReadyToRunHelper.CheckCastAny;
Expand Down
Loading
Loading