Fix Unnecessary sign-extension for (nuint)span.Length#88136

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

Merged
jakobbotsch merged 19 commits into from
Oct 10, 2023
Merged

Fix Unnecessary sign-extension for (nuint)span.Length#88136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f403ba2
unconditionally set isNeverNegative in morph, use that data when opti…
En3Tho Jun 28, 2023
d3e96b8
cr, change condition and apply optimization to winX64 only
En3Tho Jun 29, 2023
0bfe3cd
apply suggestions and add lclfld check too
En3Tho Jun 30, 2023
914da44
Run jit-format
En3Tho Jun 30, 2023
e73dd3e
ADDED CORINFO_FLG_SPAN
En3Tho Jul 4, 2023
d6652bc
Address CR
En3Tho Jul 4, 2023
2dc4601
Pull main and resolve conflicts
En3Tho Jul 4, 2023
bfb1395
Redo CR fix after pull main.
En3Tho Jul 4, 2023
5edb8c9
Merge branch 'main' of https://github.com/dotnet/runtime into issue-8…
En3Tho Aug 8, 2023
cdb554f
merge pull main & removed corinfo flag. A quick check if these change…
En3Tho Aug 14, 2023
0a62f7a
fix build for ee
En3Tho Aug 14, 2023
52021c3
missed this one
En3Tho Aug 14, 2023
d665ba5
marked span & readonlyspan as intrinsics, handled checking
En3Tho Aug 14, 2023
7a6d356
CR: removed IsSpan from GenTreeLclVar and used proposed change in Pro…
En3Tho Sep 29, 2023
1f0431a
CR: forgot to remove redundant SetIsSpan(true) call. Fixed
En3Tho Oct 1, 2023
eadf5fe
restored some lclmorph lines to keep diff simpler
En3Tho Oct 1, 2023
5b0b0df
It seems like it affects something after all?
En3Tho Oct 3, 2023
6ce32b2
Optimize spans only when Optimizations are enabled
En3Tho Oct 9, 2023
8e82297
revert OptimizationEnabled check
En3Tho Oct 10, 2023
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
31 changes: 31 additions & 0 deletions src/coreclr/jit/assertionprop.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -168,6 +168,37 @@ bool IntegralRange::Contains(int64_t value) const
}
break;

case GT_IND:
{
GenTree* const addr = node->AsIndir()->Addr();

if (node->TypeIs(TYP_INT) && addr->OperIs(GT_ADD) && addr->gtGetOp1()->OperIs(GT_LCL_VAR) &&
addr->gtGetOp2()->IsIntegralConst(OFFSETOF__CORINFO_Span__length))
{
GenTreeLclVar* const lclVar = addr->gtGetOp1()->AsLclVar();

if (compiler->lvaGetDesc(lclVar->GetLclNum())->IsSpan())
{
assert(compiler->lvaIsImplicitByRefLocal(lclVar->GetLclNum()));
return {SymbolicIntegerValue::Zero, UpperBoundForType(rangeType)};
}
}
break;
}

case GT_LCL_FLD:
{
GenTreeLclFld* const lclFld = node->AsLclFld();
LclVarDsc* const varDsc = compiler->lvaGetDesc(lclFld);

if (node->TypeIs(TYP_INT) && varDsc->IsSpan() && lclFld->GetLclOffs() == OFFSETOF__CORINFO_Span__length)
{
return {SymbolicIntegerValue::Zero, UpperBoundForType(rangeType)};
}

break;
}

case GT_LCL_VAR:
{
LclVarDsc* const varDsc = compiler->lvaGetDesc(node->AsLclVar());
Expand Down
26 changes: 26 additions & 0 deletions src/coreclr/jit/compiler.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -661,6 +661,8 @@ class LclVarDsc
private:
unsigned char lvIsNeverNegative : 1; // The local is known to be never negative

unsigned char lvIsSpan : 1; // The local is a Span<T>
Comment thread
EgorBo marked this conversation as resolved.

public:
union {
unsigned lvFieldLclStart; // The index of the local var representing the first field in the promoted struct
Expand DownExpand Up@@ -964,6 +966,18 @@ class LclVarDsc
lvIsNeverNegative = value;
}

// Is this is local a Span<T>?
bool IsSpan() const
{
return lvIsSpan;
}

// Is this is local a Span<T>?
void SetIsSpan(bool value)
{
lvIsSpan = value;
}

/////////////////////

regNumber GetArgInitReg() const
Expand DownExpand Up@@ -8549,6 +8563,18 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
return strcmp(ns, "System.Runtime.Intrinsics") == 0;
}

bool isSpanClass(const CORINFO_CLASS_HANDLE clsHnd)
{
if (isIntrinsicType(clsHnd))
{
const char* namespaceName = nullptr;
const char* className = getClassNameFromMetadata(clsHnd, &namespaceName);
return strcmp(namespaceName, "System") == 0 &&
(strcmp(className, "Span`1") == 0 || strcmp(className, "ReadOnlySpan`1") == 0);
}
return false;
}

#ifdef FEATURE_SIMD
// Have we identified any SIMD types?
// This is currently used by struct promotion to avoid getting type information for a struct
Expand Down
11 changes: 6 additions & 5 deletions src/coreclr/jit/lclmorph.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1331,18 +1331,19 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>

LclVarDsc* fieldVarDsc = m_compiler->lvaGetDesc(fieldLclNum);

// Span's Length is never negative unconditionally
if (isSpanLength && (accessSize == genTypeSize(TYP_INT)))
{
fieldVarDsc->SetIsNeverNegative(true);
}

// Retargeting the indirection to reference the promoted field would make it "wide", exposing
// the whole parent struct (with all of its fields).
if (accessSize > genTypeSize(fieldVarDsc))
{
return BAD_VAR_NUM;
}

if (isSpanLength && (accessSize == genTypeSize(TYP_INT)))
{
fieldVarDsc->SetIsNeverNegative(true);
}

JITDUMP("Replacing the field in promoted struct with local var V%02u\n", fieldLclNum);
m_stmtModified = true;

Expand Down
7 changes: 7 additions & 0 deletions src/coreclr/jit/lclvars.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2392,6 +2392,11 @@ void Compiler::StructPromotionHelper::PromoteStructVar(unsigned lclNum)
fieldVarDsc->lvIsOSRLocal = varDsc->lvIsOSRLocal;
fieldVarDsc->lvIsOSRExposedLocal = varDsc->lvIsOSRExposedLocal;

if (varDsc->IsSpan() && fieldVarDsc->lvFldOffset == OFFSETOF__CORINFO_Span__length)
{
fieldVarDsc->SetIsNeverNegative(true);
}

// This new local may be the first time we've seen a long typed local.
if (fieldVarDsc->lvType == TYP_LONG)
{
Expand DownExpand Up@@ -2933,6 +2938,8 @@ void Compiler::lvaSetStruct(unsigned varNum, ClassLayout* layout, bool unsafeVal
}
#endif // not TARGET_64BIT

varDsc->SetIsSpan(this->isSpanClass(layout->GetClassHandle()));
Comment thread
En3Tho marked this conversation as resolved.

// Check whether this local is an unsafe value type and requires GS cookie protection.
// GS checks require the stack to be re-ordered, which can't be done with EnC.
if (unsafeValueClsCheck)
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Private.CoreLib/src/System/ReadOnlySpan.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace System
#pragma warning disable SYSLIB1056 // Specified native type is invalid
[NativeMarshalling(typeof(ReadOnlySpanMarshaller<,>))]
#pragma warning restore SYSLIB1056 // Specified native type is invalid
[Intrinsic]
public readonly ref struct ReadOnlySpan<T>
{
/// <summary>A byref or a native ptr.</summary>
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Private.CoreLib/src/System/Span.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace System
#pragma warning disable SYSLIB1056 // Specified native type is invalid
[NativeMarshalling(typeof(SpanMarshaller<,>))]
#pragma warning restore SYSLIB1056 // Specified native type is invalid
[Intrinsic]
public readonly ref struct Span<T>
{
/// <summary>A byref or a native ptr.</summary>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix Unnecessary sign-extension for (nuint)span.Length#88136

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

 Merged

jakobbotsch
merged 19 commits into

from

Oct 10, 2023
 Merged


Fix Unnecessary sign-extension for (nuint)span.Length#88136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
f403ba2

unconditionally set isNeverNegative in morph, use that data when opti…


En3Tho Jun 28, 2023
d3e96b8

cr, change condition and apply optimization to winX64 only


En3Tho Jun 29, 2023
0bfe3cd

apply suggestions and add lclfld check too


En3Tho Jun 30, 2023
914da44

Run jit-format


En3Tho Jun 30, 2023
e73dd3e

ADDED CORINFO_FLG_SPAN


En3Tho Jul 4, 2023
d6652bc

Address CR


En3Tho Jul 4, 2023
2dc4601

Pull main and resolve conflicts


En3Tho Jul 4, 2023
bfb1395

Redo CR fix after pull main.


En3Tho Jul 4, 2023
5edb8c9

Merge branch 'main' of https://github.com/dotnet/runtime into issue-8…


En3Tho Aug 8, 2023
cdb554f

merge pull main & removed corinfo flag. A quick check if these change…


En3Tho Aug 14, 2023
0a62f7a

fix build for ee


En3Tho Aug 14, 2023
52021c3

missed this one


En3Tho Aug 14, 2023
d665ba5

marked span & readonlyspan as intrinsics, handled checking


En3Tho Aug 14, 2023
7a6d356

CR: removed IsSpan from GenTreeLclVar and used proposed change in Pro…


En3Tho Sep 29, 2023
1f0431a

CR: forgot to remove redundant SetIsSpan(true) call. Fixed


En3Tho Oct 1, 2023
eadf5fe

restored some lclmorph lines to keep diff simpler


En3Tho Oct 1, 2023
5b0b0df

It seems like it affects something after all?


En3Tho Oct 3, 2023
6ce32b2

Optimize spans only when Optimizations are enabled


En3Tho Oct 9, 2023
8e82297

revert OptimizationEnabled check


En3Tho Oct 10, 2023

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


31 changes: 31 additions & 0 deletions
src/coreclr/jit/assertionprop.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,6 +168,37 @@ bool IntegralRange::Contains(int64_t value) const
 }
 break;

 case GT_IND:
 {
 GenTree* const addr = node->AsIndir()->Addr();

 if (node->TypeIs(TYP_INT) && addr->OperIs(GT_ADD) && addr->gtGetOp1()->OperIs(GT_LCL_VAR) &&
 addr->gtGetOp2()->IsIntegralConst(OFFSETOF__CORINFO_Span__length))
 {
 GenTreeLclVar* const lclVar = addr->gtGetOp1()->AsLclVar();

 if (compiler->lvaGetDesc(lclVar->GetLclNum())->IsSpan())
 {
 assert(compiler->lvaIsImplicitByRefLocal(lclVar->GetLclNum()));
 return {SymbolicIntegerValue::Zero, UpperBoundForType(rangeType)};
 }
 }
 break;
 }

 case GT_LCL_FLD:
 {
 GenTreeLclFld* const lclFld = node->AsLclFld();
 LclVarDsc* const varDsc = compiler->lvaGetDesc(lclFld);

 if (node->TypeIs(TYP_INT) && varDsc->IsSpan() && lclFld->GetLclOffs() == OFFSETOF__CORINFO_Span__length)
 {
 return {SymbolicIntegerValue::Zero, UpperBoundForType(rangeType)};
 }

 break;
 }

 case GT_LCL_VAR:
 {
 LclVarDsc* const varDsc = compiler->lvaGetDesc(node->AsLclVar());
Expand Down

26 changes: 26 additions & 0 deletions
src/coreclr/jit/compiler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -661,6 +661,8 @@ class LclVarDsc
private:
 unsigned char lvIsNeverNegative : 1; // The local is known to be never negative

 unsigned char lvIsSpan : 1; // The local is a Span<T>
Comment thread
EgorBo marked this conversation as resolved.


public:
 union {
 unsigned lvFieldLclStart; // The index of the local var representing the first field in the promoted struct
Expand DownExpand Up@@ -964,6 +966,18 @@ class LclVarDsc
 lvIsNeverNegative = value;
 }

 // Is this is local a Span<T>?
 bool IsSpan() const
 {
 return lvIsSpan;
 }

 // Is this is local a Span<T>?
 void SetIsSpan(bool value)
 {
 lvIsSpan = value;
 }

 /////////////////////

 regNumber GetArgInitReg() const
Expand DownExpand Up@@ -8549,6 +8563,18 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 return strcmp(ns, "System.Runtime.Intrinsics") == 0;
 }

 bool isSpanClass(const CORINFO_CLASS_HANDLE clsHnd)
 {
 if (isIntrinsicType(clsHnd))
 {
 const char* namespaceName = nullptr;
 const char* className = getClassNameFromMetadata(clsHnd, &namespaceName);
 return strcmp(namespaceName, "System") == 0 &&
 (strcmp(className, "Span`1") == 0 || strcmp(className, "ReadOnlySpan`1") == 0);
 }
 return false;
 }

#ifdef FEATURE_SIMD
 // Have we identified any SIMD types?
 // This is currently used by struct promotion to avoid getting type information for a struct
Expand Down

11 changes: 6 additions & 5 deletions
src/coreclr/jit/lclmorph.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1331,18 +1331,19 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>

 LclVarDsc* fieldVarDsc = m_compiler->lvaGetDesc(fieldLclNum);

 // Span's Length is never negative unconditionally
 if (isSpanLength && (accessSize == genTypeSize(TYP_INT)))
 {
 fieldVarDsc->SetIsNeverNegative(true);
 }

 // Retargeting the indirection to reference the promoted field would make it "wide", exposing
 // the whole parent struct (with all of its fields).
 if (accessSize > genTypeSize(fieldVarDsc))
 {
 return BAD_VAR_NUM;
 }

 if (isSpanLength && (accessSize == genTypeSize(TYP_INT)))
 {
 fieldVarDsc->SetIsNeverNegative(true);
 }

 JITDUMP("Replacing the field in promoted struct with local var V%02u\n", fieldLclNum);
 m_stmtModified = true;

Expand Down

7 changes: 7 additions & 0 deletions
src/coreclr/jit/lclvars.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2392,6 +2392,11 @@ void Compiler::StructPromotionHelper::PromoteStructVar(unsigned lclNum)
 fieldVarDsc->lvIsOSRLocal = varDsc->lvIsOSRLocal;
 fieldVarDsc->lvIsOSRExposedLocal = varDsc->lvIsOSRExposedLocal;

 if (varDsc->IsSpan() && fieldVarDsc->lvFldOffset == OFFSETOF__CORINFO_Span__length)
 {
 fieldVarDsc->SetIsNeverNegative(true);
 }

 // This new local may be the first time we've seen a long typed local.
 if (fieldVarDsc->lvType == TYP_LONG)
 {
Expand DownExpand Up@@ -2933,6 +2938,8 @@ void Compiler::lvaSetStruct(unsigned varNum, ClassLayout* layout, bool unsafeVal
 }
#endif // not TARGET_64BIT

 varDsc->SetIsSpan(this->isSpanClass(layout->GetClassHandle()));
Comment thread
En3Tho marked this conversation as resolved.


 // Check whether this local is an unsafe value type and requires GS cookie protection.
 // GS checks require the stack to be re-ordered, which can't be done with EnC.
 if (unsafeValueClsCheck)
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Private.CoreLib/src/System/ReadOnlySpan.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace System
#pragma warning disable SYSLIB1056 // Specified native type is invalid
 [NativeMarshalling(typeof(ReadOnlySpanMarshaller<,>))]
#pragma warning restore SYSLIB1056 // Specified native type is invalid
 [Intrinsic]
 public readonly ref struct ReadOnlySpan<T>
 {
 /// <summary>A byref or a native ptr.</summary>
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Private.CoreLib/src/System/Span.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace System
#pragma warning disable SYSLIB1056 // Specified native type is invalid
 [NativeMarshalling(typeof(SpanMarshaller<,>))]
#pragma warning restore SYSLIB1056 // Specified native type is invalid
 [Intrinsic]
 public readonly ref struct Span<T>
 {
 /// <summary>A byref or a native ptr.</summary>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix Unnecessary sign-extension for (nuint)span.Length#88136

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

 Merged

jakobbotsch
merged 19 commits into

from

Oct 10, 2023
 Merged


Fix Unnecessary sign-extension for (nuint)span.Length#88136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
f403ba2

unconditionally set isNeverNegative in morph, use that data when opti…


En3Tho Jun 28, 2023
d3e96b8

cr, change condition and apply optimization to winX64 only


En3Tho Jun 29, 2023
0bfe3cd

apply suggestions and add lclfld check too


En3Tho Jun 30, 2023
914da44

Run jit-format


En3Tho Jun 30, 2023
e73dd3e

ADDED CORINFO_FLG_SPAN


En3Tho Jul 4, 2023
d6652bc

Address CR


En3Tho Jul 4, 2023
2dc4601

Pull main and resolve conflicts


En3Tho Jul 4, 2023
bfb1395

Redo CR fix after pull main.


En3Tho Jul 4, 2023
5edb8c9

Merge branch 'main' of https://github.com/dotnet/runtime into issue-8…


En3Tho Aug 8, 2023
cdb554f

merge pull main & removed corinfo flag. A quick check if these change…


En3Tho Aug 14, 2023
0a62f7a

fix build for ee


En3Tho Aug 14, 2023
52021c3

missed this one


En3Tho Aug 14, 2023
d665ba5

marked span & readonlyspan as intrinsics, handled checking


En3Tho Aug 14, 2023
7a6d356

CR: removed IsSpan from GenTreeLclVar and used proposed change in Pro…


En3Tho Sep 29, 2023
1f0431a

CR: forgot to remove redundant SetIsSpan(true) call. Fixed


En3Tho Oct 1, 2023
eadf5fe

restored some lclmorph lines to keep diff simpler


En3Tho Oct 1, 2023
5b0b0df

It seems like it affects something after all?


En3Tho Oct 3, 2023
6ce32b2

Optimize spans only when Optimizations are enabled


En3Tho Oct 9, 2023
8e82297

revert OptimizationEnabled check


En3Tho Oct 10, 2023

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


31 changes: 31 additions & 0 deletions
src/coreclr/jit/assertionprop.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,6 +168,37 @@ bool IntegralRange::Contains(int64_t value) const
 }
 break;

 case GT_IND:
 {
 GenTree* const addr = node->AsIndir()->Addr();

 if (node->TypeIs(TYP_INT) && addr->OperIs(GT_ADD) && addr->gtGetOp1()->OperIs(GT_LCL_VAR) &&
 addr->gtGetOp2()->IsIntegralConst(OFFSETOF__CORINFO_Span__length))
 {
 GenTreeLclVar* const lclVar = addr->gtGetOp1()->AsLclVar();

 if (compiler->lvaGetDesc(lclVar->GetLclNum())->IsSpan())
 {
 assert(compiler->lvaIsImplicitByRefLocal(lclVar->GetLclNum()));
 return {SymbolicIntegerValue::Zero, UpperBoundForType(rangeType)};
 }
 }
 break;
 }

 case GT_LCL_FLD:
 {
 GenTreeLclFld* const lclFld = node->AsLclFld();
 LclVarDsc* const varDsc = compiler->lvaGetDesc(lclFld);

 if (node->TypeIs(TYP_INT) && varDsc->IsSpan() && lclFld->GetLclOffs() == OFFSETOF__CORINFO_Span__length)
 {
 return {SymbolicIntegerValue::Zero, UpperBoundForType(rangeType)};
 }

 break;
 }

 case GT_LCL_VAR:
 {
 LclVarDsc* const varDsc = compiler->lvaGetDesc(node->AsLclVar());
Expand Down

26 changes: 26 additions & 0 deletions
src/coreclr/jit/compiler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -661,6 +661,8 @@ class LclVarDsc
private:
 unsigned char lvIsNeverNegative : 1; // The local is known to be never negative

 unsigned char lvIsSpan : 1; // The local is a Span<T>
Comment thread
EgorBo marked this conversation as resolved.


public:
 union {
 unsigned lvFieldLclStart; // The index of the local var representing the first field in the promoted struct
Expand DownExpand Up@@ -964,6 +966,18 @@ class LclVarDsc
 lvIsNeverNegative = value;
 }

 // Is this is local a Span<T>?
 bool IsSpan() const
 {
 return lvIsSpan;
 }

 // Is this is local a Span<T>?
 void SetIsSpan(bool value)
 {
 lvIsSpan = value;
 }

 /////////////////////

 regNumber GetArgInitReg() const
Expand DownExpand Up@@ -8549,6 +8563,18 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 return strcmp(ns, "System.Runtime.Intrinsics") == 0;
 }

 bool isSpanClass(const CORINFO_CLASS_HANDLE clsHnd)
 {
 if (isIntrinsicType(clsHnd))
 {
 const char* namespaceName = nullptr;
 const char* className = getClassNameFromMetadata(clsHnd, &namespaceName);
 return strcmp(namespaceName, "System") == 0 &&
 (strcmp(className, "Span`1") == 0 || strcmp(className, "ReadOnlySpan`1") == 0);
 }
 return false;
 }

#ifdef FEATURE_SIMD
 // Have we identified any SIMD types?
 // This is currently used by struct promotion to avoid getting type information for a struct
Expand Down

11 changes: 6 additions & 5 deletions
src/coreclr/jit/lclmorph.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1331,18 +1331,19 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>

 LclVarDsc* fieldVarDsc = m_compiler->lvaGetDesc(fieldLclNum);

 // Span's Length is never negative unconditionally
 if (isSpanLength && (accessSize == genTypeSize(TYP_INT)))
 {
 fieldVarDsc->SetIsNeverNegative(true);
 }

 // Retargeting the indirection to reference the promoted field would make it "wide", exposing
 // the whole parent struct (with all of its fields).
 if (accessSize > genTypeSize(fieldVarDsc))
 {
 return BAD_VAR_NUM;
 }

 if (isSpanLength && (accessSize == genTypeSize(TYP_INT)))
 {
 fieldVarDsc->SetIsNeverNegative(true);
 }

 JITDUMP("Replacing the field in promoted struct with local var V%02u\n", fieldLclNum);
 m_stmtModified = true;

Expand Down

7 changes: 7 additions & 0 deletions
src/coreclr/jit/lclvars.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2392,6 +2392,11 @@ void Compiler::StructPromotionHelper::PromoteStructVar(unsigned lclNum)
 fieldVarDsc->lvIsOSRLocal = varDsc->lvIsOSRLocal;
 fieldVarDsc->lvIsOSRExposedLocal = varDsc->lvIsOSRExposedLocal;

 if (varDsc->IsSpan() && fieldVarDsc->lvFldOffset == OFFSETOF__CORINFO_Span__length)
 {
 fieldVarDsc->SetIsNeverNegative(true);
 }

 // This new local may be the first time we've seen a long typed local.
 if (fieldVarDsc->lvType == TYP_LONG)
 {
Expand DownExpand Up@@ -2933,6 +2938,8 @@ void Compiler::lvaSetStruct(unsigned varNum, ClassLayout* layout, bool unsafeVal
 }
#endif // not TARGET_64BIT

 varDsc->SetIsSpan(this->isSpanClass(layout->GetClassHandle()));
Comment thread
En3Tho marked this conversation as resolved.


 // Check whether this local is an unsafe value type and requires GS cookie protection.
 // GS checks require the stack to be re-ordered, which can't be done with EnC.
 if (unsafeValueClsCheck)
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Private.CoreLib/src/System/ReadOnlySpan.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace System
#pragma warning disable SYSLIB1056 // Specified native type is invalid
 [NativeMarshalling(typeof(ReadOnlySpanMarshaller<,>))]
#pragma warning restore SYSLIB1056 // Specified native type is invalid
 [Intrinsic]
 public readonly ref struct ReadOnlySpan<T>
 {
 /// <summary>A byref or a native ptr.</summary>
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Private.CoreLib/src/System/Span.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace System
#pragma warning disable SYSLIB1056 // Specified native type is invalid
 [NativeMarshalling(typeof(SpanMarshaller<,>))]
#pragma warning restore SYSLIB1056 // Specified native type is invalid
 [Intrinsic]
 public readonly ref struct Span<T>
 {
 /// <summary>A byref or a native ptr.</summary>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix Unnecessary sign-extension for (nuint)span.Length#88136

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

 Merged

jakobbotsch
merged 19 commits into

from

Oct 10, 2023
 Merged


Fix Unnecessary sign-extension for (nuint)span.Length#88136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
f403ba2

unconditionally set isNeverNegative in morph, use that data when opti…


En3Tho Jun 28, 2023
d3e96b8

cr, change condition and apply optimization to winX64 only


En3Tho Jun 29, 2023
0bfe3cd

apply suggestions and add lclfld check too


En3Tho Jun 30, 2023
914da44

Run jit-format


En3Tho Jun 30, 2023
e73dd3e

ADDED CORINFO_FLG_SPAN


En3Tho Jul 4, 2023
d6652bc

Address CR


En3Tho Jul 4, 2023
2dc4601

Pull main and resolve conflicts


En3Tho Jul 4, 2023
bfb1395

Redo CR fix after pull main.


En3Tho Jul 4, 2023
5edb8c9

Merge branch 'main' of https://github.com/dotnet/runtime into issue-8…


En3Tho Aug 8, 2023
cdb554f

merge pull main & removed corinfo flag. A quick check if these change…


En3Tho Aug 14, 2023
0a62f7a

fix build for ee


En3Tho Aug 14, 2023
52021c3

missed this one


En3Tho Aug 14, 2023
d665ba5

marked span & readonlyspan as intrinsics, handled checking


En3Tho Aug 14, 2023
7a6d356

CR: removed IsSpan from GenTreeLclVar and used proposed change in Pro…


En3Tho Sep 29, 2023
1f0431a

CR: forgot to remove redundant SetIsSpan(true) call. Fixed


En3Tho Oct 1, 2023
eadf5fe

restored some lclmorph lines to keep diff simpler


En3Tho Oct 1, 2023
5b0b0df

It seems like it affects something after all?


En3Tho Oct 3, 2023
6ce32b2

Optimize spans only when Optimizations are enabled


En3Tho Oct 9, 2023
8e82297

revert OptimizationEnabled check


En3Tho Oct 10, 2023

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


31 changes: 31 additions & 0 deletions
src/coreclr/jit/assertionprop.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,6 +168,37 @@ bool IntegralRange::Contains(int64_t value) const
 }
 break;

 case GT_IND:
 {
 GenTree* const addr = node->AsIndir()->Addr();

 if (node->TypeIs(TYP_INT) && addr->OperIs(GT_ADD) && addr->gtGetOp1()->OperIs(GT_LCL_VAR) &&
 addr->gtGetOp2()->IsIntegralConst(OFFSETOF__CORINFO_Span__length))
 {
 GenTreeLclVar* const lclVar = addr->gtGetOp1()->AsLclVar();

 if (compiler->lvaGetDesc(lclVar->GetLclNum())->IsSpan())
 {
 assert(compiler->lvaIsImplicitByRefLocal(lclVar->GetLclNum()));
 return {SymbolicIntegerValue::Zero, UpperBoundForType(rangeType)};
 }
 }
 break;
 }

 case GT_LCL_FLD:
 {
 GenTreeLclFld* const lclFld = node->AsLclFld();
 LclVarDsc* const varDsc = compiler->lvaGetDesc(lclFld);

 if (node->TypeIs(TYP_INT) && varDsc->IsSpan() && lclFld->GetLclOffs() == OFFSETOF__CORINFO_Span__length)
 {
 return {SymbolicIntegerValue::Zero, UpperBoundForType(rangeType)};
 }

 break;
 }

 case GT_LCL_VAR:
 {
 LclVarDsc* const varDsc = compiler->lvaGetDesc(node->AsLclVar());
Expand Down

26 changes: 26 additions & 0 deletions
src/coreclr/jit/compiler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -661,6 +661,8 @@ class LclVarDsc
private:
 unsigned char lvIsNeverNegative : 1; // The local is known to be never negative

 unsigned char lvIsSpan : 1; // The local is a Span<T>
Comment thread
EgorBo marked this conversation as resolved.


public:
 union {
 unsigned lvFieldLclStart; // The index of the local var representing the first field in the promoted struct
Expand DownExpand Up@@ -964,6 +966,18 @@ class LclVarDsc
 lvIsNeverNegative = value;
 }

 // Is this is local a Span<T>?
 bool IsSpan() const
 {
 return lvIsSpan;
 }

 // Is this is local a Span<T>?
 void SetIsSpan(bool value)
 {
 lvIsSpan = value;
 }

 /////////////////////

 regNumber GetArgInitReg() const
Expand DownExpand Up@@ -8549,6 +8563,18 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 return strcmp(ns, "System.Runtime.Intrinsics") == 0;
 }

 bool isSpanClass(const CORINFO_CLASS_HANDLE clsHnd)
 {
 if (isIntrinsicType(clsHnd))
 {
 const char* namespaceName = nullptr;
 const char* className = getClassNameFromMetadata(clsHnd, &namespaceName);
 return strcmp(namespaceName, "System") == 0 &&
 (strcmp(className, "Span`1") == 0 || strcmp(className, "ReadOnlySpan`1") == 0);
 }
 return false;
 }

#ifdef FEATURE_SIMD
 // Have we identified any SIMD types?
 // This is currently used by struct promotion to avoid getting type information for a struct
Expand Down

11 changes: 6 additions & 5 deletions
src/coreclr/jit/lclmorph.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1331,18 +1331,19 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>

 LclVarDsc* fieldVarDsc = m_compiler->lvaGetDesc(fieldLclNum);

 // Span's Length is never negative unconditionally
 if (isSpanLength && (accessSize == genTypeSize(TYP_INT)))
 {
 fieldVarDsc->SetIsNeverNegative(true);
 }

 // Retargeting the indirection to reference the promoted field would make it "wide", exposing
 // the whole parent struct (with all of its fields).
 if (accessSize > genTypeSize(fieldVarDsc))
 {
 return BAD_VAR_NUM;
 }

 if (isSpanLength && (accessSize == genTypeSize(TYP_INT)))
 {
 fieldVarDsc->SetIsNeverNegative(true);
 }

 JITDUMP("Replacing the field in promoted struct with local var V%02u\n", fieldLclNum);
 m_stmtModified = true;

Expand Down

7 changes: 7 additions & 0 deletions
src/coreclr/jit/lclvars.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2392,6 +2392,11 @@ void Compiler::StructPromotionHelper::PromoteStructVar(unsigned lclNum)
 fieldVarDsc->lvIsOSRLocal = varDsc->lvIsOSRLocal;
 fieldVarDsc->lvIsOSRExposedLocal = varDsc->lvIsOSRExposedLocal;

 if (varDsc->IsSpan() && fieldVarDsc->lvFldOffset == OFFSETOF__CORINFO_Span__length)
 {
 fieldVarDsc->SetIsNeverNegative(true);
 }

 // This new local may be the first time we've seen a long typed local.
 if (fieldVarDsc->lvType == TYP_LONG)
 {
Expand DownExpand Up@@ -2933,6 +2938,8 @@ void Compiler::lvaSetStruct(unsigned varNum, ClassLayout* layout, bool unsafeVal
 }
#endif // not TARGET_64BIT

 varDsc->SetIsSpan(this->isSpanClass(layout->GetClassHandle()));
Comment thread
En3Tho marked this conversation as resolved.


 // Check whether this local is an unsafe value type and requires GS cookie protection.
 // GS checks require the stack to be re-ordered, which can't be done with EnC.
 if (unsafeValueClsCheck)
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Private.CoreLib/src/System/ReadOnlySpan.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace System
#pragma warning disable SYSLIB1056 // Specified native type is invalid
 [NativeMarshalling(typeof(ReadOnlySpanMarshaller<,>))]
#pragma warning restore SYSLIB1056 // Specified native type is invalid
 [Intrinsic]
 public readonly ref struct ReadOnlySpan<T>
 {
 /// <summary>A byref or a native ptr.</summary>
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Private.CoreLib/src/System/Span.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace System
#pragma warning disable SYSLIB1056 // Specified native type is invalid
 [NativeMarshalling(typeof(SpanMarshaller<,>))]
#pragma warning restore SYSLIB1056 // Specified native type is invalid
 [Intrinsic]
 public readonly ref struct Span<T>
 {
 /// <summary>A byref or a native ptr.</summary>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix Unnecessary sign-extension for (nuint)span.Length#88136

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

 Merged

jakobbotsch
merged 19 commits into

from

Oct 10, 2023
 Merged


Fix Unnecessary sign-extension for (nuint)span.Length#88136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
f403ba2

unconditionally set isNeverNegative in morph, use that data when opti…


En3Tho Jun 28, 2023
d3e96b8

cr, change condition and apply optimization to winX64 only


En3Tho Jun 29, 2023
0bfe3cd

apply suggestions and add lclfld check too


En3Tho Jun 30, 2023
914da44

Run jit-format


En3Tho Jun 30, 2023
e73dd3e

ADDED CORINFO_FLG_SPAN


En3Tho Jul 4, 2023
d6652bc

Address CR


En3Tho Jul 4, 2023
2dc4601

Pull main and resolve conflicts


En3Tho Jul 4, 2023
bfb1395

Redo CR fix after pull main.


En3Tho Jul 4, 2023
5edb8c9

Merge branch 'main' of https://github.com/dotnet/runtime into issue-8…


En3Tho Aug 8, 2023
cdb554f

merge pull main & removed corinfo flag. A quick check if these change…


En3Tho Aug 14, 2023
0a62f7a

fix build for ee


En3Tho Aug 14, 2023
52021c3

missed this one


En3Tho Aug 14, 2023
d665ba5

marked span & readonlyspan as intrinsics, handled checking


En3Tho Aug 14, 2023
7a6d356

CR: removed IsSpan from GenTreeLclVar and used proposed change in Pro…


En3Tho Sep 29, 2023
1f0431a

CR: forgot to remove redundant SetIsSpan(true) call. Fixed


En3Tho Oct 1, 2023
eadf5fe

restored some lclmorph lines to keep diff simpler


En3Tho Oct 1, 2023
5b0b0df

It seems like it affects something after all?


En3Tho Oct 3, 2023
6ce32b2

Optimize spans only when Optimizations are enabled


En3Tho Oct 9, 2023
8e82297

revert OptimizationEnabled check


En3Tho Oct 10, 2023

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


31 changes: 31 additions & 0 deletions
src/coreclr/jit/assertionprop.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,6 +168,37 @@ bool IntegralRange::Contains(int64_t value) const
 }
 break;

 case GT_IND:
 {
 GenTree* const addr = node->AsIndir()->Addr();

 if (node->TypeIs(TYP_INT) && addr->OperIs(GT_ADD) && addr->gtGetOp1()->OperIs(GT_LCL_VAR) &&
 addr->gtGetOp2()->IsIntegralConst(OFFSETOF__CORINFO_Span__length))
 {
 GenTreeLclVar* const lclVar = addr->gtGetOp1()->AsLclVar();

 if (compiler->lvaGetDesc(lclVar->GetLclNum())->IsSpan())
 {
 assert(compiler->lvaIsImplicitByRefLocal(lclVar->GetLclNum()));
 return {SymbolicIntegerValue::Zero, UpperBoundForType(rangeType)};
 }
 }
 break;
 }

 case GT_LCL_FLD:
 {
 GenTreeLclFld* const lclFld = node->AsLclFld();
 LclVarDsc* const varDsc = compiler->lvaGetDesc(lclFld);

 if (node->TypeIs(TYP_INT) && varDsc->IsSpan() && lclFld->GetLclOffs() == OFFSETOF__CORINFO_Span__length)
 {
 return {SymbolicIntegerValue::Zero, UpperBoundForType(rangeType)};
 }

 break;
 }

 case GT_LCL_VAR:
 {
 LclVarDsc* const varDsc = compiler->lvaGetDesc(node->AsLclVar());
Expand Down

26 changes: 26 additions & 0 deletions
src/coreclr/jit/compiler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -661,6 +661,8 @@ class LclVarDsc
private:
 unsigned char lvIsNeverNegative : 1; // The local is known to be never negative

 unsigned char lvIsSpan : 1; // The local is a Span<T>
Comment thread
EgorBo marked this conversation as resolved.


public:
 union {
 unsigned lvFieldLclStart; // The index of the local var representing the first field in the promoted struct
Expand DownExpand Up@@ -964,6 +966,18 @@ class LclVarDsc
 lvIsNeverNegative = value;
 }

 // Is this is local a Span<T>?
 bool IsSpan() const
 {
 return lvIsSpan;
 }

 // Is this is local a Span<T>?
 void SetIsSpan(bool value)
 {
 lvIsSpan = value;
 }

 /////////////////////

 regNumber GetArgInitReg() const
Expand DownExpand Up@@ -8549,6 +8563,18 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 return strcmp(ns, "System.Runtime.Intrinsics") == 0;
 }

 bool isSpanClass(const CORINFO_CLASS_HANDLE clsHnd)
 {
 if (isIntrinsicType(clsHnd))
 {
 const char* namespaceName = nullptr;
 const char* className = getClassNameFromMetadata(clsHnd, &namespaceName);
 return strcmp(namespaceName, "System") == 0 &&
 (strcmp(className, "Span`1") == 0 || strcmp(className, "ReadOnlySpan`1") == 0);
 }
 return false;
 }

#ifdef FEATURE_SIMD
 // Have we identified any SIMD types?
 // This is currently used by struct promotion to avoid getting type information for a struct
Expand Down

11 changes: 6 additions & 5 deletions
src/coreclr/jit/lclmorph.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1331,18 +1331,19 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>

 LclVarDsc* fieldVarDsc = m_compiler->lvaGetDesc(fieldLclNum);

 // Span's Length is never negative unconditionally
 if (isSpanLength && (accessSize == genTypeSize(TYP_INT)))
 {
 fieldVarDsc->SetIsNeverNegative(true);
 }

 // Retargeting the indirection to reference the promoted field would make it "wide", exposing
 // the whole parent struct (with all of its fields).
 if (accessSize > genTypeSize(fieldVarDsc))
 {
 return BAD_VAR_NUM;
 }

 if (isSpanLength && (accessSize == genTypeSize(TYP_INT)))
 {
 fieldVarDsc->SetIsNeverNegative(true);
 }

 JITDUMP("Replacing the field in promoted struct with local var V%02u\n", fieldLclNum);
 m_stmtModified = true;

Expand Down

7 changes: 7 additions & 0 deletions
src/coreclr/jit/lclvars.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2392,6 +2392,11 @@ void Compiler::StructPromotionHelper::PromoteStructVar(unsigned lclNum)
 fieldVarDsc->lvIsOSRLocal = varDsc->lvIsOSRLocal;
 fieldVarDsc->lvIsOSRExposedLocal = varDsc->lvIsOSRExposedLocal;

 if (varDsc->IsSpan() && fieldVarDsc->lvFldOffset == OFFSETOF__CORINFO_Span__length)
 {
 fieldVarDsc->SetIsNeverNegative(true);
 }

 // This new local may be the first time we've seen a long typed local.
 if (fieldVarDsc->lvType == TYP_LONG)
 {
Expand DownExpand Up@@ -2933,6 +2938,8 @@ void Compiler::lvaSetStruct(unsigned varNum, ClassLayout* layout, bool unsafeVal
 }
#endif // not TARGET_64BIT

 varDsc->SetIsSpan(this->isSpanClass(layout->GetClassHandle()));
Comment thread
En3Tho marked this conversation as resolved.


 // Check whether this local is an unsafe value type and requires GS cookie protection.
 // GS checks require the stack to be re-ordered, which can't be done with EnC.
 if (unsafeValueClsCheck)
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Private.CoreLib/src/System/ReadOnlySpan.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace System
#pragma warning disable SYSLIB1056 // Specified native type is invalid
 [NativeMarshalling(typeof(ReadOnlySpanMarshaller<,>))]
#pragma warning restore SYSLIB1056 // Specified native type is invalid
 [Intrinsic]
 public readonly ref struct ReadOnlySpan<T>
 {
 /// <summary>A byref or a native ptr.</summary>
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Private.CoreLib/src/System/Span.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace System
#pragma warning disable SYSLIB1056 // Specified native type is invalid
 [NativeMarshalling(typeof(SpanMarshaller<,>))]
#pragma warning restore SYSLIB1056 // Specified native type is invalid
 [Intrinsic]
 public readonly ref struct Span<T>
 {
 /// <summary>A byref or a native ptr.</summary>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix Unnecessary sign-extension for (nuint)span.Length#88136

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

 Merged

jakobbotsch
merged 19 commits into

from

Oct 10, 2023
 Merged


Fix Unnecessary sign-extension for (nuint)span.Length#88136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
f403ba2

unconditionally set isNeverNegative in morph, use that data when opti…


En3Tho Jun 28, 2023
d3e96b8

cr, change condition and apply optimization to winX64 only


En3Tho Jun 29, 2023
0bfe3cd

apply suggestions and add lclfld check too


En3Tho Jun 30, 2023
914da44

Run jit-format


En3Tho Jun 30, 2023
e73dd3e

ADDED CORINFO_FLG_SPAN


En3Tho Jul 4, 2023
d6652bc

Address CR


En3Tho Jul 4, 2023
2dc4601

Pull main and resolve conflicts


En3Tho Jul 4, 2023
bfb1395

Redo CR fix after pull main.


En3Tho Jul 4, 2023
5edb8c9

Merge branch 'main' of https://github.com/dotnet/runtime into issue-8…


En3Tho Aug 8, 2023
cdb554f

merge pull main & removed corinfo flag. A quick check if these change…


En3Tho Aug 14, 2023
0a62f7a

fix build for ee


En3Tho Aug 14, 2023
52021c3

missed this one


En3Tho Aug 14, 2023
d665ba5

marked span & readonlyspan as intrinsics, handled checking


En3Tho Aug 14, 2023
7a6d356

CR: removed IsSpan from GenTreeLclVar and used proposed change in Pro…


En3Tho Sep 29, 2023
1f0431a

CR: forgot to remove redundant SetIsSpan(true) call. Fixed


En3Tho Oct 1, 2023
eadf5fe

restored some lclmorph lines to keep diff simpler


En3Tho Oct 1, 2023
5b0b0df

It seems like it affects something after all?


En3Tho Oct 3, 2023
6ce32b2

Optimize spans only when Optimizations are enabled


En3Tho Oct 9, 2023
8e82297

revert OptimizationEnabled check


En3Tho Oct 10, 2023

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


31 changes: 31 additions & 0 deletions
src/coreclr/jit/assertionprop.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,6 +168,37 @@ bool IntegralRange::Contains(int64_t value) const
 }
 break;

 case GT_IND:
 {
 GenTree* const addr = node->AsIndir()->Addr();

 if (node->TypeIs(TYP_INT) && addr->OperIs(GT_ADD) && addr->gtGetOp1()->OperIs(GT_LCL_VAR) &&
 addr->gtGetOp2()->IsIntegralConst(OFFSETOF__CORINFO_Span__length))
 {
 GenTreeLclVar* const lclVar = addr->gtGetOp1()->AsLclVar();

 if (compiler->lvaGetDesc(lclVar->GetLclNum())->IsSpan())
 {
 assert(compiler->lvaIsImplicitByRefLocal(lclVar->GetLclNum()));
 return {SymbolicIntegerValue::Zero, UpperBoundForType(rangeType)};
 }
 }
 break;
 }

 case GT_LCL_FLD:
 {
 GenTreeLclFld* const lclFld = node->AsLclFld();
 LclVarDsc* const varDsc = compiler->lvaGetDesc(lclFld);

 if (node->TypeIs(TYP_INT) && varDsc->IsSpan() && lclFld->GetLclOffs() == OFFSETOF__CORINFO_Span__length)
 {
 return {SymbolicIntegerValue::Zero, UpperBoundForType(rangeType)};
 }

 break;
 }

 case GT_LCL_VAR:
 {
 LclVarDsc* const varDsc = compiler->lvaGetDesc(node->AsLclVar());
Expand Down

26 changes: 26 additions & 0 deletions
src/coreclr/jit/compiler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -661,6 +661,8 @@ class LclVarDsc
private:
 unsigned char lvIsNeverNegative : 1; // The local is known to be never negative

 unsigned char lvIsSpan : 1; // The local is a Span<T>
Comment thread
EgorBo marked this conversation as resolved.


public:
 union {
 unsigned lvFieldLclStart; // The index of the local var representing the first field in the promoted struct
Expand DownExpand Up@@ -964,6 +966,18 @@ class LclVarDsc
 lvIsNeverNegative = value;
 }

 // Is this is local a Span<T>?
 bool IsSpan() const
 {
 return lvIsSpan;
 }

 // Is this is local a Span<T>?
 void SetIsSpan(bool value)
 {
 lvIsSpan = value;
 }

 /////////////////////

 regNumber GetArgInitReg() const
Expand DownExpand Up@@ -8549,6 +8563,18 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 return strcmp(ns, "System.Runtime.Intrinsics") == 0;
 }

 bool isSpanClass(const CORINFO_CLASS_HANDLE clsHnd)
 {
 if (isIntrinsicType(clsHnd))
 {
 const char* namespaceName = nullptr;
 const char* className = getClassNameFromMetadata(clsHnd, &namespaceName);
 return strcmp(namespaceName, "System") == 0 &&
 (strcmp(className, "Span`1") == 0 || strcmp(className, "ReadOnlySpan`1") == 0);
 }
 return false;
 }

#ifdef FEATURE_SIMD
 // Have we identified any SIMD types?
 // This is currently used by struct promotion to avoid getting type information for a struct
Expand Down

11 changes: 6 additions & 5 deletions
src/coreclr/jit/lclmorph.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1331,18 +1331,19 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>

 LclVarDsc* fieldVarDsc = m_compiler->lvaGetDesc(fieldLclNum);

 // Span's Length is never negative unconditionally
 if (isSpanLength && (accessSize == genTypeSize(TYP_INT)))
 {
 fieldVarDsc->SetIsNeverNegative(true);
 }

 // Retargeting the indirection to reference the promoted field would make it "wide", exposing
 // the whole parent struct (with all of its fields).
 if (accessSize > genTypeSize(fieldVarDsc))
 {
 return BAD_VAR_NUM;
 }

 if (isSpanLength && (accessSize == genTypeSize(TYP_INT)))
 {
 fieldVarDsc->SetIsNeverNegative(true);
 }

 JITDUMP("Replacing the field in promoted struct with local var V%02u\n", fieldLclNum);
 m_stmtModified = true;

Expand Down

7 changes: 7 additions & 0 deletions
src/coreclr/jit/lclvars.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2392,6 +2392,11 @@ void Compiler::StructPromotionHelper::PromoteStructVar(unsigned lclNum)
 fieldVarDsc->lvIsOSRLocal = varDsc->lvIsOSRLocal;
 fieldVarDsc->lvIsOSRExposedLocal = varDsc->lvIsOSRExposedLocal;

 if (varDsc->IsSpan() && fieldVarDsc->lvFldOffset == OFFSETOF__CORINFO_Span__length)
 {
 fieldVarDsc->SetIsNeverNegative(true);
 }

 // This new local may be the first time we've seen a long typed local.
 if (fieldVarDsc->lvType == TYP_LONG)
 {
Expand DownExpand Up@@ -2933,6 +2938,8 @@ void Compiler::lvaSetStruct(unsigned varNum, ClassLayout* layout, bool unsafeVal
 }
#endif // not TARGET_64BIT

 varDsc->SetIsSpan(this->isSpanClass(layout->GetClassHandle()));
Comment thread
En3Tho marked this conversation as resolved.


 // Check whether this local is an unsafe value type and requires GS cookie protection.
 // GS checks require the stack to be re-ordered, which can't be done with EnC.
 if (unsafeValueClsCheck)
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Private.CoreLib/src/System/ReadOnlySpan.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace System
#pragma warning disable SYSLIB1056 // Specified native type is invalid
 [NativeMarshalling(typeof(ReadOnlySpanMarshaller<,>))]
#pragma warning restore SYSLIB1056 // Specified native type is invalid
 [Intrinsic]
 public readonly ref struct ReadOnlySpan<T>
 {
 /// <summary>A byref or a native ptr.</summary>
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Private.CoreLib/src/System/Span.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace System
#pragma warning disable SYSLIB1056 // Specified native type is invalid
 [NativeMarshalling(typeof(SpanMarshaller<,>))]
#pragma warning restore SYSLIB1056 // Specified native type is invalid
 [Intrinsic]
 public readonly ref struct Span<T>
 {
 /// <summary>A byref or a native ptr.</summary>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix Unnecessary sign-extension for (nuint)span.Length#88136

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

 Merged

jakobbotsch
merged 19 commits into

from

Oct 10, 2023
 Merged


Fix Unnecessary sign-extension for (nuint)span.Length#88136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
f403ba2

unconditionally set isNeverNegative in morph, use that data when opti…


En3Tho Jun 28, 2023
d3e96b8

cr, change condition and apply optimization to winX64 only


En3Tho Jun 29, 2023
0bfe3cd

apply suggestions and add lclfld check too


En3Tho Jun 30, 2023
914da44

Run jit-format


En3Tho Jun 30, 2023
e73dd3e

ADDED CORINFO_FLG_SPAN


En3Tho Jul 4, 2023
d6652bc

Address CR


En3Tho Jul 4, 2023
2dc4601

Pull main and resolve conflicts


En3Tho Jul 4, 2023
bfb1395

Redo CR fix after pull main.


En3Tho Jul 4, 2023
5edb8c9

Merge branch 'main' of https://github.com/dotnet/runtime into issue-8…


En3Tho Aug 8, 2023
cdb554f

merge pull main & removed corinfo flag. A quick check if these change…


En3Tho Aug 14, 2023
0a62f7a

fix build for ee


En3Tho Aug 14, 2023
52021c3

missed this one


En3Tho Aug 14, 2023
d665ba5

marked span & readonlyspan as intrinsics, handled checking


En3Tho Aug 14, 2023
7a6d356

CR: removed IsSpan from GenTreeLclVar and used proposed change in Pro…


En3Tho Sep 29, 2023
1f0431a

CR: forgot to remove redundant SetIsSpan(true) call. Fixed


En3Tho Oct 1, 2023
eadf5fe

restored some lclmorph lines to keep diff simpler


En3Tho Oct 1, 2023
5b0b0df

It seems like it affects something after all?


En3Tho Oct 3, 2023
6ce32b2

Optimize spans only when Optimizations are enabled


En3Tho Oct 9, 2023
8e82297

revert OptimizationEnabled check


En3Tho Oct 10, 2023

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


31 changes: 31 additions & 0 deletions
src/coreclr/jit/assertionprop.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,6 +168,37 @@ bool IntegralRange::Contains(int64_t value) const
 }
 break;

 case GT_IND:
 {
 GenTree* const addr = node->AsIndir()->Addr();

 if (node->TypeIs(TYP_INT) && addr->OperIs(GT_ADD) && addr->gtGetOp1()->OperIs(GT_LCL_VAR) &&
 addr->gtGetOp2()->IsIntegralConst(OFFSETOF__CORINFO_Span__length))
 {
 GenTreeLclVar* const lclVar = addr->gtGetOp1()->AsLclVar();

 if (compiler->lvaGetDesc(lclVar->GetLclNum())->IsSpan())
 {
 assert(compiler->lvaIsImplicitByRefLocal(lclVar->GetLclNum()));
 return {SymbolicIntegerValue::Zero, UpperBoundForType(rangeType)};
 }
 }
 break;
 }

 case GT_LCL_FLD:
 {
 GenTreeLclFld* const lclFld = node->AsLclFld();
 LclVarDsc* const varDsc = compiler->lvaGetDesc(lclFld);

 if (node->TypeIs(TYP_INT) && varDsc->IsSpan() && lclFld->GetLclOffs() == OFFSETOF__CORINFO_Span__length)
 {
 return {SymbolicIntegerValue::Zero, UpperBoundForType(rangeType)};
 }

 break;
 }

 case GT_LCL_VAR:
 {
 LclVarDsc* const varDsc = compiler->lvaGetDesc(node->AsLclVar());
Expand Down

26 changes: 26 additions & 0 deletions
src/coreclr/jit/compiler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -661,6 +661,8 @@ class LclVarDsc
private:
 unsigned char lvIsNeverNegative : 1; // The local is known to be never negative

 unsigned char lvIsSpan : 1; // The local is a Span<T>
Comment thread
EgorBo marked this conversation as resolved.


public:
 union {
 unsigned lvFieldLclStart; // The index of the local var representing the first field in the promoted struct
Expand DownExpand Up@@ -964,6 +966,18 @@ class LclVarDsc
 lvIsNeverNegative = value;
 }

 // Is this is local a Span<T>?
 bool IsSpan() const
 {
 return lvIsSpan;
 }

 // Is this is local a Span<T>?
 void SetIsSpan(bool value)
 {
 lvIsSpan = value;
 }

 /////////////////////

 regNumber GetArgInitReg() const
Expand DownExpand Up@@ -8549,6 +8563,18 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 return strcmp(ns, "System.Runtime.Intrinsics") == 0;
 }

 bool isSpanClass(const CORINFO_CLASS_HANDLE clsHnd)
 {
 if (isIntrinsicType(clsHnd))
 {
 const char* namespaceName = nullptr;
 const char* className = getClassNameFromMetadata(clsHnd, &namespaceName);
 return strcmp(namespaceName, "System") == 0 &&
 (strcmp(className, "Span`1") == 0 || strcmp(className, "ReadOnlySpan`1") == 0);
 }
 return false;
 }

#ifdef FEATURE_SIMD
 // Have we identified any SIMD types?
 // This is currently used by struct promotion to avoid getting type information for a struct
Expand Down

11 changes: 6 additions & 5 deletions
src/coreclr/jit/lclmorph.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1331,18 +1331,19 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>

 LclVarDsc* fieldVarDsc = m_compiler->lvaGetDesc(fieldLclNum);

 // Span's Length is never negative unconditionally
 if (isSpanLength && (accessSize == genTypeSize(TYP_INT)))
 {
 fieldVarDsc->SetIsNeverNegative(true);
 }

 // Retargeting the indirection to reference the promoted field would make it "wide", exposing
 // the whole parent struct (with all of its fields).
 if (accessSize > genTypeSize(fieldVarDsc))
 {
 return BAD_VAR_NUM;
 }

 if (isSpanLength && (accessSize == genTypeSize(TYP_INT)))
 {
 fieldVarDsc->SetIsNeverNegative(true);
 }

 JITDUMP("Replacing the field in promoted struct with local var V%02u\n", fieldLclNum);
 m_stmtModified = true;

Expand Down

7 changes: 7 additions & 0 deletions
src/coreclr/jit/lclvars.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2392,6 +2392,11 @@ void Compiler::StructPromotionHelper::PromoteStructVar(unsigned lclNum)
 fieldVarDsc->lvIsOSRLocal = varDsc->lvIsOSRLocal;
 fieldVarDsc->lvIsOSRExposedLocal = varDsc->lvIsOSRExposedLocal;

 if (varDsc->IsSpan() && fieldVarDsc->lvFldOffset == OFFSETOF__CORINFO_Span__length)
 {
 fieldVarDsc->SetIsNeverNegative(true);
 }

 // This new local may be the first time we've seen a long typed local.
 if (fieldVarDsc->lvType == TYP_LONG)
 {
Expand DownExpand Up@@ -2933,6 +2938,8 @@ void Compiler::lvaSetStruct(unsigned varNum, ClassLayout* layout, bool unsafeVal
 }
#endif // not TARGET_64BIT

 varDsc->SetIsSpan(this->isSpanClass(layout->GetClassHandle()));
Comment thread
En3Tho marked this conversation as resolved.


 // Check whether this local is an unsafe value type and requires GS cookie protection.
 // GS checks require the stack to be re-ordered, which can't be done with EnC.
 if (unsafeValueClsCheck)
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Private.CoreLib/src/System/ReadOnlySpan.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace System
#pragma warning disable SYSLIB1056 // Specified native type is invalid
 [NativeMarshalling(typeof(ReadOnlySpanMarshaller<,>))]
#pragma warning restore SYSLIB1056 // Specified native type is invalid
 [Intrinsic]
 public readonly ref struct ReadOnlySpan<T>
 {
 /// <summary>A byref or a native ptr.</summary>
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Private.CoreLib/src/System/Span.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace System
#pragma warning disable SYSLIB1056 // Specified native type is invalid
 [NativeMarshalling(typeof(SpanMarshaller<,>))]
#pragma warning restore SYSLIB1056 // Specified native type is invalid
 [Intrinsic]
 public readonly ref struct Span<T>
 {
 /// <summary>A byref or a native ptr.</summary>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix Unnecessary sign-extension for (nuint)span.Length#88136

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

 Merged

jakobbotsch
merged 19 commits into

from

Oct 10, 2023
 Merged


Fix Unnecessary sign-extension for (nuint)span.Length#88136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
f403ba2

unconditionally set isNeverNegative in morph, use that data when opti…


En3Tho Jun 28, 2023
d3e96b8

cr, change condition and apply optimization to winX64 only


En3Tho Jun 29, 2023
0bfe3cd

apply suggestions and add lclfld check too


En3Tho Jun 30, 2023
914da44

Run jit-format


En3Tho Jun 30, 2023
e73dd3e

ADDED CORINFO_FLG_SPAN


En3Tho Jul 4, 2023
d6652bc

Address CR


En3Tho Jul 4, 2023
2dc4601

Pull main and resolve conflicts


En3Tho Jul 4, 2023
bfb1395

Redo CR fix after pull main.


En3Tho Jul 4, 2023
5edb8c9

Merge branch 'main' of https://github.com/dotnet/runtime into issue-8…


En3Tho Aug 8, 2023
cdb554f

merge pull main & removed corinfo flag. A quick check if these change…


En3Tho Aug 14, 2023
0a62f7a

fix build for ee


En3Tho Aug 14, 2023
52021c3

missed this one


En3Tho Aug 14, 2023
d665ba5

marked span & readonlyspan as intrinsics, handled checking


En3Tho Aug 14, 2023
7a6d356

CR: removed IsSpan from GenTreeLclVar and used proposed change in Pro…


En3Tho Sep 29, 2023
1f0431a

CR: forgot to remove redundant SetIsSpan(true) call. Fixed


En3Tho Oct 1, 2023
eadf5fe

restored some lclmorph lines to keep diff simpler


En3Tho Oct 1, 2023
5b0b0df

It seems like it affects something after all?


En3Tho Oct 3, 2023
6ce32b2

Optimize spans only when Optimizations are enabled


En3Tho Oct 9, 2023
8e82297

revert OptimizationEnabled check


En3Tho Oct 10, 2023

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


31 changes: 31 additions & 0 deletions
src/coreclr/jit/assertionprop.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,6 +168,37 @@ bool IntegralRange::Contains(int64_t value) const
 }
 break;

 case GT_IND:
 {
 GenTree* const addr = node->AsIndir()->Addr();

 if (node->TypeIs(TYP_INT) && addr->OperIs(GT_ADD) && addr->gtGetOp1()->OperIs(GT_LCL_VAR) &&
 addr->gtGetOp2()->IsIntegralConst(OFFSETOF__CORINFO_Span__length))
 {
 GenTreeLclVar* const lclVar = addr->gtGetOp1()->AsLclVar();

 if (compiler->lvaGetDesc(lclVar->GetLclNum())->IsSpan())
 {
 assert(compiler->lvaIsImplicitByRefLocal(lclVar->GetLclNum()));
 return {SymbolicIntegerValue::Zero, UpperBoundForType(rangeType)};
 }
 }
 break;
 }

 case GT_LCL_FLD:
 {
 GenTreeLclFld* const lclFld = node->AsLclFld();
 LclVarDsc* const varDsc = compiler->lvaGetDesc(lclFld);

 if (node->TypeIs(TYP_INT) && varDsc->IsSpan() && lclFld->GetLclOffs() == OFFSETOF__CORINFO_Span__length)
 {
 return {SymbolicIntegerValue::Zero, UpperBoundForType(rangeType)};
 }

 break;
 }

 case GT_LCL_VAR:
 {
 LclVarDsc* const varDsc = compiler->lvaGetDesc(node->AsLclVar());
Expand Down

26 changes: 26 additions & 0 deletions
src/coreclr/jit/compiler.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -661,6 +661,8 @@ class LclVarDsc
private:
 unsigned char lvIsNeverNegative : 1; // The local is known to be never negative

 unsigned char lvIsSpan : 1; // The local is a Span<T>
Comment thread
EgorBo marked this conversation as resolved.


public:
 union {
 unsigned lvFieldLclStart; // The index of the local var representing the first field in the promoted struct
Expand DownExpand Up@@ -964,6 +966,18 @@ class LclVarDsc
 lvIsNeverNegative = value;
 }

 // Is this is local a Span<T>?
 bool IsSpan() const
 {
 return lvIsSpan;
 }

 // Is this is local a Span<T>?
 void SetIsSpan(bool value)
 {
 lvIsSpan = value;
 }

 /////////////////////

 regNumber GetArgInitReg() const
Expand DownExpand Up@@ -8549,6 +8563,18 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 return strcmp(ns, "System.Runtime.Intrinsics") == 0;
 }

 bool isSpanClass(const CORINFO_CLASS_HANDLE clsHnd)
 {
 if (isIntrinsicType(clsHnd))
 {
 const char* namespaceName = nullptr;
 const char* className = getClassNameFromMetadata(clsHnd, &namespaceName);
 return strcmp(namespaceName, "System") == 0 &&
 (strcmp(className, "Span`1") == 0 || strcmp(className, "ReadOnlySpan`1") == 0);
 }
 return false;
 }

#ifdef FEATURE_SIMD
 // Have we identified any SIMD types?
 // This is currently used by struct promotion to avoid getting type information for a struct
Expand Down

11 changes: 6 additions & 5 deletions
src/coreclr/jit/lclmorph.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1331,18 +1331,19 @@ class LocalAddressVisitor final : public GenTreeVisitor<LocalAddressVisitor>

 LclVarDsc* fieldVarDsc = m_compiler->lvaGetDesc(fieldLclNum);

 // Span's Length is never negative unconditionally
 if (isSpanLength && (accessSize == genTypeSize(TYP_INT)))
 {
 fieldVarDsc->SetIsNeverNegative(true);
 }

 // Retargeting the indirection to reference the promoted field would make it "wide", exposing
 // the whole parent struct (with all of its fields).
 if (accessSize > genTypeSize(fieldVarDsc))
 {
 return BAD_VAR_NUM;
 }

 if (isSpanLength && (accessSize == genTypeSize(TYP_INT)))
 {
 fieldVarDsc->SetIsNeverNegative(true);
 }

 JITDUMP("Replacing the field in promoted struct with local var V%02u\n", fieldLclNum);
 m_stmtModified = true;

Expand Down

7 changes: 7 additions & 0 deletions
src/coreclr/jit/lclvars.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2392,6 +2392,11 @@ void Compiler::StructPromotionHelper::PromoteStructVar(unsigned lclNum)
 fieldVarDsc->lvIsOSRLocal = varDsc->lvIsOSRLocal;
 fieldVarDsc->lvIsOSRExposedLocal = varDsc->lvIsOSRExposedLocal;

 if (varDsc->IsSpan() && fieldVarDsc->lvFldOffset == OFFSETOF__CORINFO_Span__length)
 {
 fieldVarDsc->SetIsNeverNegative(true);
 }

 // This new local may be the first time we've seen a long typed local.
 if (fieldVarDsc->lvType == TYP_LONG)
 {
Expand DownExpand Up@@ -2933,6 +2938,8 @@ void Compiler::lvaSetStruct(unsigned varNum, ClassLayout* layout, bool unsafeVal
 }
#endif // not TARGET_64BIT

 varDsc->SetIsSpan(this->isSpanClass(layout->GetClassHandle()));
Comment thread
En3Tho marked this conversation as resolved.


 // Check whether this local is an unsafe value type and requires GS cookie protection.
 // GS checks require the stack to be re-ordered, which can't be done with EnC.
 if (unsafeValueClsCheck)
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Private.CoreLib/src/System/ReadOnlySpan.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace System
#pragma warning disable SYSLIB1056 // Specified native type is invalid
 [NativeMarshalling(typeof(ReadOnlySpanMarshaller<,>))]
#pragma warning restore SYSLIB1056 // Specified native type is invalid
 [Intrinsic]
 public readonly ref struct ReadOnlySpan<T>
 {
 /// <summary>A byref or a native ptr.</summary>
Expand Down

1 change: 1 addition & 0 deletions
src/libraries/System.Private.CoreLib/src/System/Span.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace System
#pragma warning disable SYSLIB1056 // Specified native type is invalid
 [NativeMarshalling(typeof(SpanMarshaller<,>))]
#pragma warning restore SYSLIB1056 // Specified native type is invalid
 [Intrinsic]
 public readonly ref struct Span<T>
 {
 /// <summary>A byref or a native ptr.</summary>
Expand Down