Reg struct copy. - #32362

Merged
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:mergeMike'sChange
Feb 26, 2020
Merged

Reg struct copy.#32362
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:mergeMike'sChange

Conversation

@sandreenko

@sandreenkosandreenko commented Feb 15, 2020

Copy link
Copy Markdown
Contributor

This PR changes the way we handle struct copies.
cc8c366: First, it deletes rationalize transformation that was converting ASG(LCL_VAR struct, smth) into STORE_BLK or STORE_OBJ.
3bc8f8e: Then it skips fgMorphOneAsgBlockOp transformation for ASG(LCL_VAR struct, smth), where struct can be replaced with a primitive type.

The overall diffs are positive, but small because of most of these structs are still marked as doNotEnreg in impNormStructVal, it will be fixed next.

Positive diffs come from:

  1. using movups (for STORE_LCL_VAR instead of movdqu that is currently used for STORE_BLK), there was a PR https://github.com/dotnet/runtime/pull/1367/files that would use movups for all, but for now, it is useful for me to have different codegen for them, allows me to find diffs easily.
  2. VN and CSE can propagate ASG(struct, 0) and similar constructions now, so we can coalesce chains of struct assignments now for zero-init, I will add non-zero cases later. It gives us diffs like -29 (-53.70% of base) : System.Private.CoreLib.dasm - SyncSuccessSentinelStateMachineBox[VoidTaskResult][System.Threading.Tasks.VoidTaskResult]:.ctor():this, that will be an issue in the next PR, see the discussion here First Class Structs: stop lying about underlying type. #1231 (comment);

The negative diffs come from:

  1. STORE_BLK contained logic is less efficient, it often doesn't mark Data as contained when it is generating only one instruction;
  2. fgMorphOneAsgBlockOp could retype structs with one gcField into primitive type copy without barriers and reporting, now we are generating costly STORE_OBJ, a primitive fix for it fails on a few library tests, I am checking them now.
diffs for the Reg struct copies commit, x64, crossgen framework
Total bytes of diff: -4957 (-0.02% of base)
diff is an improvement.
Top file improvements (bytes):
-1274 : Microsoft.Diagnostics.Tracing.TraceEvent.dasm (-0.04% of base)
-1075 : System.Private.Xml.dasm (-0.03% of base)
-496 : System.Linq.Expressions.dasm (-0.02% of base)
-324 : System.Data.Common.dasm (-0.03% of base)
-322 : System.Private.CoreLib.dasm (-0.01% of base)
-308 : System.Transactions.Local.dasm (-0.30% of base)
-179 : Newtonsoft.Json.dasm (-0.03% of base)
-140 : Microsoft.CodeAnalysis.CSharp.dasm (-0.01% of base)
-140 : Microsoft.CodeAnalysis.VisualBasic.dasm (-0.01% of base)
-114 : System.Linq.dasm (-0.08% of base)
-98 : System.Linq.Parallel.dasm (-0.02% of base)
-76 : System.Security.AccessControl.dasm (-0.12% of base)
-62 : xunit.performance.metrics.dasm (-0.46% of base)
-56 : System.Private.DataContractSerialization.dasm (-0.01% of base)
-54 : Microsoft.CodeAnalysis.dasm (-0.01% of base)
-36 : System.IO.FileSystem.dasm (-0.06% of base)
-35 : xunit.execution.dotnet.dasm (-0.02% of base)
-28 : Microsoft.CSharp.dasm (-0.01% of base)
-24 : System.Reflection.Metadata.dasm (-0.01% of base)
-20 : System.Security.Cryptography.X509Certificates.dasm (-0.01% of base)
37 total files with Code Size differences (37 improved, 0 regressed), 72 unchanged.
Top method improvements (bytes):
-304 (-0.91% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ClrTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-296 (-0.82% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ClrPrivateTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-256 (-0.53% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.KernelTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-74 (-0.07% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ApplicationServerTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-50 (-2.43% of base) : System.Private.Xml.dasm - System.Xml.Schema.Compiler:CalculateEffectiveTotalRange(System.Xml.Schema.XmlSchemaParticle,byref,byref):this
-50 (-2.42% of base) : System.Private.Xml.dasm - System.Xml.Schema.SchemaCollectionCompiler:CalculateEffectiveTotalRange(System.Xml.Schema.XmlSchemaParticle,byref,byref):this
-44 (-1.50% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.LocalRewriter:MakeDecimalLiteral(Microsoft.CodeAnalysis.CSharp.CSharpSyntaxNode,Microsoft.CodeAnalysis.ConstantValue):Microsoft.CodeAnalysis.CSharp.BoundExpression:this
-44 (-2.42% of base) : System.Data.Common.dasm - System.Data.Common.TimeSpanStorage:Aggregate(System.Int32[],int):System.Object:this
-40 (-0.87% of base) : Microsoft.CodeAnalysis.VisualBasic.dasm - Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.ExpressionEvaluator:PerformCompileTimeBinaryOperation(ushort,byte,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.ExpressionSyntax):Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst
-40 (-1.66% of base) : Newtonsoft.Json.dasm - Newtonsoft.Json.Utilities.ConvertUtils:DecimalTryParse(System.Char[],int,int,byref):int
-32 (-3.02% of base) : System.Private.Xml.dasm - System.Xml.Schema.SchemaCollectionCompiler:CalculateSequenceRange(System.Xml.Schema.XmlSchemaSequence,byref,byref):this
-30 (-2.48% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.StartStopActivityComputer:FixAndProcessWindowsASP(Microsoft.Diagnostics.Tracing.TraceEvent,System.Collections.Generic.KeyValuePair`2[System.Guid,System.Guid][]):this
-30 (-3.35% of base) : System.Private.Xml.dasm - System.Xml.Schema.Compiler:IsSequenceFromChoice(System.Xml.Schema.XmlSchemaSequence,System.Xml.Schema.XmlSchemaChoice):bool:this
-30 (-1.68% of base) : System.Private.Xml.dasm - System.Xml.Xsl.IlGen.XmlILOptimizerVisitor:FoldArithmetic(int,System.Xml.Xsl.Qil.QilLiteral,System.Xml.Xsl.Qil.QilLiteral):System.Xml.Xsl.Qil.QilNode:this
-26 (-0.66% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.Binder:DoUncheckedConversion(byte,Microsoft.CodeAnalysis.ConstantValue):System.Object
-26 (-0.57% of base) : Microsoft.CodeAnalysis.VisualBasic.dasm - Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.Scanner:ScanNumericLiteral(Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.SyntaxList`1[[Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.VisualBasicSyntaxNode, Microsoft.CodeAnalysis.VisualBasic, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35]]):Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.SyntaxToken:this
-26 (-2.50% of base) : System.Private.CoreLib.dasm - System.TimeZoneInfo:CreateAdjustmentRuleFromTimeZoneInformation(byref,System.DateTime,System.DateTime,int):AdjustmentRule
-24 (-0.37% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.Binder:FoldNeverOverflowBinaryOperators(int,Microsoft.CodeAnalysis.ConstantValue,Microsoft.CodeAnalysis.ConstantValue):System.Object
-24 (-2.11% of base) : Microsoft.CSharp.dasm - Microsoft.CSharp.RuntimeBinder.Semantics.ExpressionBinder:BindDecimalConstCast(Microsoft.CSharp.RuntimeBinder.Semantics.CType,Microsoft.CSharp.RuntimeBinder.Semantics.CType,Microsoft.CSharp.RuntimeBinder.Semantics.ExprConstant):Microsoft.CSharp.RuntimeBinder.Semantics.Expr
-24 (-1.17% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - <>c__DisplayClass0_0:<.ctor>b__1(Microsoft.Diagnostics.Tracing.TraceEvent):this
Total diffs for frameworks:
x64 Total bytes of diff: -5890 (-0.02% of base)
1338 total methods with Code Size differences (1262 improved, 76 regressed), 178158 unchanged.
arm64 Total bytes of diff: -23656 (-0.02% of base)
489 total methods with Code Size differences (311 improved, 178 regressed), 157900 unchanged.
arm Total bytes of diff: -1576 (-0.00% of base)
250 total methods with Code Size differences (169 improved, 81 regressed), 158053 unchanged.
x86 Total bytes of diff: -2962 (-0.01% of base)
580 total methods with Code Size differences (535 improved, 45 regressed), 178824 unchanged.

Based on #1231 (comment).

Side note: varTypeIsSmall and similar functions in vartype.h should assert on TYP_STRUCT because they don't have enough information to get a correct result, the callers should be responsible for handling that. It is a preexisting issue, but that change bumps its priority, I am working on a fix in another branch.

@sandreenkosandreenko added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Feb 15, 2020
@sandreenko
sandreenkoforce-pushed the mergeMike'sChange branch 2 times, most recently from c3556e3 to 3bc8f8eCompareFebruary 24, 2020 18:20
@sandreenko
sandreenko marked this pull request as ready for review February 24, 2020 19:09
@sandreenko

Copy link
Copy Markdown
ContributorAuthor

PTAL @CarolEidt @dotnet/jit-contrib

Comment threadsrc/coreclr/src/jit/lower.cpp Outdated

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

That is loweing, so nobody will read these flags, but I set them to have closer diffs.

@CarolEidtCarolEidt left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

Sergey Andreenko added 5 commits February 25, 2020 13:25
The old code was expecting `ASG` in a form that doesn't exist anymore.
Keep `ASG(LCL_VAR struct, LCL_VAR or INIT_VALUE)` representation in morph
and rationalize and change it to STORE_LCL_VAR later.
and fix format error after merge.
// Ensure that lclVar nodes are typed correctly.
assert(!varDsc->lvNormalizeOnStore() || (targetType == genActualType(varDsc->TypeGet())));
#ifdef DEBUG
var_types op1Type = op1->TypeGet();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Merged my changes with the new assert from #32750.

if (asgType == TYP_STRUCT)
{
if (clsHnd == NO_CLASS_HANDLE)
// It is possible to use `initobj` to init a primitive type on the stack,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@kunalspathak thanks for your feedback, I added an example where var is not a struct, but ASG is.

@sandreenko
sandreenko merged commit ed8a5c5 into dotnet:masterFeb 26, 2020
@sandreenko
sandreenko deleted the mergeMike'sChange branch May 18, 2020 23:03
@ghostghost locked as resolved and limited conversation to collaborators Dec 10, 2020
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@sandreenko@CarolEidt
, '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

Reg struct copy. - #32362

Merged
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:mergeMike'sChange
Feb 26, 2020
Merged

Reg struct copy.#32362
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:mergeMike'sChange

Conversation

@sandreenko

@sandreenkosandreenko commented Feb 15, 2020

Copy link
Copy Markdown
Contributor

This PR changes the way we handle struct copies.
cc8c366: First, it deletes rationalize transformation that was converting ASG(LCL_VAR struct, smth) into STORE_BLK or STORE_OBJ.
3bc8f8e: Then it skips fgMorphOneAsgBlockOp transformation for ASG(LCL_VAR struct, smth), where struct can be replaced with a primitive type.

The overall diffs are positive, but small because of most of these structs are still marked as doNotEnreg in impNormStructVal, it will be fixed next.

Positive diffs come from:

  1. using movups (for STORE_LCL_VAR instead of movdqu that is currently used for STORE_BLK), there was a PR https://github.com/dotnet/runtime/pull/1367/files that would use movups for all, but for now, it is useful for me to have different codegen for them, allows me to find diffs easily.
  2. VN and CSE can propagate ASG(struct, 0) and similar constructions now, so we can coalesce chains of struct assignments now for zero-init, I will add non-zero cases later. It gives us diffs like -29 (-53.70% of base) : System.Private.CoreLib.dasm - SyncSuccessSentinelStateMachineBox[VoidTaskResult][System.Threading.Tasks.VoidTaskResult]:.ctor():this, that will be an issue in the next PR, see the discussion here First Class Structs: stop lying about underlying type. #1231 (comment);

The negative diffs come from:

  1. STORE_BLK contained logic is less efficient, it often doesn't mark Data as contained when it is generating only one instruction;
  2. fgMorphOneAsgBlockOp could retype structs with one gcField into primitive type copy without barriers and reporting, now we are generating costly STORE_OBJ, a primitive fix for it fails on a few library tests, I am checking them now.
diffs for the Reg struct copies commit, x64, crossgen framework
Total bytes of diff: -4957 (-0.02% of base)
diff is an improvement.
Top file improvements (bytes):
-1274 : Microsoft.Diagnostics.Tracing.TraceEvent.dasm (-0.04% of base)
-1075 : System.Private.Xml.dasm (-0.03% of base)
-496 : System.Linq.Expressions.dasm (-0.02% of base)
-324 : System.Data.Common.dasm (-0.03% of base)
-322 : System.Private.CoreLib.dasm (-0.01% of base)
-308 : System.Transactions.Local.dasm (-0.30% of base)
-179 : Newtonsoft.Json.dasm (-0.03% of base)
-140 : Microsoft.CodeAnalysis.CSharp.dasm (-0.01% of base)
-140 : Microsoft.CodeAnalysis.VisualBasic.dasm (-0.01% of base)
-114 : System.Linq.dasm (-0.08% of base)
-98 : System.Linq.Parallel.dasm (-0.02% of base)
-76 : System.Security.AccessControl.dasm (-0.12% of base)
-62 : xunit.performance.metrics.dasm (-0.46% of base)
-56 : System.Private.DataContractSerialization.dasm (-0.01% of base)
-54 : Microsoft.CodeAnalysis.dasm (-0.01% of base)
-36 : System.IO.FileSystem.dasm (-0.06% of base)
-35 : xunit.execution.dotnet.dasm (-0.02% of base)
-28 : Microsoft.CSharp.dasm (-0.01% of base)
-24 : System.Reflection.Metadata.dasm (-0.01% of base)
-20 : System.Security.Cryptography.X509Certificates.dasm (-0.01% of base)
37 total files with Code Size differences (37 improved, 0 regressed), 72 unchanged.
Top method improvements (bytes):
-304 (-0.91% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ClrTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-296 (-0.82% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ClrPrivateTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-256 (-0.53% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.KernelTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-74 (-0.07% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ApplicationServerTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-50 (-2.43% of base) : System.Private.Xml.dasm - System.Xml.Schema.Compiler:CalculateEffectiveTotalRange(System.Xml.Schema.XmlSchemaParticle,byref,byref):this
-50 (-2.42% of base) : System.Private.Xml.dasm - System.Xml.Schema.SchemaCollectionCompiler:CalculateEffectiveTotalRange(System.Xml.Schema.XmlSchemaParticle,byref,byref):this
-44 (-1.50% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.LocalRewriter:MakeDecimalLiteral(Microsoft.CodeAnalysis.CSharp.CSharpSyntaxNode,Microsoft.CodeAnalysis.ConstantValue):Microsoft.CodeAnalysis.CSharp.BoundExpression:this
-44 (-2.42% of base) : System.Data.Common.dasm - System.Data.Common.TimeSpanStorage:Aggregate(System.Int32[],int):System.Object:this
-40 (-0.87% of base) : Microsoft.CodeAnalysis.VisualBasic.dasm - Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.ExpressionEvaluator:PerformCompileTimeBinaryOperation(ushort,byte,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.ExpressionSyntax):Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst
-40 (-1.66% of base) : Newtonsoft.Json.dasm - Newtonsoft.Json.Utilities.ConvertUtils:DecimalTryParse(System.Char[],int,int,byref):int
-32 (-3.02% of base) : System.Private.Xml.dasm - System.Xml.Schema.SchemaCollectionCompiler:CalculateSequenceRange(System.Xml.Schema.XmlSchemaSequence,byref,byref):this
-30 (-2.48% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.StartStopActivityComputer:FixAndProcessWindowsASP(Microsoft.Diagnostics.Tracing.TraceEvent,System.Collections.Generic.KeyValuePair`2[System.Guid,System.Guid][]):this
-30 (-3.35% of base) : System.Private.Xml.dasm - System.Xml.Schema.Compiler:IsSequenceFromChoice(System.Xml.Schema.XmlSchemaSequence,System.Xml.Schema.XmlSchemaChoice):bool:this
-30 (-1.68% of base) : System.Private.Xml.dasm - System.Xml.Xsl.IlGen.XmlILOptimizerVisitor:FoldArithmetic(int,System.Xml.Xsl.Qil.QilLiteral,System.Xml.Xsl.Qil.QilLiteral):System.Xml.Xsl.Qil.QilNode:this
-26 (-0.66% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.Binder:DoUncheckedConversion(byte,Microsoft.CodeAnalysis.ConstantValue):System.Object
-26 (-0.57% of base) : Microsoft.CodeAnalysis.VisualBasic.dasm - Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.Scanner:ScanNumericLiteral(Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.SyntaxList`1[[Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.VisualBasicSyntaxNode, Microsoft.CodeAnalysis.VisualBasic, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35]]):Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.SyntaxToken:this
-26 (-2.50% of base) : System.Private.CoreLib.dasm - System.TimeZoneInfo:CreateAdjustmentRuleFromTimeZoneInformation(byref,System.DateTime,System.DateTime,int):AdjustmentRule
-24 (-0.37% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.Binder:FoldNeverOverflowBinaryOperators(int,Microsoft.CodeAnalysis.ConstantValue,Microsoft.CodeAnalysis.ConstantValue):System.Object
-24 (-2.11% of base) : Microsoft.CSharp.dasm - Microsoft.CSharp.RuntimeBinder.Semantics.ExpressionBinder:BindDecimalConstCast(Microsoft.CSharp.RuntimeBinder.Semantics.CType,Microsoft.CSharp.RuntimeBinder.Semantics.CType,Microsoft.CSharp.RuntimeBinder.Semantics.ExprConstant):Microsoft.CSharp.RuntimeBinder.Semantics.Expr
-24 (-1.17% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - <>c__DisplayClass0_0:<.ctor>b__1(Microsoft.Diagnostics.Tracing.TraceEvent):this
Total diffs for frameworks:
x64 Total bytes of diff: -5890 (-0.02% of base)
1338 total methods with Code Size differences (1262 improved, 76 regressed), 178158 unchanged.
arm64 Total bytes of diff: -23656 (-0.02% of base)
489 total methods with Code Size differences (311 improved, 178 regressed), 157900 unchanged.
arm Total bytes of diff: -1576 (-0.00% of base)
250 total methods with Code Size differences (169 improved, 81 regressed), 158053 unchanged.
x86 Total bytes of diff: -2962 (-0.01% of base)
580 total methods with Code Size differences (535 improved, 45 regressed), 178824 unchanged.

Based on #1231 (comment).

Side note: varTypeIsSmall and similar functions in vartype.h should assert on TYP_STRUCT because they don't have enough information to get a correct result, the callers should be responsible for handling that. It is a preexisting issue, but that change bumps its priority, I am working on a fix in another branch.

@sandreenkosandreenko added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Feb 15, 2020
@sandreenko
sandreenkoforce-pushed the mergeMike'sChange branch 2 times, most recently from c3556e3 to 3bc8f8eCompareFebruary 24, 2020 18:20
@sandreenko
sandreenko marked this pull request as ready for review February 24, 2020 19:09
@sandreenko

Copy link
Copy Markdown
ContributorAuthor

PTAL @CarolEidt @dotnet/jit-contrib

Comment threadsrc/coreclr/src/jit/lower.cpp Outdated

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

That is loweing, so nobody will read these flags, but I set them to have closer diffs.

@CarolEidtCarolEidt left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

Sergey Andreenko added 5 commits February 25, 2020 13:25
The old code was expecting `ASG` in a form that doesn't exist anymore.
Keep `ASG(LCL_VAR struct, LCL_VAR or INIT_VALUE)` representation in morph
and rationalize and change it to STORE_LCL_VAR later.
and fix format error after merge.
// Ensure that lclVar nodes are typed correctly.
assert(!varDsc->lvNormalizeOnStore() || (targetType == genActualType(varDsc->TypeGet())));
#ifdef DEBUG
var_types op1Type = op1->TypeGet();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Merged my changes with the new assert from #32750.

if (asgType == TYP_STRUCT)
{
if (clsHnd == NO_CLASS_HANDLE)
// It is possible to use `initobj` to init a primitive type on the stack,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@kunalspathak thanks for your feedback, I added an example where var is not a struct, but ASG is.

@sandreenko
sandreenko merged commit ed8a5c5 into dotnet:masterFeb 26, 2020
@sandreenko
sandreenko deleted the mergeMike'sChange branch May 18, 2020 23:03
@ghostghost locked as resolved and limited conversation to collaborators Dec 10, 2020
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@sandreenko@CarolEidt
, '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

Reg struct copy. - #32362

Merged
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:mergeMike'sChange
Feb 26, 2020
Merged

Reg struct copy.#32362
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:mergeMike'sChange

Conversation

@sandreenko

@sandreenkosandreenko commented Feb 15, 2020

Copy link
Copy Markdown
Contributor

This PR changes the way we handle struct copies.
cc8c366: First, it deletes rationalize transformation that was converting ASG(LCL_VAR struct, smth) into STORE_BLK or STORE_OBJ.
3bc8f8e: Then it skips fgMorphOneAsgBlockOp transformation for ASG(LCL_VAR struct, smth), where struct can be replaced with a primitive type.

The overall diffs are positive, but small because of most of these structs are still marked as doNotEnreg in impNormStructVal, it will be fixed next.

Positive diffs come from:

  1. using movups (for STORE_LCL_VAR instead of movdqu that is currently used for STORE_BLK), there was a PR https://github.com/dotnet/runtime/pull/1367/files that would use movups for all, but for now, it is useful for me to have different codegen for them, allows me to find diffs easily.
  2. VN and CSE can propagate ASG(struct, 0) and similar constructions now, so we can coalesce chains of struct assignments now for zero-init, I will add non-zero cases later. It gives us diffs like -29 (-53.70% of base) : System.Private.CoreLib.dasm - SyncSuccessSentinelStateMachineBox[VoidTaskResult][System.Threading.Tasks.VoidTaskResult]:.ctor():this, that will be an issue in the next PR, see the discussion here First Class Structs: stop lying about underlying type. #1231 (comment);

The negative diffs come from:

  1. STORE_BLK contained logic is less efficient, it often doesn't mark Data as contained when it is generating only one instruction;
  2. fgMorphOneAsgBlockOp could retype structs with one gcField into primitive type copy without barriers and reporting, now we are generating costly STORE_OBJ, a primitive fix for it fails on a few library tests, I am checking them now.
diffs for the Reg struct copies commit, x64, crossgen framework
Total bytes of diff: -4957 (-0.02% of base)
diff is an improvement.
Top file improvements (bytes):
-1274 : Microsoft.Diagnostics.Tracing.TraceEvent.dasm (-0.04% of base)
-1075 : System.Private.Xml.dasm (-0.03% of base)
-496 : System.Linq.Expressions.dasm (-0.02% of base)
-324 : System.Data.Common.dasm (-0.03% of base)
-322 : System.Private.CoreLib.dasm (-0.01% of base)
-308 : System.Transactions.Local.dasm (-0.30% of base)
-179 : Newtonsoft.Json.dasm (-0.03% of base)
-140 : Microsoft.CodeAnalysis.CSharp.dasm (-0.01% of base)
-140 : Microsoft.CodeAnalysis.VisualBasic.dasm (-0.01% of base)
-114 : System.Linq.dasm (-0.08% of base)
-98 : System.Linq.Parallel.dasm (-0.02% of base)
-76 : System.Security.AccessControl.dasm (-0.12% of base)
-62 : xunit.performance.metrics.dasm (-0.46% of base)
-56 : System.Private.DataContractSerialization.dasm (-0.01% of base)
-54 : Microsoft.CodeAnalysis.dasm (-0.01% of base)
-36 : System.IO.FileSystem.dasm (-0.06% of base)
-35 : xunit.execution.dotnet.dasm (-0.02% of base)
-28 : Microsoft.CSharp.dasm (-0.01% of base)
-24 : System.Reflection.Metadata.dasm (-0.01% of base)
-20 : System.Security.Cryptography.X509Certificates.dasm (-0.01% of base)
37 total files with Code Size differences (37 improved, 0 regressed), 72 unchanged.
Top method improvements (bytes):
-304 (-0.91% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ClrTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-296 (-0.82% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ClrPrivateTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-256 (-0.53% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.KernelTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-74 (-0.07% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ApplicationServerTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-50 (-2.43% of base) : System.Private.Xml.dasm - System.Xml.Schema.Compiler:CalculateEffectiveTotalRange(System.Xml.Schema.XmlSchemaParticle,byref,byref):this
-50 (-2.42% of base) : System.Private.Xml.dasm - System.Xml.Schema.SchemaCollectionCompiler:CalculateEffectiveTotalRange(System.Xml.Schema.XmlSchemaParticle,byref,byref):this
-44 (-1.50% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.LocalRewriter:MakeDecimalLiteral(Microsoft.CodeAnalysis.CSharp.CSharpSyntaxNode,Microsoft.CodeAnalysis.ConstantValue):Microsoft.CodeAnalysis.CSharp.BoundExpression:this
-44 (-2.42% of base) : System.Data.Common.dasm - System.Data.Common.TimeSpanStorage:Aggregate(System.Int32[],int):System.Object:this
-40 (-0.87% of base) : Microsoft.CodeAnalysis.VisualBasic.dasm - Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.ExpressionEvaluator:PerformCompileTimeBinaryOperation(ushort,byte,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.ExpressionSyntax):Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst
-40 (-1.66% of base) : Newtonsoft.Json.dasm - Newtonsoft.Json.Utilities.ConvertUtils:DecimalTryParse(System.Char[],int,int,byref):int
-32 (-3.02% of base) : System.Private.Xml.dasm - System.Xml.Schema.SchemaCollectionCompiler:CalculateSequenceRange(System.Xml.Schema.XmlSchemaSequence,byref,byref):this
-30 (-2.48% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.StartStopActivityComputer:FixAndProcessWindowsASP(Microsoft.Diagnostics.Tracing.TraceEvent,System.Collections.Generic.KeyValuePair`2[System.Guid,System.Guid][]):this
-30 (-3.35% of base) : System.Private.Xml.dasm - System.Xml.Schema.Compiler:IsSequenceFromChoice(System.Xml.Schema.XmlSchemaSequence,System.Xml.Schema.XmlSchemaChoice):bool:this
-30 (-1.68% of base) : System.Private.Xml.dasm - System.Xml.Xsl.IlGen.XmlILOptimizerVisitor:FoldArithmetic(int,System.Xml.Xsl.Qil.QilLiteral,System.Xml.Xsl.Qil.QilLiteral):System.Xml.Xsl.Qil.QilNode:this
-26 (-0.66% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.Binder:DoUncheckedConversion(byte,Microsoft.CodeAnalysis.ConstantValue):System.Object
-26 (-0.57% of base) : Microsoft.CodeAnalysis.VisualBasic.dasm - Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.Scanner:ScanNumericLiteral(Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.SyntaxList`1[[Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.VisualBasicSyntaxNode, Microsoft.CodeAnalysis.VisualBasic, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35]]):Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.SyntaxToken:this
-26 (-2.50% of base) : System.Private.CoreLib.dasm - System.TimeZoneInfo:CreateAdjustmentRuleFromTimeZoneInformation(byref,System.DateTime,System.DateTime,int):AdjustmentRule
-24 (-0.37% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.Binder:FoldNeverOverflowBinaryOperators(int,Microsoft.CodeAnalysis.ConstantValue,Microsoft.CodeAnalysis.ConstantValue):System.Object
-24 (-2.11% of base) : Microsoft.CSharp.dasm - Microsoft.CSharp.RuntimeBinder.Semantics.ExpressionBinder:BindDecimalConstCast(Microsoft.CSharp.RuntimeBinder.Semantics.CType,Microsoft.CSharp.RuntimeBinder.Semantics.CType,Microsoft.CSharp.RuntimeBinder.Semantics.ExprConstant):Microsoft.CSharp.RuntimeBinder.Semantics.Expr
-24 (-1.17% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - <>c__DisplayClass0_0:<.ctor>b__1(Microsoft.Diagnostics.Tracing.TraceEvent):this
Total diffs for frameworks:
x64 Total bytes of diff: -5890 (-0.02% of base)
1338 total methods with Code Size differences (1262 improved, 76 regressed), 178158 unchanged.
arm64 Total bytes of diff: -23656 (-0.02% of base)
489 total methods with Code Size differences (311 improved, 178 regressed), 157900 unchanged.
arm Total bytes of diff: -1576 (-0.00% of base)
250 total methods with Code Size differences (169 improved, 81 regressed), 158053 unchanged.
x86 Total bytes of diff: -2962 (-0.01% of base)
580 total methods with Code Size differences (535 improved, 45 regressed), 178824 unchanged.

Based on #1231 (comment).

Side note: varTypeIsSmall and similar functions in vartype.h should assert on TYP_STRUCT because they don't have enough information to get a correct result, the callers should be responsible for handling that. It is a preexisting issue, but that change bumps its priority, I am working on a fix in another branch.

@sandreenkosandreenko added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Feb 15, 2020
@sandreenko
sandreenkoforce-pushed the mergeMike'sChange branch 2 times, most recently from c3556e3 to 3bc8f8eCompareFebruary 24, 2020 18:20
@sandreenko
sandreenko marked this pull request as ready for review February 24, 2020 19:09
@sandreenko

Copy link
Copy Markdown
ContributorAuthor

PTAL @CarolEidt @dotnet/jit-contrib

Comment threadsrc/coreclr/src/jit/lower.cpp Outdated

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

That is loweing, so nobody will read these flags, but I set them to have closer diffs.

@CarolEidtCarolEidt left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

Sergey Andreenko added 5 commits February 25, 2020 13:25
The old code was expecting `ASG` in a form that doesn't exist anymore.
Keep `ASG(LCL_VAR struct, LCL_VAR or INIT_VALUE)` representation in morph
and rationalize and change it to STORE_LCL_VAR later.
and fix format error after merge.
// Ensure that lclVar nodes are typed correctly.
assert(!varDsc->lvNormalizeOnStore() || (targetType == genActualType(varDsc->TypeGet())));
#ifdef DEBUG
var_types op1Type = op1->TypeGet();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Merged my changes with the new assert from #32750.

if (asgType == TYP_STRUCT)
{
if (clsHnd == NO_CLASS_HANDLE)
// It is possible to use `initobj` to init a primitive type on the stack,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@kunalspathak thanks for your feedback, I added an example where var is not a struct, but ASG is.

@sandreenko
sandreenko merged commit ed8a5c5 into dotnet:masterFeb 26, 2020
@sandreenko
sandreenko deleted the mergeMike'sChange branch May 18, 2020 23:03
@ghostghost locked as resolved and limited conversation to collaborators Dec 10, 2020
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@sandreenko@CarolEidt
, '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

Reg struct copy. - #32362

Merged
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:mergeMike'sChange
Feb 26, 2020
Merged

Reg struct copy.#32362
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:mergeMike'sChange

Conversation

@sandreenko

@sandreenkosandreenko commented Feb 15, 2020

Copy link
Copy Markdown
Contributor

This PR changes the way we handle struct copies.
cc8c366: First, it deletes rationalize transformation that was converting ASG(LCL_VAR struct, smth) into STORE_BLK or STORE_OBJ.
3bc8f8e: Then it skips fgMorphOneAsgBlockOp transformation for ASG(LCL_VAR struct, smth), where struct can be replaced with a primitive type.

The overall diffs are positive, but small because of most of these structs are still marked as doNotEnreg in impNormStructVal, it will be fixed next.

Positive diffs come from:

  1. using movups (for STORE_LCL_VAR instead of movdqu that is currently used for STORE_BLK), there was a PR https://github.com/dotnet/runtime/pull/1367/files that would use movups for all, but for now, it is useful for me to have different codegen for them, allows me to find diffs easily.
  2. VN and CSE can propagate ASG(struct, 0) and similar constructions now, so we can coalesce chains of struct assignments now for zero-init, I will add non-zero cases later. It gives us diffs like -29 (-53.70% of base) : System.Private.CoreLib.dasm - SyncSuccessSentinelStateMachineBox[VoidTaskResult][System.Threading.Tasks.VoidTaskResult]:.ctor():this, that will be an issue in the next PR, see the discussion here First Class Structs: stop lying about underlying type. #1231 (comment);

The negative diffs come from:

  1. STORE_BLK contained logic is less efficient, it often doesn't mark Data as contained when it is generating only one instruction;
  2. fgMorphOneAsgBlockOp could retype structs with one gcField into primitive type copy without barriers and reporting, now we are generating costly STORE_OBJ, a primitive fix for it fails on a few library tests, I am checking them now.
diffs for the Reg struct copies commit, x64, crossgen framework
Total bytes of diff: -4957 (-0.02% of base)
diff is an improvement.
Top file improvements (bytes):
-1274 : Microsoft.Diagnostics.Tracing.TraceEvent.dasm (-0.04% of base)
-1075 : System.Private.Xml.dasm (-0.03% of base)
-496 : System.Linq.Expressions.dasm (-0.02% of base)
-324 : System.Data.Common.dasm (-0.03% of base)
-322 : System.Private.CoreLib.dasm (-0.01% of base)
-308 : System.Transactions.Local.dasm (-0.30% of base)
-179 : Newtonsoft.Json.dasm (-0.03% of base)
-140 : Microsoft.CodeAnalysis.CSharp.dasm (-0.01% of base)
-140 : Microsoft.CodeAnalysis.VisualBasic.dasm (-0.01% of base)
-114 : System.Linq.dasm (-0.08% of base)
-98 : System.Linq.Parallel.dasm (-0.02% of base)
-76 : System.Security.AccessControl.dasm (-0.12% of base)
-62 : xunit.performance.metrics.dasm (-0.46% of base)
-56 : System.Private.DataContractSerialization.dasm (-0.01% of base)
-54 : Microsoft.CodeAnalysis.dasm (-0.01% of base)
-36 : System.IO.FileSystem.dasm (-0.06% of base)
-35 : xunit.execution.dotnet.dasm (-0.02% of base)
-28 : Microsoft.CSharp.dasm (-0.01% of base)
-24 : System.Reflection.Metadata.dasm (-0.01% of base)
-20 : System.Security.Cryptography.X509Certificates.dasm (-0.01% of base)
37 total files with Code Size differences (37 improved, 0 regressed), 72 unchanged.
Top method improvements (bytes):
-304 (-0.91% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ClrTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-296 (-0.82% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ClrPrivateTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-256 (-0.53% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.KernelTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-74 (-0.07% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ApplicationServerTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-50 (-2.43% of base) : System.Private.Xml.dasm - System.Xml.Schema.Compiler:CalculateEffectiveTotalRange(System.Xml.Schema.XmlSchemaParticle,byref,byref):this
-50 (-2.42% of base) : System.Private.Xml.dasm - System.Xml.Schema.SchemaCollectionCompiler:CalculateEffectiveTotalRange(System.Xml.Schema.XmlSchemaParticle,byref,byref):this
-44 (-1.50% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.LocalRewriter:MakeDecimalLiteral(Microsoft.CodeAnalysis.CSharp.CSharpSyntaxNode,Microsoft.CodeAnalysis.ConstantValue):Microsoft.CodeAnalysis.CSharp.BoundExpression:this
-44 (-2.42% of base) : System.Data.Common.dasm - System.Data.Common.TimeSpanStorage:Aggregate(System.Int32[],int):System.Object:this
-40 (-0.87% of base) : Microsoft.CodeAnalysis.VisualBasic.dasm - Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.ExpressionEvaluator:PerformCompileTimeBinaryOperation(ushort,byte,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.ExpressionSyntax):Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst
-40 (-1.66% of base) : Newtonsoft.Json.dasm - Newtonsoft.Json.Utilities.ConvertUtils:DecimalTryParse(System.Char[],int,int,byref):int
-32 (-3.02% of base) : System.Private.Xml.dasm - System.Xml.Schema.SchemaCollectionCompiler:CalculateSequenceRange(System.Xml.Schema.XmlSchemaSequence,byref,byref):this
-30 (-2.48% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.StartStopActivityComputer:FixAndProcessWindowsASP(Microsoft.Diagnostics.Tracing.TraceEvent,System.Collections.Generic.KeyValuePair`2[System.Guid,System.Guid][]):this
-30 (-3.35% of base) : System.Private.Xml.dasm - System.Xml.Schema.Compiler:IsSequenceFromChoice(System.Xml.Schema.XmlSchemaSequence,System.Xml.Schema.XmlSchemaChoice):bool:this
-30 (-1.68% of base) : System.Private.Xml.dasm - System.Xml.Xsl.IlGen.XmlILOptimizerVisitor:FoldArithmetic(int,System.Xml.Xsl.Qil.QilLiteral,System.Xml.Xsl.Qil.QilLiteral):System.Xml.Xsl.Qil.QilNode:this
-26 (-0.66% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.Binder:DoUncheckedConversion(byte,Microsoft.CodeAnalysis.ConstantValue):System.Object
-26 (-0.57% of base) : Microsoft.CodeAnalysis.VisualBasic.dasm - Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.Scanner:ScanNumericLiteral(Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.SyntaxList`1[[Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.VisualBasicSyntaxNode, Microsoft.CodeAnalysis.VisualBasic, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35]]):Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.SyntaxToken:this
-26 (-2.50% of base) : System.Private.CoreLib.dasm - System.TimeZoneInfo:CreateAdjustmentRuleFromTimeZoneInformation(byref,System.DateTime,System.DateTime,int):AdjustmentRule
-24 (-0.37% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.Binder:FoldNeverOverflowBinaryOperators(int,Microsoft.CodeAnalysis.ConstantValue,Microsoft.CodeAnalysis.ConstantValue):System.Object
-24 (-2.11% of base) : Microsoft.CSharp.dasm - Microsoft.CSharp.RuntimeBinder.Semantics.ExpressionBinder:BindDecimalConstCast(Microsoft.CSharp.RuntimeBinder.Semantics.CType,Microsoft.CSharp.RuntimeBinder.Semantics.CType,Microsoft.CSharp.RuntimeBinder.Semantics.ExprConstant):Microsoft.CSharp.RuntimeBinder.Semantics.Expr
-24 (-1.17% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - <>c__DisplayClass0_0:<.ctor>b__1(Microsoft.Diagnostics.Tracing.TraceEvent):this
Total diffs for frameworks:
x64 Total bytes of diff: -5890 (-0.02% of base)
1338 total methods with Code Size differences (1262 improved, 76 regressed), 178158 unchanged.
arm64 Total bytes of diff: -23656 (-0.02% of base)
489 total methods with Code Size differences (311 improved, 178 regressed), 157900 unchanged.
arm Total bytes of diff: -1576 (-0.00% of base)
250 total methods with Code Size differences (169 improved, 81 regressed), 158053 unchanged.
x86 Total bytes of diff: -2962 (-0.01% of base)
580 total methods with Code Size differences (535 improved, 45 regressed), 178824 unchanged.

Based on #1231 (comment).

Side note: varTypeIsSmall and similar functions in vartype.h should assert on TYP_STRUCT because they don't have enough information to get a correct result, the callers should be responsible for handling that. It is a preexisting issue, but that change bumps its priority, I am working on a fix in another branch.

@sandreenkosandreenko added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Feb 15, 2020
@sandreenko
sandreenkoforce-pushed the mergeMike'sChange branch 2 times, most recently from c3556e3 to 3bc8f8eCompareFebruary 24, 2020 18:20
@sandreenko
sandreenko marked this pull request as ready for review February 24, 2020 19:09
@sandreenko

Copy link
Copy Markdown
ContributorAuthor

PTAL @CarolEidt @dotnet/jit-contrib

Comment threadsrc/coreclr/src/jit/lower.cpp Outdated

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

That is loweing, so nobody will read these flags, but I set them to have closer diffs.

@CarolEidtCarolEidt left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

Sergey Andreenko added 5 commits February 25, 2020 13:25
The old code was expecting `ASG` in a form that doesn't exist anymore.
Keep `ASG(LCL_VAR struct, LCL_VAR or INIT_VALUE)` representation in morph
and rationalize and change it to STORE_LCL_VAR later.
and fix format error after merge.
// Ensure that lclVar nodes are typed correctly.
assert(!varDsc->lvNormalizeOnStore() || (targetType == genActualType(varDsc->TypeGet())));
#ifdef DEBUG
var_types op1Type = op1->TypeGet();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Merged my changes with the new assert from #32750.

if (asgType == TYP_STRUCT)
{
if (clsHnd == NO_CLASS_HANDLE)
// It is possible to use `initobj` to init a primitive type on the stack,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@kunalspathak thanks for your feedback, I added an example where var is not a struct, but ASG is.

@sandreenko
sandreenko merged commit ed8a5c5 into dotnet:masterFeb 26, 2020
@sandreenko
sandreenko deleted the mergeMike'sChange branch May 18, 2020 23:03
@ghostghost locked as resolved and limited conversation to collaborators Dec 10, 2020
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@sandreenko@CarolEidt
, '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

Reg struct copy. - #32362

Merged
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:mergeMike'sChange
Feb 26, 2020
Merged

Reg struct copy.#32362
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:mergeMike'sChange

Conversation

@sandreenko

@sandreenkosandreenko commented Feb 15, 2020

Copy link
Copy Markdown
Contributor

This PR changes the way we handle struct copies.
cc8c366: First, it deletes rationalize transformation that was converting ASG(LCL_VAR struct, smth) into STORE_BLK or STORE_OBJ.
3bc8f8e: Then it skips fgMorphOneAsgBlockOp transformation for ASG(LCL_VAR struct, smth), where struct can be replaced with a primitive type.

The overall diffs are positive, but small because of most of these structs are still marked as doNotEnreg in impNormStructVal, it will be fixed next.

Positive diffs come from:

  1. using movups (for STORE_LCL_VAR instead of movdqu that is currently used for STORE_BLK), there was a PR https://github.com/dotnet/runtime/pull/1367/files that would use movups for all, but for now, it is useful for me to have different codegen for them, allows me to find diffs easily.
  2. VN and CSE can propagate ASG(struct, 0) and similar constructions now, so we can coalesce chains of struct assignments now for zero-init, I will add non-zero cases later. It gives us diffs like -29 (-53.70% of base) : System.Private.CoreLib.dasm - SyncSuccessSentinelStateMachineBox[VoidTaskResult][System.Threading.Tasks.VoidTaskResult]:.ctor():this, that will be an issue in the next PR, see the discussion here First Class Structs: stop lying about underlying type. #1231 (comment);

The negative diffs come from:

  1. STORE_BLK contained logic is less efficient, it often doesn't mark Data as contained when it is generating only one instruction;
  2. fgMorphOneAsgBlockOp could retype structs with one gcField into primitive type copy without barriers and reporting, now we are generating costly STORE_OBJ, a primitive fix for it fails on a few library tests, I am checking them now.
diffs for the Reg struct copies commit, x64, crossgen framework
Total bytes of diff: -4957 (-0.02% of base)
diff is an improvement.
Top file improvements (bytes):
-1274 : Microsoft.Diagnostics.Tracing.TraceEvent.dasm (-0.04% of base)
-1075 : System.Private.Xml.dasm (-0.03% of base)
-496 : System.Linq.Expressions.dasm (-0.02% of base)
-324 : System.Data.Common.dasm (-0.03% of base)
-322 : System.Private.CoreLib.dasm (-0.01% of base)
-308 : System.Transactions.Local.dasm (-0.30% of base)
-179 : Newtonsoft.Json.dasm (-0.03% of base)
-140 : Microsoft.CodeAnalysis.CSharp.dasm (-0.01% of base)
-140 : Microsoft.CodeAnalysis.VisualBasic.dasm (-0.01% of base)
-114 : System.Linq.dasm (-0.08% of base)
-98 : System.Linq.Parallel.dasm (-0.02% of base)
-76 : System.Security.AccessControl.dasm (-0.12% of base)
-62 : xunit.performance.metrics.dasm (-0.46% of base)
-56 : System.Private.DataContractSerialization.dasm (-0.01% of base)
-54 : Microsoft.CodeAnalysis.dasm (-0.01% of base)
-36 : System.IO.FileSystem.dasm (-0.06% of base)
-35 : xunit.execution.dotnet.dasm (-0.02% of base)
-28 : Microsoft.CSharp.dasm (-0.01% of base)
-24 : System.Reflection.Metadata.dasm (-0.01% of base)
-20 : System.Security.Cryptography.X509Certificates.dasm (-0.01% of base)
37 total files with Code Size differences (37 improved, 0 regressed), 72 unchanged.
Top method improvements (bytes):
-304 (-0.91% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ClrTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-296 (-0.82% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ClrPrivateTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-256 (-0.53% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.KernelTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-74 (-0.07% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ApplicationServerTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-50 (-2.43% of base) : System.Private.Xml.dasm - System.Xml.Schema.Compiler:CalculateEffectiveTotalRange(System.Xml.Schema.XmlSchemaParticle,byref,byref):this
-50 (-2.42% of base) : System.Private.Xml.dasm - System.Xml.Schema.SchemaCollectionCompiler:CalculateEffectiveTotalRange(System.Xml.Schema.XmlSchemaParticle,byref,byref):this
-44 (-1.50% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.LocalRewriter:MakeDecimalLiteral(Microsoft.CodeAnalysis.CSharp.CSharpSyntaxNode,Microsoft.CodeAnalysis.ConstantValue):Microsoft.CodeAnalysis.CSharp.BoundExpression:this
-44 (-2.42% of base) : System.Data.Common.dasm - System.Data.Common.TimeSpanStorage:Aggregate(System.Int32[],int):System.Object:this
-40 (-0.87% of base) : Microsoft.CodeAnalysis.VisualBasic.dasm - Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.ExpressionEvaluator:PerformCompileTimeBinaryOperation(ushort,byte,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.ExpressionSyntax):Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst
-40 (-1.66% of base) : Newtonsoft.Json.dasm - Newtonsoft.Json.Utilities.ConvertUtils:DecimalTryParse(System.Char[],int,int,byref):int
-32 (-3.02% of base) : System.Private.Xml.dasm - System.Xml.Schema.SchemaCollectionCompiler:CalculateSequenceRange(System.Xml.Schema.XmlSchemaSequence,byref,byref):this
-30 (-2.48% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.StartStopActivityComputer:FixAndProcessWindowsASP(Microsoft.Diagnostics.Tracing.TraceEvent,System.Collections.Generic.KeyValuePair`2[System.Guid,System.Guid][]):this
-30 (-3.35% of base) : System.Private.Xml.dasm - System.Xml.Schema.Compiler:IsSequenceFromChoice(System.Xml.Schema.XmlSchemaSequence,System.Xml.Schema.XmlSchemaChoice):bool:this
-30 (-1.68% of base) : System.Private.Xml.dasm - System.Xml.Xsl.IlGen.XmlILOptimizerVisitor:FoldArithmetic(int,System.Xml.Xsl.Qil.QilLiteral,System.Xml.Xsl.Qil.QilLiteral):System.Xml.Xsl.Qil.QilNode:this
-26 (-0.66% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.Binder:DoUncheckedConversion(byte,Microsoft.CodeAnalysis.ConstantValue):System.Object
-26 (-0.57% of base) : Microsoft.CodeAnalysis.VisualBasic.dasm - Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.Scanner:ScanNumericLiteral(Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.SyntaxList`1[[Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.VisualBasicSyntaxNode, Microsoft.CodeAnalysis.VisualBasic, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35]]):Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.SyntaxToken:this
-26 (-2.50% of base) : System.Private.CoreLib.dasm - System.TimeZoneInfo:CreateAdjustmentRuleFromTimeZoneInformation(byref,System.DateTime,System.DateTime,int):AdjustmentRule
-24 (-0.37% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.Binder:FoldNeverOverflowBinaryOperators(int,Microsoft.CodeAnalysis.ConstantValue,Microsoft.CodeAnalysis.ConstantValue):System.Object
-24 (-2.11% of base) : Microsoft.CSharp.dasm - Microsoft.CSharp.RuntimeBinder.Semantics.ExpressionBinder:BindDecimalConstCast(Microsoft.CSharp.RuntimeBinder.Semantics.CType,Microsoft.CSharp.RuntimeBinder.Semantics.CType,Microsoft.CSharp.RuntimeBinder.Semantics.ExprConstant):Microsoft.CSharp.RuntimeBinder.Semantics.Expr
-24 (-1.17% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - <>c__DisplayClass0_0:<.ctor>b__1(Microsoft.Diagnostics.Tracing.TraceEvent):this
Total diffs for frameworks:
x64 Total bytes of diff: -5890 (-0.02% of base)
1338 total methods with Code Size differences (1262 improved, 76 regressed), 178158 unchanged.
arm64 Total bytes of diff: -23656 (-0.02% of base)
489 total methods with Code Size differences (311 improved, 178 regressed), 157900 unchanged.
arm Total bytes of diff: -1576 (-0.00% of base)
250 total methods with Code Size differences (169 improved, 81 regressed), 158053 unchanged.
x86 Total bytes of diff: -2962 (-0.01% of base)
580 total methods with Code Size differences (535 improved, 45 regressed), 178824 unchanged.

Based on #1231 (comment).

Side note: varTypeIsSmall and similar functions in vartype.h should assert on TYP_STRUCT because they don't have enough information to get a correct result, the callers should be responsible for handling that. It is a preexisting issue, but that change bumps its priority, I am working on a fix in another branch.

@sandreenkosandreenko added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Feb 15, 2020
@sandreenko
sandreenkoforce-pushed the mergeMike'sChange branch 2 times, most recently from c3556e3 to 3bc8f8eCompareFebruary 24, 2020 18:20
@sandreenko
sandreenko marked this pull request as ready for review February 24, 2020 19:09
@sandreenko

Copy link
Copy Markdown
ContributorAuthor

PTAL @CarolEidt @dotnet/jit-contrib

Comment threadsrc/coreclr/src/jit/lower.cpp Outdated

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

That is loweing, so nobody will read these flags, but I set them to have closer diffs.

@CarolEidtCarolEidt left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

Sergey Andreenko added 5 commits February 25, 2020 13:25
The old code was expecting `ASG` in a form that doesn't exist anymore.
Keep `ASG(LCL_VAR struct, LCL_VAR or INIT_VALUE)` representation in morph
and rationalize and change it to STORE_LCL_VAR later.
and fix format error after merge.
// Ensure that lclVar nodes are typed correctly.
assert(!varDsc->lvNormalizeOnStore() || (targetType == genActualType(varDsc->TypeGet())));
#ifdef DEBUG
var_types op1Type = op1->TypeGet();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Merged my changes with the new assert from #32750.

if (asgType == TYP_STRUCT)
{
if (clsHnd == NO_CLASS_HANDLE)
// It is possible to use `initobj` to init a primitive type on the stack,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@kunalspathak thanks for your feedback, I added an example where var is not a struct, but ASG is.

@sandreenko
sandreenko merged commit ed8a5c5 into dotnet:masterFeb 26, 2020
@sandreenko
sandreenko deleted the mergeMike'sChange branch May 18, 2020 23:03
@ghostghost locked as resolved and limited conversation to collaborators Dec 10, 2020
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@sandreenko@CarolEidt
, '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

Reg struct copy. - #32362

Merged
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:mergeMike'sChange
Feb 26, 2020
Merged

Reg struct copy.#32362
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:mergeMike'sChange

Conversation

@sandreenko

@sandreenkosandreenko commented Feb 15, 2020

Copy link
Copy Markdown
Contributor

This PR changes the way we handle struct copies.
cc8c366: First, it deletes rationalize transformation that was converting ASG(LCL_VAR struct, smth) into STORE_BLK or STORE_OBJ.
3bc8f8e: Then it skips fgMorphOneAsgBlockOp transformation for ASG(LCL_VAR struct, smth), where struct can be replaced with a primitive type.

The overall diffs are positive, but small because of most of these structs are still marked as doNotEnreg in impNormStructVal, it will be fixed next.

Positive diffs come from:

  1. using movups (for STORE_LCL_VAR instead of movdqu that is currently used for STORE_BLK), there was a PR https://github.com/dotnet/runtime/pull/1367/files that would use movups for all, but for now, it is useful for me to have different codegen for them, allows me to find diffs easily.
  2. VN and CSE can propagate ASG(struct, 0) and similar constructions now, so we can coalesce chains of struct assignments now for zero-init, I will add non-zero cases later. It gives us diffs like -29 (-53.70% of base) : System.Private.CoreLib.dasm - SyncSuccessSentinelStateMachineBox[VoidTaskResult][System.Threading.Tasks.VoidTaskResult]:.ctor():this, that will be an issue in the next PR, see the discussion here First Class Structs: stop lying about underlying type. #1231 (comment);

The negative diffs come from:

  1. STORE_BLK contained logic is less efficient, it often doesn't mark Data as contained when it is generating only one instruction;
  2. fgMorphOneAsgBlockOp could retype structs with one gcField into primitive type copy without barriers and reporting, now we are generating costly STORE_OBJ, a primitive fix for it fails on a few library tests, I am checking them now.
diffs for the Reg struct copies commit, x64, crossgen framework
Total bytes of diff: -4957 (-0.02% of base)
diff is an improvement.
Top file improvements (bytes):
-1274 : Microsoft.Diagnostics.Tracing.TraceEvent.dasm (-0.04% of base)
-1075 : System.Private.Xml.dasm (-0.03% of base)
-496 : System.Linq.Expressions.dasm (-0.02% of base)
-324 : System.Data.Common.dasm (-0.03% of base)
-322 : System.Private.CoreLib.dasm (-0.01% of base)
-308 : System.Transactions.Local.dasm (-0.30% of base)
-179 : Newtonsoft.Json.dasm (-0.03% of base)
-140 : Microsoft.CodeAnalysis.CSharp.dasm (-0.01% of base)
-140 : Microsoft.CodeAnalysis.VisualBasic.dasm (-0.01% of base)
-114 : System.Linq.dasm (-0.08% of base)
-98 : System.Linq.Parallel.dasm (-0.02% of base)
-76 : System.Security.AccessControl.dasm (-0.12% of base)
-62 : xunit.performance.metrics.dasm (-0.46% of base)
-56 : System.Private.DataContractSerialization.dasm (-0.01% of base)
-54 : Microsoft.CodeAnalysis.dasm (-0.01% of base)
-36 : System.IO.FileSystem.dasm (-0.06% of base)
-35 : xunit.execution.dotnet.dasm (-0.02% of base)
-28 : Microsoft.CSharp.dasm (-0.01% of base)
-24 : System.Reflection.Metadata.dasm (-0.01% of base)
-20 : System.Security.Cryptography.X509Certificates.dasm (-0.01% of base)
37 total files with Code Size differences (37 improved, 0 regressed), 72 unchanged.
Top method improvements (bytes):
-304 (-0.91% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ClrTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-296 (-0.82% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ClrPrivateTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-256 (-0.53% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.KernelTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-74 (-0.07% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ApplicationServerTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-50 (-2.43% of base) : System.Private.Xml.dasm - System.Xml.Schema.Compiler:CalculateEffectiveTotalRange(System.Xml.Schema.XmlSchemaParticle,byref,byref):this
-50 (-2.42% of base) : System.Private.Xml.dasm - System.Xml.Schema.SchemaCollectionCompiler:CalculateEffectiveTotalRange(System.Xml.Schema.XmlSchemaParticle,byref,byref):this
-44 (-1.50% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.LocalRewriter:MakeDecimalLiteral(Microsoft.CodeAnalysis.CSharp.CSharpSyntaxNode,Microsoft.CodeAnalysis.ConstantValue):Microsoft.CodeAnalysis.CSharp.BoundExpression:this
-44 (-2.42% of base) : System.Data.Common.dasm - System.Data.Common.TimeSpanStorage:Aggregate(System.Int32[],int):System.Object:this
-40 (-0.87% of base) : Microsoft.CodeAnalysis.VisualBasic.dasm - Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.ExpressionEvaluator:PerformCompileTimeBinaryOperation(ushort,byte,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.ExpressionSyntax):Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst
-40 (-1.66% of base) : Newtonsoft.Json.dasm - Newtonsoft.Json.Utilities.ConvertUtils:DecimalTryParse(System.Char[],int,int,byref):int
-32 (-3.02% of base) : System.Private.Xml.dasm - System.Xml.Schema.SchemaCollectionCompiler:CalculateSequenceRange(System.Xml.Schema.XmlSchemaSequence,byref,byref):this
-30 (-2.48% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.StartStopActivityComputer:FixAndProcessWindowsASP(Microsoft.Diagnostics.Tracing.TraceEvent,System.Collections.Generic.KeyValuePair`2[System.Guid,System.Guid][]):this
-30 (-3.35% of base) : System.Private.Xml.dasm - System.Xml.Schema.Compiler:IsSequenceFromChoice(System.Xml.Schema.XmlSchemaSequence,System.Xml.Schema.XmlSchemaChoice):bool:this
-30 (-1.68% of base) : System.Private.Xml.dasm - System.Xml.Xsl.IlGen.XmlILOptimizerVisitor:FoldArithmetic(int,System.Xml.Xsl.Qil.QilLiteral,System.Xml.Xsl.Qil.QilLiteral):System.Xml.Xsl.Qil.QilNode:this
-26 (-0.66% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.Binder:DoUncheckedConversion(byte,Microsoft.CodeAnalysis.ConstantValue):System.Object
-26 (-0.57% of base) : Microsoft.CodeAnalysis.VisualBasic.dasm - Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.Scanner:ScanNumericLiteral(Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.SyntaxList`1[[Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.VisualBasicSyntaxNode, Microsoft.CodeAnalysis.VisualBasic, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35]]):Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.SyntaxToken:this
-26 (-2.50% of base) : System.Private.CoreLib.dasm - System.TimeZoneInfo:CreateAdjustmentRuleFromTimeZoneInformation(byref,System.DateTime,System.DateTime,int):AdjustmentRule
-24 (-0.37% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.Binder:FoldNeverOverflowBinaryOperators(int,Microsoft.CodeAnalysis.ConstantValue,Microsoft.CodeAnalysis.ConstantValue):System.Object
-24 (-2.11% of base) : Microsoft.CSharp.dasm - Microsoft.CSharp.RuntimeBinder.Semantics.ExpressionBinder:BindDecimalConstCast(Microsoft.CSharp.RuntimeBinder.Semantics.CType,Microsoft.CSharp.RuntimeBinder.Semantics.CType,Microsoft.CSharp.RuntimeBinder.Semantics.ExprConstant):Microsoft.CSharp.RuntimeBinder.Semantics.Expr
-24 (-1.17% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - <>c__DisplayClass0_0:<.ctor>b__1(Microsoft.Diagnostics.Tracing.TraceEvent):this
Total diffs for frameworks:
x64 Total bytes of diff: -5890 (-0.02% of base)
1338 total methods with Code Size differences (1262 improved, 76 regressed), 178158 unchanged.
arm64 Total bytes of diff: -23656 (-0.02% of base)
489 total methods with Code Size differences (311 improved, 178 regressed), 157900 unchanged.
arm Total bytes of diff: -1576 (-0.00% of base)
250 total methods with Code Size differences (169 improved, 81 regressed), 158053 unchanged.
x86 Total bytes of diff: -2962 (-0.01% of base)
580 total methods with Code Size differences (535 improved, 45 regressed), 178824 unchanged.

Based on #1231 (comment).

Side note: varTypeIsSmall and similar functions in vartype.h should assert on TYP_STRUCT because they don't have enough information to get a correct result, the callers should be responsible for handling that. It is a preexisting issue, but that change bumps its priority, I am working on a fix in another branch.

@sandreenkosandreenko added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Feb 15, 2020
@sandreenko
sandreenkoforce-pushed the mergeMike'sChange branch 2 times, most recently from c3556e3 to 3bc8f8eCompareFebruary 24, 2020 18:20
@sandreenko
sandreenko marked this pull request as ready for review February 24, 2020 19:09
@sandreenko

Copy link
Copy Markdown
ContributorAuthor

PTAL @CarolEidt @dotnet/jit-contrib

Comment threadsrc/coreclr/src/jit/lower.cpp Outdated

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

That is loweing, so nobody will read these flags, but I set them to have closer diffs.

@CarolEidtCarolEidt left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

Sergey Andreenko added 5 commits February 25, 2020 13:25
The old code was expecting `ASG` in a form that doesn't exist anymore.
Keep `ASG(LCL_VAR struct, LCL_VAR or INIT_VALUE)` representation in morph
and rationalize and change it to STORE_LCL_VAR later.
and fix format error after merge.
// Ensure that lclVar nodes are typed correctly.
assert(!varDsc->lvNormalizeOnStore() || (targetType == genActualType(varDsc->TypeGet())));
#ifdef DEBUG
var_types op1Type = op1->TypeGet();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Merged my changes with the new assert from #32750.

if (asgType == TYP_STRUCT)
{
if (clsHnd == NO_CLASS_HANDLE)
// It is possible to use `initobj` to init a primitive type on the stack,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@kunalspathak thanks for your feedback, I added an example where var is not a struct, but ASG is.

@sandreenko
sandreenko merged commit ed8a5c5 into dotnet:masterFeb 26, 2020
@sandreenko
sandreenko deleted the mergeMike'sChange branch May 18, 2020 23:03
@ghostghost locked as resolved and limited conversation to collaborators Dec 10, 2020
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@sandreenko@CarolEidt
, '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

Reg struct copy. - #32362

Merged
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:mergeMike'sChange
Feb 26, 2020
Merged

Reg struct copy.#32362
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:mergeMike'sChange

Conversation

@sandreenko

@sandreenkosandreenko commented Feb 15, 2020

Copy link
Copy Markdown
Contributor

This PR changes the way we handle struct copies.
cc8c366: First, it deletes rationalize transformation that was converting ASG(LCL_VAR struct, smth) into STORE_BLK or STORE_OBJ.
3bc8f8e: Then it skips fgMorphOneAsgBlockOp transformation for ASG(LCL_VAR struct, smth), where struct can be replaced with a primitive type.

The overall diffs are positive, but small because of most of these structs are still marked as doNotEnreg in impNormStructVal, it will be fixed next.

Positive diffs come from:

  1. using movups (for STORE_LCL_VAR instead of movdqu that is currently used for STORE_BLK), there was a PR https://github.com/dotnet/runtime/pull/1367/files that would use movups for all, but for now, it is useful for me to have different codegen for them, allows me to find diffs easily.
  2. VN and CSE can propagate ASG(struct, 0) and similar constructions now, so we can coalesce chains of struct assignments now for zero-init, I will add non-zero cases later. It gives us diffs like -29 (-53.70% of base) : System.Private.CoreLib.dasm - SyncSuccessSentinelStateMachineBox[VoidTaskResult][System.Threading.Tasks.VoidTaskResult]:.ctor():this, that will be an issue in the next PR, see the discussion here First Class Structs: stop lying about underlying type. #1231 (comment);

The negative diffs come from:

  1. STORE_BLK contained logic is less efficient, it often doesn't mark Data as contained when it is generating only one instruction;
  2. fgMorphOneAsgBlockOp could retype structs with one gcField into primitive type copy without barriers and reporting, now we are generating costly STORE_OBJ, a primitive fix for it fails on a few library tests, I am checking them now.
diffs for the Reg struct copies commit, x64, crossgen framework
Total bytes of diff: -4957 (-0.02% of base)
diff is an improvement.
Top file improvements (bytes):
-1274 : Microsoft.Diagnostics.Tracing.TraceEvent.dasm (-0.04% of base)
-1075 : System.Private.Xml.dasm (-0.03% of base)
-496 : System.Linq.Expressions.dasm (-0.02% of base)
-324 : System.Data.Common.dasm (-0.03% of base)
-322 : System.Private.CoreLib.dasm (-0.01% of base)
-308 : System.Transactions.Local.dasm (-0.30% of base)
-179 : Newtonsoft.Json.dasm (-0.03% of base)
-140 : Microsoft.CodeAnalysis.CSharp.dasm (-0.01% of base)
-140 : Microsoft.CodeAnalysis.VisualBasic.dasm (-0.01% of base)
-114 : System.Linq.dasm (-0.08% of base)
-98 : System.Linq.Parallel.dasm (-0.02% of base)
-76 : System.Security.AccessControl.dasm (-0.12% of base)
-62 : xunit.performance.metrics.dasm (-0.46% of base)
-56 : System.Private.DataContractSerialization.dasm (-0.01% of base)
-54 : Microsoft.CodeAnalysis.dasm (-0.01% of base)
-36 : System.IO.FileSystem.dasm (-0.06% of base)
-35 : xunit.execution.dotnet.dasm (-0.02% of base)
-28 : Microsoft.CSharp.dasm (-0.01% of base)
-24 : System.Reflection.Metadata.dasm (-0.01% of base)
-20 : System.Security.Cryptography.X509Certificates.dasm (-0.01% of base)
37 total files with Code Size differences (37 improved, 0 regressed), 72 unchanged.
Top method improvements (bytes):
-304 (-0.91% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ClrTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-296 (-0.82% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ClrPrivateTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-256 (-0.53% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.KernelTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-74 (-0.07% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ApplicationServerTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-50 (-2.43% of base) : System.Private.Xml.dasm - System.Xml.Schema.Compiler:CalculateEffectiveTotalRange(System.Xml.Schema.XmlSchemaParticle,byref,byref):this
-50 (-2.42% of base) : System.Private.Xml.dasm - System.Xml.Schema.SchemaCollectionCompiler:CalculateEffectiveTotalRange(System.Xml.Schema.XmlSchemaParticle,byref,byref):this
-44 (-1.50% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.LocalRewriter:MakeDecimalLiteral(Microsoft.CodeAnalysis.CSharp.CSharpSyntaxNode,Microsoft.CodeAnalysis.ConstantValue):Microsoft.CodeAnalysis.CSharp.BoundExpression:this
-44 (-2.42% of base) : System.Data.Common.dasm - System.Data.Common.TimeSpanStorage:Aggregate(System.Int32[],int):System.Object:this
-40 (-0.87% of base) : Microsoft.CodeAnalysis.VisualBasic.dasm - Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.ExpressionEvaluator:PerformCompileTimeBinaryOperation(ushort,byte,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.ExpressionSyntax):Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst
-40 (-1.66% of base) : Newtonsoft.Json.dasm - Newtonsoft.Json.Utilities.ConvertUtils:DecimalTryParse(System.Char[],int,int,byref):int
-32 (-3.02% of base) : System.Private.Xml.dasm - System.Xml.Schema.SchemaCollectionCompiler:CalculateSequenceRange(System.Xml.Schema.XmlSchemaSequence,byref,byref):this
-30 (-2.48% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.StartStopActivityComputer:FixAndProcessWindowsASP(Microsoft.Diagnostics.Tracing.TraceEvent,System.Collections.Generic.KeyValuePair`2[System.Guid,System.Guid][]):this
-30 (-3.35% of base) : System.Private.Xml.dasm - System.Xml.Schema.Compiler:IsSequenceFromChoice(System.Xml.Schema.XmlSchemaSequence,System.Xml.Schema.XmlSchemaChoice):bool:this
-30 (-1.68% of base) : System.Private.Xml.dasm - System.Xml.Xsl.IlGen.XmlILOptimizerVisitor:FoldArithmetic(int,System.Xml.Xsl.Qil.QilLiteral,System.Xml.Xsl.Qil.QilLiteral):System.Xml.Xsl.Qil.QilNode:this
-26 (-0.66% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.Binder:DoUncheckedConversion(byte,Microsoft.CodeAnalysis.ConstantValue):System.Object
-26 (-0.57% of base) : Microsoft.CodeAnalysis.VisualBasic.dasm - Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.Scanner:ScanNumericLiteral(Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.SyntaxList`1[[Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.VisualBasicSyntaxNode, Microsoft.CodeAnalysis.VisualBasic, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35]]):Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.SyntaxToken:this
-26 (-2.50% of base) : System.Private.CoreLib.dasm - System.TimeZoneInfo:CreateAdjustmentRuleFromTimeZoneInformation(byref,System.DateTime,System.DateTime,int):AdjustmentRule
-24 (-0.37% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.Binder:FoldNeverOverflowBinaryOperators(int,Microsoft.CodeAnalysis.ConstantValue,Microsoft.CodeAnalysis.ConstantValue):System.Object
-24 (-2.11% of base) : Microsoft.CSharp.dasm - Microsoft.CSharp.RuntimeBinder.Semantics.ExpressionBinder:BindDecimalConstCast(Microsoft.CSharp.RuntimeBinder.Semantics.CType,Microsoft.CSharp.RuntimeBinder.Semantics.CType,Microsoft.CSharp.RuntimeBinder.Semantics.ExprConstant):Microsoft.CSharp.RuntimeBinder.Semantics.Expr
-24 (-1.17% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - <>c__DisplayClass0_0:<.ctor>b__1(Microsoft.Diagnostics.Tracing.TraceEvent):this
Total diffs for frameworks:
x64 Total bytes of diff: -5890 (-0.02% of base)
1338 total methods with Code Size differences (1262 improved, 76 regressed), 178158 unchanged.
arm64 Total bytes of diff: -23656 (-0.02% of base)
489 total methods with Code Size differences (311 improved, 178 regressed), 157900 unchanged.
arm Total bytes of diff: -1576 (-0.00% of base)
250 total methods with Code Size differences (169 improved, 81 regressed), 158053 unchanged.
x86 Total bytes of diff: -2962 (-0.01% of base)
580 total methods with Code Size differences (535 improved, 45 regressed), 178824 unchanged.

Based on #1231 (comment).

Side note: varTypeIsSmall and similar functions in vartype.h should assert on TYP_STRUCT because they don't have enough information to get a correct result, the callers should be responsible for handling that. It is a preexisting issue, but that change bumps its priority, I am working on a fix in another branch.

@sandreenkosandreenko added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Feb 15, 2020
@sandreenko
sandreenkoforce-pushed the mergeMike'sChange branch 2 times, most recently from c3556e3 to 3bc8f8eCompareFebruary 24, 2020 18:20
@sandreenko
sandreenko marked this pull request as ready for review February 24, 2020 19:09
@sandreenko

Copy link
Copy Markdown
ContributorAuthor

PTAL @CarolEidt @dotnet/jit-contrib

Comment threadsrc/coreclr/src/jit/lower.cpp Outdated

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

That is loweing, so nobody will read these flags, but I set them to have closer diffs.

@CarolEidtCarolEidt left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

Sergey Andreenko added 5 commits February 25, 2020 13:25
The old code was expecting `ASG` in a form that doesn't exist anymore.
Keep `ASG(LCL_VAR struct, LCL_VAR or INIT_VALUE)` representation in morph
and rationalize and change it to STORE_LCL_VAR later.
and fix format error after merge.
// Ensure that lclVar nodes are typed correctly.
assert(!varDsc->lvNormalizeOnStore() || (targetType == genActualType(varDsc->TypeGet())));
#ifdef DEBUG
var_types op1Type = op1->TypeGet();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Merged my changes with the new assert from #32750.

if (asgType == TYP_STRUCT)
{
if (clsHnd == NO_CLASS_HANDLE)
// It is possible to use `initobj` to init a primitive type on the stack,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@kunalspathak thanks for your feedback, I added an example where var is not a struct, but ASG is.

@sandreenko
sandreenko merged commit ed8a5c5 into dotnet:masterFeb 26, 2020
@sandreenko
sandreenko deleted the mergeMike'sChange branch May 18, 2020 23:03
@ghostghost locked as resolved and limited conversation to collaborators Dec 10, 2020
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@sandreenko@CarolEidt
, '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

Reg struct copy. - #32362

Merged
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:mergeMike'sChange
Feb 26, 2020
Merged

Reg struct copy.#32362
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:mergeMike'sChange

Conversation

@sandreenko

@sandreenkosandreenko commented Feb 15, 2020

Copy link
Copy Markdown
Contributor

This PR changes the way we handle struct copies.
cc8c366: First, it deletes rationalize transformation that was converting ASG(LCL_VAR struct, smth) into STORE_BLK or STORE_OBJ.
3bc8f8e: Then it skips fgMorphOneAsgBlockOp transformation for ASG(LCL_VAR struct, smth), where struct can be replaced with a primitive type.

The overall diffs are positive, but small because of most of these structs are still marked as doNotEnreg in impNormStructVal, it will be fixed next.

Positive diffs come from:

  1. using movups (for STORE_LCL_VAR instead of movdqu that is currently used for STORE_BLK), there was a PR https://github.com/dotnet/runtime/pull/1367/files that would use movups for all, but for now, it is useful for me to have different codegen for them, allows me to find diffs easily.
  2. VN and CSE can propagate ASG(struct, 0) and similar constructions now, so we can coalesce chains of struct assignments now for zero-init, I will add non-zero cases later. It gives us diffs like -29 (-53.70% of base) : System.Private.CoreLib.dasm - SyncSuccessSentinelStateMachineBox[VoidTaskResult][System.Threading.Tasks.VoidTaskResult]:.ctor():this, that will be an issue in the next PR, see the discussion here First Class Structs: stop lying about underlying type. #1231 (comment);

The negative diffs come from:

  1. STORE_BLK contained logic is less efficient, it often doesn't mark Data as contained when it is generating only one instruction;
  2. fgMorphOneAsgBlockOp could retype structs with one gcField into primitive type copy without barriers and reporting, now we are generating costly STORE_OBJ, a primitive fix for it fails on a few library tests, I am checking them now.
diffs for the Reg struct copies commit, x64, crossgen framework
Total bytes of diff: -4957 (-0.02% of base)
diff is an improvement.
Top file improvements (bytes):
-1274 : Microsoft.Diagnostics.Tracing.TraceEvent.dasm (-0.04% of base)
-1075 : System.Private.Xml.dasm (-0.03% of base)
-496 : System.Linq.Expressions.dasm (-0.02% of base)
-324 : System.Data.Common.dasm (-0.03% of base)
-322 : System.Private.CoreLib.dasm (-0.01% of base)
-308 : System.Transactions.Local.dasm (-0.30% of base)
-179 : Newtonsoft.Json.dasm (-0.03% of base)
-140 : Microsoft.CodeAnalysis.CSharp.dasm (-0.01% of base)
-140 : Microsoft.CodeAnalysis.VisualBasic.dasm (-0.01% of base)
-114 : System.Linq.dasm (-0.08% of base)
-98 : System.Linq.Parallel.dasm (-0.02% of base)
-76 : System.Security.AccessControl.dasm (-0.12% of base)
-62 : xunit.performance.metrics.dasm (-0.46% of base)
-56 : System.Private.DataContractSerialization.dasm (-0.01% of base)
-54 : Microsoft.CodeAnalysis.dasm (-0.01% of base)
-36 : System.IO.FileSystem.dasm (-0.06% of base)
-35 : xunit.execution.dotnet.dasm (-0.02% of base)
-28 : Microsoft.CSharp.dasm (-0.01% of base)
-24 : System.Reflection.Metadata.dasm (-0.01% of base)
-20 : System.Security.Cryptography.X509Certificates.dasm (-0.01% of base)
37 total files with Code Size differences (37 improved, 0 regressed), 72 unchanged.
Top method improvements (bytes):
-304 (-0.91% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ClrTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-296 (-0.82% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ClrPrivateTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-256 (-0.53% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.KernelTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-74 (-0.07% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.Parsers.ApplicationServerTraceEventParser:EnumerateTemplates(System.Func`3[[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=5.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[Microsoft.Diagnostics.Tracing.EventFilterResponse, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]],System.Action`1[[Microsoft.Diagnostics.Tracing.TraceEvent, Microsoft.Diagnostics.Tracing.TraceEvent, Version=2.0.49.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]):this
-50 (-2.43% of base) : System.Private.Xml.dasm - System.Xml.Schema.Compiler:CalculateEffectiveTotalRange(System.Xml.Schema.XmlSchemaParticle,byref,byref):this
-50 (-2.42% of base) : System.Private.Xml.dasm - System.Xml.Schema.SchemaCollectionCompiler:CalculateEffectiveTotalRange(System.Xml.Schema.XmlSchemaParticle,byref,byref):this
-44 (-1.50% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.LocalRewriter:MakeDecimalLiteral(Microsoft.CodeAnalysis.CSharp.CSharpSyntaxNode,Microsoft.CodeAnalysis.ConstantValue):Microsoft.CodeAnalysis.CSharp.BoundExpression:this
-44 (-2.42% of base) : System.Data.Common.dasm - System.Data.Common.TimeSpanStorage:Aggregate(System.Int32[],int):System.Object:this
-40 (-0.87% of base) : Microsoft.CodeAnalysis.VisualBasic.dasm - Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.ExpressionEvaluator:PerformCompileTimeBinaryOperation(ushort,byte,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst,Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.ExpressionSyntax):Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.CConst
-40 (-1.66% of base) : Newtonsoft.Json.dasm - Newtonsoft.Json.Utilities.ConvertUtils:DecimalTryParse(System.Char[],int,int,byref):int
-32 (-3.02% of base) : System.Private.Xml.dasm - System.Xml.Schema.SchemaCollectionCompiler:CalculateSequenceRange(System.Xml.Schema.XmlSchemaSequence,byref,byref):this
-30 (-2.48% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - Microsoft.Diagnostics.Tracing.StartStopActivityComputer:FixAndProcessWindowsASP(Microsoft.Diagnostics.Tracing.TraceEvent,System.Collections.Generic.KeyValuePair`2[System.Guid,System.Guid][]):this
-30 (-3.35% of base) : System.Private.Xml.dasm - System.Xml.Schema.Compiler:IsSequenceFromChoice(System.Xml.Schema.XmlSchemaSequence,System.Xml.Schema.XmlSchemaChoice):bool:this
-30 (-1.68% of base) : System.Private.Xml.dasm - System.Xml.Xsl.IlGen.XmlILOptimizerVisitor:FoldArithmetic(int,System.Xml.Xsl.Qil.QilLiteral,System.Xml.Xsl.Qil.QilLiteral):System.Xml.Xsl.Qil.QilNode:this
-26 (-0.66% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.Binder:DoUncheckedConversion(byte,Microsoft.CodeAnalysis.ConstantValue):System.Object
-26 (-0.57% of base) : Microsoft.CodeAnalysis.VisualBasic.dasm - Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.Scanner:ScanNumericLiteral(Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.SyntaxList`1[[Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.VisualBasicSyntaxNode, Microsoft.CodeAnalysis.VisualBasic, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35]]):Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.SyntaxToken:this
-26 (-2.50% of base) : System.Private.CoreLib.dasm - System.TimeZoneInfo:CreateAdjustmentRuleFromTimeZoneInformation(byref,System.DateTime,System.DateTime,int):AdjustmentRule
-24 (-0.37% of base) : Microsoft.CodeAnalysis.CSharp.dasm - Microsoft.CodeAnalysis.CSharp.Binder:FoldNeverOverflowBinaryOperators(int,Microsoft.CodeAnalysis.ConstantValue,Microsoft.CodeAnalysis.ConstantValue):System.Object
-24 (-2.11% of base) : Microsoft.CSharp.dasm - Microsoft.CSharp.RuntimeBinder.Semantics.ExpressionBinder:BindDecimalConstCast(Microsoft.CSharp.RuntimeBinder.Semantics.CType,Microsoft.CSharp.RuntimeBinder.Semantics.CType,Microsoft.CSharp.RuntimeBinder.Semantics.ExprConstant):Microsoft.CSharp.RuntimeBinder.Semantics.Expr
-24 (-1.17% of base) : Microsoft.Diagnostics.Tracing.TraceEvent.dasm - <>c__DisplayClass0_0:<.ctor>b__1(Microsoft.Diagnostics.Tracing.TraceEvent):this
Total diffs for frameworks:
x64 Total bytes of diff: -5890 (-0.02% of base)
1338 total methods with Code Size differences (1262 improved, 76 regressed), 178158 unchanged.
arm64 Total bytes of diff: -23656 (-0.02% of base)
489 total methods with Code Size differences (311 improved, 178 regressed), 157900 unchanged.
arm Total bytes of diff: -1576 (-0.00% of base)
250 total methods with Code Size differences (169 improved, 81 regressed), 158053 unchanged.
x86 Total bytes of diff: -2962 (-0.01% of base)
580 total methods with Code Size differences (535 improved, 45 regressed), 178824 unchanged.

Based on #1231 (comment).

Side note: varTypeIsSmall and similar functions in vartype.h should assert on TYP_STRUCT because they don't have enough information to get a correct result, the callers should be responsible for handling that. It is a preexisting issue, but that change bumps its priority, I am working on a fix in another branch.

@sandreenkosandreenko added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Feb 15, 2020
@sandreenko
sandreenkoforce-pushed the mergeMike'sChange branch 2 times, most recently from c3556e3 to 3bc8f8eCompareFebruary 24, 2020 18:20
@sandreenko
sandreenko marked this pull request as ready for review February 24, 2020 19:09
@sandreenko

Copy link
Copy Markdown
ContributorAuthor

PTAL @CarolEidt @dotnet/jit-contrib

Comment threadsrc/coreclr/src/jit/lower.cpp Outdated

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

That is loweing, so nobody will read these flags, but I set them to have closer diffs.

@CarolEidtCarolEidt left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

Sergey Andreenko added 5 commits February 25, 2020 13:25
The old code was expecting `ASG` in a form that doesn't exist anymore.
Keep `ASG(LCL_VAR struct, LCL_VAR or INIT_VALUE)` representation in morph
and rationalize and change it to STORE_LCL_VAR later.
and fix format error after merge.
// Ensure that lclVar nodes are typed correctly.
assert(!varDsc->lvNormalizeOnStore() || (targetType == genActualType(varDsc->TypeGet())));
#ifdef DEBUG
var_types op1Type = op1->TypeGet();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Merged my changes with the new assert from #32750.

if (asgType == TYP_STRUCT)
{
if (clsHnd == NO_CLASS_HANDLE)
// It is possible to use `initobj` to init a primitive type on the stack,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@kunalspathak thanks for your feedback, I added an example where var is not a struct, but ASG is.

@sandreenko
sandreenko merged commit ed8a5c5 into dotnet:masterFeb 26, 2020
@sandreenko
sandreenko deleted the mergeMike'sChange branch May 18, 2020 23:03
@ghostghost locked as resolved and limited conversation to collaborators Dec 10, 2020
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@sandreenko@CarolEidt