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

[Builtins] Drop 'RuntimeScheme' #4778

Merged
merged 20 commits into from
Aug 24, 2022
Merged

[Builtins] Drop 'RuntimeScheme' #4778

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2ea0b5c
[Builtins] Drop 'RuntimeScheme'
effectfully Jul 20, 2022
86a3e24
Revert 'Eliminate 'fun' from 'VBuiltin''
effectfully Jul 22, 2022
f5639db
Docs and polishing
effectfully Aug 2, 2022
c736ebf
Back to 'ExMemoryUsage' in 'HasMeaningIn'
effectfully Aug 3, 2022
4c001d3
Fixing tests and renaming
effectfully Aug 3, 2022
39784e3
Remove accidental superficial changes
effectfully Aug 3, 2022
eb3467d
Fix some leftovers
effectfully Aug 3, 2022
9f6211f
Merge branch 'master' of https://github.com/input-output-hk/plutus in…
effectfully Aug 10, 2022
2475d51
Add Note [ExMemoryUsage instances for non-constants]
effectfully Aug 11, 2022
fbc32ec
Doc tweaking
effectfully Aug 11, 2022
dc35696
Add some docs to 'CostingFun.Core'
effectfully Aug 11, 2022
e16a7d0
Tweaking
effectfully Aug 11, 2022
f8420c0
Add Note [Merging the denotation and the costing function]
effectfully Aug 11, 2022
404df06
Tweaking
effectfully Aug 11, 2022
150c935
Update plutus-core/plutus-core/src/PlutusCore/Builtin/Meaning.hs
effectfully Aug 16, 2022
0975598
Update plutus-core/plutus-core/src/PlutusCore/Builtin/Meaning.hs
effectfully Aug 16, 2022
b0c515f
Minor tweaks
effectfully Aug 16, 2022
5866296
More readable 'toMonoImmediateF' implementations
effectfully Aug 16, 2022
5ada64f
A comment on caching of 'BuiltinRuntime's
effectfully Aug 16, 2022
369df92
Rename the constructors of 'BuiltinRuntime'
effectfully Aug 17, 2022
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
Fix some leftovers
  • Loading branch information
@effectfully
effectfully committed Aug 4, 2022
commit eb3467dc2a575066d3ed163babb8a1bae31ddb44
15 changes: 6 additions & 9 deletions plutus-core/plutus-core/examples/PlutusCore/Examples/Builtins.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import PlutusCore
import PlutusCore.Builtin
import PlutusCore.Evaluation.Machine.ExBudget
import PlutusCore.Evaluation.Machine.ExBudgetingDefaults
import PlutusCore.Evaluation.Machine.ExMemory
import PlutusCore.Evaluation.Machine.Exception
import PlutusCore.Pretty

Expand Down Expand Up @@ -133,17 +132,15 @@ instance (ToBuiltinMeaning uni fun1, ToBuiltinMeaning uni fun2) =>
type CostingPart uni (Either fun1 fun2) = (CostingPart uni fun1, CostingPart uni fun2)

toBuiltinMeaning (Left fun) = case toBuiltinMeaning fun of
BuiltinMeaning tySch toF runtimeOpts ->
BuiltinMeaning tySch toF $ case runtimeOpts of
BuiltinRuntimeOptions immF defF -> BuiltinRuntimeOptions (immF . fst) (defF . fst)
BuiltinMeaning tySch toF (BuiltinRuntimeOptions immF defF) ->
BuiltinMeaning tySch toF (BuiltinRuntimeOptions (immF . fst) (defF . fst))
toBuiltinMeaning (Right fun) = case toBuiltinMeaning fun of
BuiltinMeaning tySch toF runtimeOpts ->
BuiltinMeaning tySch toF $ case runtimeOpts of
BuiltinRuntimeOptions immF defF -> BuiltinRuntimeOptions (immF . snd) (defF . snd)
BuiltinMeaning tySch toF (BuiltinRuntimeOptions immF defF) ->
BuiltinMeaning tySch toF (BuiltinRuntimeOptions (immF . snd) (defF . snd))

defBuiltinsRuntimeExt
:: (HasMeaningIn DefaultUni val, ExMemoryUsage val)
=> BuiltinsRuntime (Either DefaultFun ExtensionFun) val
:: HasMeaningIn DefaultUni term
=> BuiltinsRuntime (Either DefaultFun ExtensionFun) term
defBuiltinsRuntimeExt = toBuiltinsRuntime defaultUnliftingMode (defaultBuiltinCostModel, ())

data PlcListRep (a :: GHC.Type)
Expand Down
6 changes: 4 additions & 2 deletions plutus-core/plutus-core/src/PlutusCore/Builtin/Meaning.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ type family GetArgs a where
GetArgs _ = '[]

{- Note [Merging the denotation and the costing function]

TODO
-}

-- | A class that allows us to derive a monotype for a builtin.
Expand All @@ -142,6 +142,8 @@ class KnownMonotype val args res where
knownMonotype :: TypeScheme val args res

-- | Convert the denotation of a builtin to its runtime counterpart with immediate unlifting.
-- We use a tuple rather than two arguments for symmetry with 'toPolyDeferredF'. It all gets
-- inlined anyway.
toMonoImmediateF
:: (FoldArgs args res, FoldArgs args ExBudget)
-> BuiltinRuntime val
Expand Down Expand Up @@ -216,7 +218,7 @@ instance
knownMonotype = TypeSchemeArrow knownMonotype

-- See Note [One-shotting runtime denotations].
-- Unlift, then recurse.
-- Unlift, then recurse.
toMonoImmediateF (f, exF) = BuiltinLamAbs . oneShot $
-- See Note [Strict application in runtime denotations].
fmap (\x -> toMonoImmediateF @val @args @res . (,) (f x) $! exF x) . readKnown
Expand Down
1 change: 0 additions & 1 deletion plutus-core/plutus-core/src/PlutusCore/Core/Type.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE TypeApplications #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-}
{-# LANGUAGE UndecidableInstances #-}

module PlutusCore.Core.Type
Expand Down
1 change: 1 addition & 0 deletions plutus-core/plutus-core/src/PlutusCore/Evaluation/Machine/CostingFun/Core.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import Deriving.Aeson
import GHC.Exts
import Language.Haskell.TH.Syntax hiding (Name, newName)

-- TODO: document.
class OnMemoryUsages c a where
effectfully marked this conversation as resolved.
Show resolved Hide resolved
onMemoryUsages :: c -> a

Expand Down
10 changes: 7 additions & 3 deletions plutus-core/plutus-core/src/PlutusCore/Evaluation/Machine/MachineParameters.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,14 @@ data MachineParameters machinecosts term (uni :: Type -> Type) (fun :: Type) =

-- See Note [Inlining meanings of builtins].
{-| This just uses 'toBuiltinsRuntime' function to convert a BuiltinCostModel to a BuiltinsRuntime. -}
mkMachineParameters
:: (ToBuiltinMeaning uni fun, HasMeaningIn uni (val uni fun))
mkMachineParameters ::
( -- In Cek.Internal we have `type instance UniOf (CekValue uni fun) = uni`, but we don't know that here.
CostingPart uni fun ~ builtincosts
, HasMeaningIn uni (val uni fun)
, ToBuiltinMeaning uni fun
)
=> UnliftingMode
-> CostModel machinecosts (CostingPart uni fun)
-> CostModel machinecosts builtincosts
-> MachineParameters machinecosts val uni fun
mkMachineParameters unlMode (CostModel mchnCosts builtinCosts) =
MachineParameters mchnCosts (inline toBuiltinsRuntime unlMode builtinCosts)
Expand Down
1 change: 1 addition & 0 deletions plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Evaluation/Machine/Cek/Internal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,7 @@ data Context uni fun
| NoFrame
deriving stock (Show)

-- TODO: document.
instance (Closed uni, uni `Everywhere` ExMemoryUsage) => ExMemoryUsage (CekValue uni fun) where
Copy link
Contributor

Choose a reason for hiding this comment

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

I feel a bit weird about this, but I have no good reason for it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Why? It's the same old function, except as a class method now.

I would kinda like to forbid costing of CekValues in the first place and just say that if a function accepts a term whose type is a type variable, the costing function is supposed to either ignore the ExMemory of that argument or to unlift the argument and only then look at the ExMemory of the unlifted value, but I have no idea how to express that and even if we could, I think it would be too much of a complication to worth this static guarantee.

Right now I'm just keeping the old behavior and optimizing the machinery.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think the reason is that before it was more explicit whereas now it feels like we could accidentally use the typeclass method on something that's not a CekValue and not notice. But I don't think this is really a problem.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

now it feels like we could accidentally use the typeclass method on something that's not a CekValue

But that's exactly what we do! We call the costing functions over the ExMemory of unlifted values now. It's just that we occasionally unlift into Opaque for polymorphic builtins, which is a wrapper around CekValue, hence why we need the instance. For Integer, Bool, SomeConstant etc we call memoryUsage directly without going through CekValue twice (once for unlifting, once for costing). It's the whole point of this PR!

Copy link
Contributor

Choose a reason for hiding this comment

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

Apparently I have no idea what the point of this PR is ;)

memoryUsage = \case
VCon c -> memoryUsage c
Expand Down