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

Show file tree
Hide file tree
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
Cleaning up tests
  • Loading branch information
@TIHan
TIHan committed Apr 5, 2019
commit 2b06a30f1b0ac0f0d6d3612e56c5489894e43090
12 changes: 10 additions & 2 deletions tests/FSharp.Compiler.UnitTests/ILHelpers.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ module ILChecker =
p.WaitForExit()
p.StandardError.ReadToEnd(), p.ExitCode

/// Filters i.e ['The system type \'System.ReadOnlySpan`1\' was required but no referenced system DLL contained this type']
let private filterSpecialComment (text: string) =
let pattern = @"(\[\'(.*?)\'\])"
System.Text.RegularExpressions.Regex.Replace(text, pattern,
(fun me -> String.Empty)
)

let private checkAux extraDlls source expectedIL =
let Is64BitOperatingSystem = sizeof<nativeint> = 8
let architectureMoniker = if Is64BitOperatingSystem then "x64" else "x86"
Expand All @@ -57,8 +64,8 @@ module ILChecker =

File.WriteAllText(tmpFs, source)

let extraPackages = extraDlls |> Array.ofList |> Array.map (fun package -> "-r:" + package)
let errors, exitCode = checker.Compile(Array.append [| "fsc.exe"; "--optimize+"; "-o"; tmpDll; "-a"; tmpFs; |] extraPackages) |> Async.RunSynchronously
let extraReferences = extraDlls |> Array.ofList |> Array.map (fun reference -> "-r:" + reference)
let errors, exitCode = checker.Compile(Array.append [| "fsc.exe"; "--optimize+"; "-o"; tmpDll; "-a"; tmpFs; |] extraReferences) |> Async.RunSynchronously
let errors =
String.concat "\n" (errors |> Array.map (fun x -> x.Message))

Expand All @@ -78,6 +85,7 @@ module ILChecker =
if me.Value.StartsWith("//") then Environment.NewLine else String.Empty
else
me.Value), System.Text.RegularExpressions.RegexOptions.Singleline)
|> filterSpecialComment

expectedIL
|> List.iter (fun (ilCode: string) ->
Expand Down
8 changes: 4 additions & 4 deletions tests/FSharp.Compiler.UnitTests/Language/SpanOptimizationTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ let test () =
IL_0006: ldc.i4.0
IL_0007: stloc.2
IL_0008: ldloca.s V_0
IL_000a: call instance int32 valuetype ['The system type \'System.Span`1\' was required but no referenced system DLL contained this type']System.Span`1<object>::get_Length()
IL_000a: call instance int32 valuetype System.Span`1<object>::get_Length()
IL_000f: ldc.i4.1
IL_0010: sub
IL_0011: stloc.1
Expand All @@ -48,7 +48,7 @@ let test () =

IL_0016: ldloca.s V_0
IL_0018: ldloc.2
IL_0019: call instance !0& valuetype ['The system type \'System.Span`1\' was required but no referenced system DLL contained this type']System.Span`1<object>::get_Item(int32)
IL_0019: call instance !0& valuetype System.Span`1<object>::get_Item(int32)
IL_001e: stloc.3
IL_001f: ldloc.3
IL_0020: ldobj [mscorlib]System.Object
Expand Down Expand Up @@ -97,7 +97,7 @@ let test () =
IL_0006: ldc.i4.0
IL_0007: stloc.2
IL_0008: ldloca.s V_0
IL_000a: call instance int32 valuetype ['The system type \'System.ReadOnlySpan`1\' was required but no referenced system DLL contained this type']System.ReadOnlySpan`1<object>::get_Length()
IL_000a: call instance int32 valuetype System.ReadOnlySpan`1<object>::get_Length()
IL_000f: ldc.i4.1
IL_0010: sub
IL_0011: stloc.1
Expand All @@ -107,7 +107,7 @@ let test () =

IL_0016: ldloca.s V_0
IL_0018: ldloc.2
IL_0019: call instance !0 valuetype ['The system type \'System.ReadOnlySpan`1\' was required but no referenced system DLL contained this type']System.ReadOnlySpan`1<object>::get_Item(int32)
IL_0019: call instance !0 valuetype System.ReadOnlySpan`1<object>::get_Item(int32)
IL_001e: call void [mscorlib]System.Console::WriteLine(object)
IL_0023: ldloc.2
IL_0024: ldc.i4.1
Expand Down