Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Reduce allocations #805

Merged
merged 19 commits into from
Oct 1, 2020
Merged

Reduce allocations #805

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
293a6ae
Ref -> Struct + Avoid lambda in hot path
TimLariviere Sep 21, 2020
ddf2ec8
Extract local functions from diff to avoid lambda capture
TimLariviere Sep 24, 2020
843f19a
ArrayPool + extract local functions
TimLariviere Sep 24, 2020
6bd7c38
Avoid returning lists for Collections.diff
TimLariviere Sep 24, 2020
5506823
Avoid boxing ValueOption
TimLariviere Sep 24, 2020
affb1d9
Avoid boxing XF.Color/Thickness/LayoutOptions
TimLariviere Sep 25, 2020
839f2d9
Avoid ValueOption boxing - take 2
TimLariviere Sep 26, 2020
e596d78
Remove need for registry
TimLariviere Sep 26, 2020
d56086c
Avoid A* B -> C form for F# functions
TimLariviere Sep 27, 2020
4be9d04
UpdateAttachedPropertiesForAttribute
TimLariviere Sep 28, 2020
e28df2c
Cleaning
TimLariviere Sep 28, 2020
9977ace
Missing fsproj
TimLariviere Sep 28, 2020
cadec42
0.60.0-preview1
TimLariviere Sep 30, 2020
5ff8794
Fix unit tests
TimLariviere Sep 30, 2020
ed60b0b
Default type
TimLariviere Sep 30, 2020
10feb7e
Fix samples
TimLariviere Oct 1, 2020
172ce2a
Change build script to fix macOS/Linux build
TimLariviere Oct 1, 2020
5084420
Explicit struct tuples for msbuild mono
TimLariviere Oct 1, 2020
7eccc49
Missing struct tuples
TimLariviere Oct 1, 2020
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
5 changes: 3 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
<PropertyGroup>
<Version>0.58.0</Version>
<Authors>Fabulous Contributors</Authors>
<PackageVersion>0.58.0</PackageVersion>
<PackageReleaseNotes>[All] Proper version constraints for the NuGet packages</PackageReleaseNotes>
<PackageVersion>0.58.0-memory031</PackageVersion>
<PackageReleaseNotes>[All] Proper version constraints for the NuGet packages
match struct</PackageReleaseNotes>
<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/fsprojects/Fabulous</PackageProjectUrl>
Expand Down
122 changes: 69 additions & 53 deletions Fabulous.CodeGen/src/Fabulous.CodeGen/Generator/CodeGenerator.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,63 @@ module CodeGenerator =

w.printfn ""
w

let generateUpdateAttachedPropertiesFunction (data: UpdateAttachedPropertiesData) (w: StringWriter) =
let printUpdateBaseIfNeeded (space: string) (isUnitRequired: bool) =
match data.BaseName with
| None when isUnitRequired = false ->
()
| None ->
w.printfn "%s()" space
| Some baseName ->
w.printfn "%sViewBuilders.Update%sAttachedProperties(propertyKey, prevOpt, curr, target)" space baseName

w.printfn " static member Update%sAttachedProperties (propertyKey: int, prevOpt: ViewElement voption, curr: ViewElement, target: obj) = " data.Name
if data.PropertiesWithAttachedProperties.Length = 0 then
printUpdateBaseIfNeeded " " true
else
w.printfn " match propertyKey with"
for p in data.PropertiesWithAttachedProperties do
w.printfn " | key when key = %s.KeyValue ->" (getAttributeKey p.CustomAttributeKey p.UniqueName)

for ap in p.AttachedProperties do
let hasApply = not (System.String.IsNullOrWhiteSpace(ap.ConvertModelToValue)) || not (System.String.IsNullOrWhiteSpace(ap.UpdateCode))
let attributeKey = getAttributeKey ap.CustomAttributeKey ap.UniqueName

w.printfn " let prev%sOpt = match prevOpt with ValueNone -> ValueNone | ValueSome prevChild -> prevChild.TryGetAttributeKeyed<%s>(%s)" ap.UniqueName ap.ModelType attributeKey
w.printfn " let curr%sOpt = curr.TryGetAttributeKeyed<%s>(%s)" ap.UniqueName ap.ModelType attributeKey
w.printfn " let target = target :?> %s" (Option.defaultValue "Xamarin.Forms.BindableObject" p.CollectionDataElementType)
TimLariviere marked this conversation as resolved.
Show resolved Hide resolved

if ap.ModelType = "ViewElement" && not hasApply then
w.printfn " match struct (prev%sOpt, curr%sOpt) with" ap.UniqueName ap.UniqueName
w.printfn " // For structured objects, dependsOn on reference equality"
w.printfn " | ValueSome prevValue, ValueSome newValue when identical prevValue newValue -> ()"
w.printfn " | ValueSome prevValue, ValueSome newValue when canReuseView prevValue newValue ->"
w.printfn " newValue.UpdateIncremental(prevValue, (%s.Get%s(target)))" data.FullName ap.Name
w.printfn " | _, ValueSome newValue ->"
w.printfn " %s.Set%s(target, (newValue.Create() :?> %s))" data.FullName ap.Name ap.OriginalType
w.printfn " | ValueSome _, ValueNone ->"
w.printfn " %s.Set%s(target, null)" data.FullName ap.Name
w.printfn " | ValueNone, ValueNone -> ()"

elif not (System.String.IsNullOrWhiteSpace(ap.UpdateCode)) then
w.printfn " %s prev%sOpt curr%sOpt targetChild" ap.UniqueName ap.UniqueName ap.UpdateCode

else
w.printfn " match struct (prev%sOpt, curr%sOpt) with" ap.UniqueName ap.UniqueName
w.printfn " | ValueSome prevValue, ValueSome currValue when prevValue = currValue -> ()"
w.printfn " | _, ValueSome currValue -> target.SetValue(%s.%sProperty, %s currValue)" data.FullName ap.Name ap.ConvertModelToValue
w.printfn " | ValueSome _, ValueNone -> target.ClearValue(%s.%sProperty)" data.FullName ap.Name
w.printfn " | _ -> ()"

printUpdateBaseIfNeeded " " false

w.printfn " | _ ->"
printUpdateBaseIfNeeded " " true

w.printfn ""
w


let generateUpdateFunction (data: UpdateData) (w: StringWriter) =
let generateProperties (properties: UpdateProperty array) =
Expand All @@ -111,17 +168,17 @@ module CodeGenerator =
w.printfn " Collections.updateChildren prev%sOpt curr%sOpt target.%s" p.UniqueName p.UniqueName p.Name
w.printfn " (fun x -> x.Create() :?> %s)" collectionDataElementType
w.printfn " Collections.updateChild"
w.printfn " (match registry.TryGetValue(%s.KeyValue) with true, func -> func | false, _ -> (fun _ _ _ -> ()))" attributeKey
w.printfn " (fun prevChildOpt currChild targetChild -> curr.UpdateAttachedPropertiesForAttribute(%s, prevChildOpt, currChild, targetChild))" attributeKey

| Some _ when hasApply ->
w.printfn " %s prev%sOpt curr%sOpt target" p.UpdateCode p.UniqueName p.UniqueName
w.printfn " (match registry.TryGetValue(%s.KeyValue) with true, func -> func | false, _ -> (fun _ _ _ -> ()))" attributeKey
w.printfn " (fun prevChildOpt currChild targetChild -> curr.UpdateAttachedPropertiesForAttribute(%s, prevChildOpt, currChild, targetChild))" attributeKey

| _ ->
// If the type is ViewElement, then it's a type from the model
// Issue recursive calls to "Create" and "UpdateIncremental"
if p.ModelType = "ViewElement" && not hasApply then
w.printfn " match prev%sOpt, curr%sOpt with" p.UniqueName p.UniqueName
w.printfn " match struct (prev%sOpt, curr%sOpt) with" p.UniqueName p.UniqueName
w.printfn " // For structured objects, dependsOn on reference equality"
w.printfn " | ValueSome prevValue, ValueSome newValue when identical prevValue newValue -> ()"
w.printfn " | ValueSome prevValue, ValueSome newValue when canReuseView prevValue newValue ->"
Expand All @@ -137,7 +194,7 @@ module CodeGenerator =
w.printfn " %s prev%sOpt curr%sOpt target" p.UpdateCode p.UniqueName p.UniqueName

else
w.printfn " match prev%sOpt, curr%sOpt with" p.UniqueName p.UniqueName
w.printfn " match struct (prev%sOpt, curr%sOpt) with" p.UniqueName p.UniqueName
w.printfn " | ValueSome prevValue, ValueSome currValue when prevValue = currValue -> ()"
w.printfn " | _, ValueSome currValue -> target.%s <- %s currValue" p.Name p.ConvertModelToValue
if p.DefaultValue = "" then
Expand All @@ -146,55 +203,13 @@ module CodeGenerator =
w.printfn " | ValueSome _, ValueNone -> target.%s <- %s" p.Name p.DefaultValue
w.printfn " | ValueNone, ValueNone -> ()"

w.printfn " static member Update%s (registry: System.Collections.Generic.Dictionary<int, ViewElement voption -> ViewElement -> obj -> unit>, prevOpt: ViewElement voption, curr: ViewElement, target: %s) = " data.Name data.FullName

// Attached properties updaters
if data.PropertiesWithAttachedProperties.Length > 0 then
for p in data.PropertiesWithAttachedProperties do
let targetChildType = p.CollectionDataElementType |> Option.defaultValue "obj"
w.printfn " let update%sAttachedProperties overrideFunc (prevChildOpt: ViewElement voption) (newChild: ViewElement) (targetChild: %s) =" p.UniqueName targetChildType
for ap in p.AttachedProperties do
let hasApply = not (System.String.IsNullOrWhiteSpace(ap.ConvertModelToValue)) || not (System.String.IsNullOrWhiteSpace(ap.UpdateCode))
let attributeKey = getAttributeKey ap.CustomAttributeKey ap.UniqueName

w.printfn " let prev%sOpt = match prevChildOpt with ValueNone -> ValueNone | ValueSome prevChild -> prevChild.TryGetAttributeKeyed<%s>(%s)" ap.UniqueName ap.ModelType attributeKey
w.printfn " let curr%sOpt = newChild.TryGetAttributeKeyed<%s>(%s)" ap.UniqueName ap.ModelType attributeKey

if ap.ModelType = "ViewElement" && not hasApply then
w.printfn " match prev%sOpt, curr%sOpt with" ap.UniqueName ap.UniqueName
w.printfn " // For structured objects, dependsOn on reference equality"
w.printfn " | ValueSome prevValue, ValueSome newValue when identical prevValue newValue -> ()"
w.printfn " | ValueSome prevValue, ValueSome newValue when canReuseView prevValue newValue ->"
w.printfn " newValue.UpdateIncremental(prevValue, (%s.Get%s(targetChild)))" data.FullName ap.Name
w.printfn " | _, ValueSome newValue ->"
w.printfn " %s.Set%s(targetChild, (newValue.Create() :?> %s))" data.FullName ap.Name ap.OriginalType
w.printfn " | ValueSome _, ValueNone ->"
w.printfn " %s.Set%s(targetChild, null)" data.FullName ap.Name
w.printfn " | ValueNone, ValueNone -> ()"

elif not (System.String.IsNullOrWhiteSpace(ap.UpdateCode)) then
w.printfn " %s prev%sOpt curr%sOpt targetChild" ap.UniqueName ap.UniqueName ap.UpdateCode

else
w.printfn " match prev%sOpt, curr%sOpt with" ap.UniqueName ap.UniqueName
w.printfn " | ValueSome prevChildValue, ValueSome currChildValue when prevChildValue = currChildValue -> ()"
w.printfn " | _, ValueSome currChildValue -> targetChild.SetValue(%s.%sProperty, %s currChildValue)" data.FullName ap.Name ap.ConvertModelToValue
w.printfn " | ValueSome _, ValueNone -> targetChild.ClearValue(%s.%sProperty)" data.FullName ap.Name
w.printfn " | _ -> ()"

w.printfn " overrideFunc prevChildOpt newChild targetChild"

w.printfn ""
for p in data.PropertiesWithAttachedProperties do
let attributeKey = getAttributeKey p.CustomAttributeKey p.UniqueName
w.printfn " registry.[%s.KeyValue] <- (fun o p c t -> (update%sAttachedProperties o p c (unbox t)))(match registry.TryGetValue(%s.KeyValue) with true, func -> func | false, _ -> (fun _ _ _ -> ()))" attributeKey p.UniqueName attributeKey
w.printfn ""

w.printfn " static member Update%s (prevOpt: ViewElement voption, curr: ViewElement, target: %s) = " data.Name data.FullName

if (data.ImmediateMembers.Length = 0) then
if (data.BaseName.IsNone) then
w.printfn " ()"
else
w.printfn " ViewBuilders.Update%s (registry, prevOpt, curr, target)" data.BaseName.Value
w.printfn " ViewBuilders.Update%s(prevOpt, curr, target)" data.BaseName.Value
else
if data.ImmediateMembers.Length > 0 then
for m in data.ImmediateMembers do
Expand All @@ -220,10 +235,10 @@ module CodeGenerator =
for e in data.Events do
let relatedProperties =
e.RelatedProperties
|> Array.map (fun p -> sprintf "(identical prev%sOpt curr%sOpt)" p p)
|> Array.map (fun p -> sprintf "(identicalVOption prev%sOpt curr%sOpt)" p p)
|> Array.fold (fun a b -> a + " && " + b) ""

w.printfn " let shouldUpdate%s = not ((identical prev%sOpt curr%sOpt)%s)" e.UniqueName e.UniqueName e.UniqueName relatedProperties
w.printfn " let shouldUpdate%s = not ((identicalVOption prev%sOpt curr%sOpt)%s)" e.UniqueName e.UniqueName e.UniqueName relatedProperties
w.printfn " if shouldUpdate%s then" e.UniqueName
w.printfn " match prev%sOpt with" e.UniqueName
w.printfn " | ValueSome prevValue -> target.%s.RemoveHandler(prevValue)" e.Name
Expand All @@ -237,7 +252,7 @@ module CodeGenerator =
// Update inherited members
if data.BaseName.IsSome then
w.printfn " // Update inherited members"
w.printfn " ViewBuilders.Update%s (registry, prevOpt, curr, target)" data.BaseName.Value
w.printfn " ViewBuilders.Update%s(prevOpt, curr, target)" data.BaseName.Value

// Update properties
if data.Properties.Length > 0 then
Expand Down Expand Up @@ -284,7 +299,7 @@ module CodeGenerator =
w.printfn ""
w.printfn " let attribBuilder = ViewBuilders.Build%s(0%s)" data.Name membersForBuild
w.printfn ""
w.printfn " ViewElement.Create<%s>(ViewBuilders.Create%s, (fun registry prevOpt curr target -> ViewBuilders.Update%s(registry, prevOpt, curr, target)), attribBuilder)" data.FullName data.Name data.Name
w.printfn " ViewElement.Create<%s>(ViewBuilders.Create%s, (fun prev curr target -> ViewBuilders.Update%s(prev, curr, target)), (fun key prev curr target -> ViewBuilders.Update%sAttachedProperties(key, prev, curr, target)), attribBuilder)" data.FullName data.Name data.Name data.Name
w.printfn ""


Expand All @@ -294,6 +309,7 @@ module CodeGenerator =
w
|> generateBuildFunction typ.Build
|> generateCreateFunction typ.Create
|> generateUpdateAttachedPropertiesFunction typ.UpdateAttachedProperties
|> generateUpdateFunction typ.Update
|> generateConstruct typ.Construct
w
Expand Down
14 changes: 10 additions & 4 deletions Fabulous.CodeGen/src/Fabulous.CodeGen/Generator/Models.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ module Models =
{ Name: string
UniqueName: string
RelatedProperties: string array }

type UpdateProperty =
{ Name: string
UniqueName: string
Expand All @@ -62,22 +62,27 @@ module Models =
ModelType: string
ConvertModelToValue: string
UpdateCode: string }

type UpdatePropertyWithAttachedProperties =
{ UniqueName: string
CustomAttributeKey: string option
CollectionDataElementType: string option
AttachedProperties: UpdateAttachedProperty array }

type UpdateAttachedPropertiesData =
{ Name: string
FullName: string
BaseName: string option
PropertiesWithAttachedProperties: UpdatePropertyWithAttachedProperties array }

type UpdateData =
{ Name: string
FullName: string
BaseName: string option
ImmediateMembers : UpdateMember array
Events: UpdateEvent array
Properties: UpdateProperty array
PriorityProperties: UpdateProperty array
PropertiesWithAttachedProperties: UpdatePropertyWithAttachedProperties array }
PriorityProperties: UpdateProperty array }

type ConstructData =
{ Name: string
Expand All @@ -87,6 +92,7 @@ module Models =
type BuilderData =
{ Build: BuildData
Create: CreateData option
UpdateAttachedProperties: UpdateAttachedPropertiesData
Update: UpdateData
Construct: ConstructData option }

Expand Down
Loading