Skip to content

Span for .. in .. do optimization #6213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KevinRansom merged 27 commits into from
Apr 16, 2019
Merged

Span for .. in .. do optimization #6213

Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
7b7dc8f
Trying to optimize span in for loop
TIHan Feb 5, 2019
d064f9b
Added Span_GetItem call
TIHan Feb 7, 2019
84bc179
Almost success with optimization
TIHan Feb 7, 2019
e088062
Fixed code gen
TIHan Feb 8, 2019
343d29d
Added Span optimization tests
TIHan Feb 11, 2019
4d5f2b9
Added ReadOnlySpan opt
TIHan Feb 12, 2019
2b06a30
Cleaning up tests
TIHan Feb 14, 2019
123dcd1
Moving tests around
TIHan Feb 15, 2019
a483901
Trying to figure out span tests
TIHan Feb 15, 2019
2931b10
Trying to fix some tests
TIHan Feb 19, 2019
4a09465
Trying to get some more tests passing
TIHan Mar 11, 2019
b506e37
Fixed range
TIHan Mar 11, 2019
185e86f
Trying to get tests to pass again
TIHan Mar 12, 2019
b331303
Fixing tests for netcore
TIHan Mar 12, 2019
3a8829a
Fix build
TIHan Mar 12, 2019
318f875
When a solution becomes unloaded, we should clear F#'s cache (#6420)
TIHan Apr 3, 2019
46f1b6d
Changing if directives
TIHan Apr 5, 2019
d7352d3
Simplifying
TIHan Apr 5, 2019
35c755a
Using a type shape for span optimization
TIHan Apr 10, 2019
ae91449
Fixing one test
TIHan Apr 10, 2019
d233338
Drastically simplified looking at the type shape for Span
TIHan Apr 10, 2019
962c634
Simplified a bit more
TIHan Apr 10, 2019
f2e950c
RunScript has expected error messages
TIHan Apr 10, 2019
4b5c002
Add back net472
TIHan Apr 10, 2019
76e30d5
Feedback
TIHan Apr 11, 2019
3764d52
Update SpanOptimizationTests.fs
TIHan Apr 11, 2019
b7a886a
Update SpanOptimizationTests.fs
TIHan Apr 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Simplified a bit more
  • Loading branch information
@TIHan
TIHan committed Apr 10, 2019
commit 962c634504ce6681fa32d63d25e0fac617b201e0
29 changes: 14 additions & 15 deletions src/fsharp/TypeChecker.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7133,25 +7133,24 @@ and TcAnonRecdExpr cenv overallTy env tpenv (isStruct, optOrigExpr, unsortedArgs


and TcForEachExpr cenv overallTy env tpenv (pat, enumSynExpr, bodySynExpr, mWholeExpr, spForLoop) =
let tryGetOptimizeReadOnlySpanMethods g m ty =
match tryDestReadOnlySpanTy g m ty with
let tryGetOptimizeSpanMethodsAux g m ty isReadOnlySpan =
match (if isReadOnlySpan then tryDestReadOnlySpanTy g m ty else tryDestSpanTy g m ty) with
| ValueSome(struct(_, destTy)) ->
match TryFindFSharpSignatureInstanceGetterProperty cenv env m "Item" ty [ g.int32_ty; mkInByrefTy g destTy ],
match TryFindFSharpSignatureInstanceGetterProperty cenv env m "Item" ty [ g.int32_ty; (if isReadOnlySpan then mkInByrefTy g destTy else mkByrefTy g destTy) ],
TryFindFSharpSignatureInstanceGetterProperty cenv env m "Length" ty [ g.int32_ty ] with
| Some(itemPropInfo), Some(lengthPropInfo) when itemPropInfo.HasGetter && lengthPropInfo.HasGetter -> ValueSome(struct(itemPropInfo.GetterMethod, lengthPropInfo.GetterMethod, true))
| _ -> ValueNone
| Some(itemPropInfo), Some(lengthPropInfo) when itemPropInfo.HasGetter && lengthPropInfo.HasGetter ->
ValueSome(struct(itemPropInfo.GetterMethod, lengthPropInfo.GetterMethod, isReadOnlySpan))
| _ ->
ValueNone
| _ ->
ValueNone

let tryGetOptimizeAnySpanMethods g m ty =
match tryDestSpanTy g m ty with
| ValueSome(struct(_, destTy)) ->
match TryFindFSharpSignatureInstanceGetterProperty cenv env m "Item" ty [ g.int32_ty; mkByrefTy g destTy ],
TryFindFSharpSignatureInstanceGetterProperty cenv env m "Length" ty [ g.int32_ty ] with
| Some(itemPropInfo), Some(lengthPropInfo) when itemPropInfo.HasGetter && lengthPropInfo.HasGetter -> ValueSome(struct(itemPropInfo.GetterMethod, lengthPropInfo.GetterMethod, false))
| _ -> ValueNone
| _ ->
tryGetOptimizeReadOnlySpanMethods g m ty
let tryGetOptimizeSpanMethods g m ty =
let result = tryGetOptimizeSpanMethodsAux g m ty false
if result.IsSome then
result
else
tryGetOptimizeSpanMethodsAux g m ty true

UnifyTypes cenv env mWholeExpr overallTy cenv.g.unit_ty

Expand Down Expand Up @@ -7189,7 +7188,7 @@ and TcForEachExpr cenv overallTy env tpenv (pat, enumSynExpr, bodySynExpr, mWhol

| _ ->
// try optimize 'for i in span do' for span or readonlyspan
match tryGetOptimizeAnySpanMethods cenv.g mWholeExpr enumExprTy with
match tryGetOptimizeSpanMethods cenv.g mWholeExpr enumExprTy with
| ValueSome(struct(getItemMethInfo, getLengthMethInfo, isReadOnlySpan)) ->
let tcVal = LightweightTcValForUsingInBuildMethodCall cenv.g
let spanVar, spanExpr = mkCompGenLocal mEnumExpr "span" enumExprTy
Expand Down