Skip to content

Commit

Permalink
Use pretty printer instead of generic show for var names in profiling.
Browse files Browse the repository at this point in the history
  • Loading branch information
@thealmarty
thealmarty committed Sep 17, 2021
1 parent dfc895d commit cdb102c
Show file tree
Hide file tree
Showing 8 changed files with 95 additions and 98 deletions.
5 changes: 3 additions & 2 deletions plutus-tx-plugin/src/PlutusTx/Compiler/Expr.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ import qualified PlutusIR.Purity as PIR

import qualified PlutusCore as PLC
import qualified PlutusCore.MkPlc as PLC
import qualified PlutusCore.Pretty as PP

import Control.Monad.Reader
import Control.Monad.Reader (MonadReader (ask))

import qualified Data.ByteString as BS
import Data.List (elemIndex)
Expand Down Expand Up @@ -461,7 +462,7 @@ traceInside varName lamName = go
go e ty =
let defaultUnitTy = PLC.TyBuiltin () (PLC.SomeTypeIn PLC.DefaultUniUnit)
defaultUnit = PIR.Constant () (PLC.someValueOf PLC.DefaultUniUnit ())
displayName = T.pack $ show varName
displayName = T.pack $ PP.displayPlcDef varName
in
--(trace @(() -> c) "entering f" (\() -> trace @c "exiting f" body) ())
PIR.Apply
Expand Down
3 changes: 1 addition & 2 deletions plutus-tx-plugin/test/Plugin/Profiling/addInt.plc.golden
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
[ entering Name {nameString = "addInt", nameUnique = Unique {unUnique = 81}}
, exiting Name {nameString = "addInt", nameUnique = Unique {unUnique = 81}} ]
[entering addInt, exiting addInt]
3 changes: 1 addition & 2 deletions plutus-tx-plugin/test/Plugin/Profiling/addInt3.plc.golden
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
[ entering Name {nameString = "addInt", nameUnique = Unique {unUnique = 81}}
, exiting Name {nameString = "addInt", nameUnique = Unique {unUnique = 81}} ]
[entering addInt, exiting addInt]
148 changes: 74 additions & 74 deletions plutus-tx-plugin/test/Plugin/Profiling/fib4.plc.golden
View file
Original file line number Diff line number Diff line change
@@ -1,74 +1,74 @@
[ entering Name {nameString = "fib", nameUnique = Unique {unUnique = 81}}
, entering Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, exiting Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, entering Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, exiting Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, entering Name {nameString = "subtractInteger", nameUnique = Unique {unUnique = 97}}
, exiting Name {nameString = "subtractInteger", nameUnique = Unique {unUnique = 97}}
, entering Name {nameString = "fib", nameUnique = Unique {unUnique = 81}}
, entering Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, exiting Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, entering Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, exiting Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, entering Name {nameString = "subtractInteger", nameUnique = Unique {unUnique = 97}}
, exiting Name {nameString = "subtractInteger", nameUnique = Unique {unUnique = 97}}
, entering Name {nameString = "fib", nameUnique = Unique {unUnique = 81}}
, entering Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, exiting Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, entering Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, exiting Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, entering Name {nameString = "subtractInteger", nameUnique = Unique {unUnique = 97}}
, exiting Name {nameString = "subtractInteger", nameUnique = Unique {unUnique = 97}}
, entering Name {nameString = "fib", nameUnique = Unique {unUnique = 81}}
, entering Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, exiting Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, entering Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, exiting Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, exiting Name {nameString = "fib", nameUnique = Unique {unUnique = 81}}
, entering Name {nameString = "subtractInteger", nameUnique = Unique {unUnique = 97}}
, exiting Name {nameString = "subtractInteger", nameUnique = Unique {unUnique = 97}}
, entering Name {nameString = "fib", nameUnique = Unique {unUnique = 81}}
, entering Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, exiting Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, exiting Name {nameString = "fib", nameUnique = Unique {unUnique = 81}}
, entering Name {nameString = "addInteger", nameUnique = Unique {unUnique = 93}}
, exiting Name {nameString = "addInteger", nameUnique = Unique {unUnique = 93}}
, exiting Name {nameString = "fib", nameUnique = Unique {unUnique = 81}}
, entering Name {nameString = "subtractInteger", nameUnique = Unique {unUnique = 97}}
, exiting Name {nameString = "subtractInteger", nameUnique = Unique {unUnique = 97}}
, entering Name {nameString = "fib", nameUnique = Unique {unUnique = 81}}
, entering Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, exiting Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, entering Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, exiting Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, exiting Name {nameString = "fib", nameUnique = Unique {unUnique = 81}}
, entering Name {nameString = "addInteger", nameUnique = Unique {unUnique = 93}}
, exiting Name {nameString = "addInteger", nameUnique = Unique {unUnique = 93}}
, exiting Name {nameString = "fib", nameUnique = Unique {unUnique = 81}}
, entering Name {nameString = "subtractInteger", nameUnique = Unique {unUnique = 97}}
, exiting Name {nameString = "subtractInteger", nameUnique = Unique {unUnique = 97}}
, entering Name {nameString = "fib", nameUnique = Unique {unUnique = 81}}
, entering Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, exiting Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, entering Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, exiting Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, entering Name {nameString = "subtractInteger", nameUnique = Unique {unUnique = 97}}
, exiting Name {nameString = "subtractInteger", nameUnique = Unique {unUnique = 97}}
, entering Name {nameString = "fib", nameUnique = Unique {unUnique = 81}}
, entering Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, exiting Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, entering Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, exiting Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, exiting Name {nameString = "fib", nameUnique = Unique {unUnique = 81}}
, entering Name {nameString = "subtractInteger", nameUnique = Unique {unUnique = 97}}
, exiting Name {nameString = "subtractInteger", nameUnique = Unique {unUnique = 97}}
, entering Name {nameString = "fib", nameUnique = Unique {unUnique = 81}}
, entering Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, exiting Name {nameString = "equalsInteger", nameUnique = Unique {unUnique = 87}}
, exiting Name {nameString = "fib", nameUnique = Unique {unUnique = 81}}
, entering Name {nameString = "addInteger", nameUnique = Unique {unUnique = 93}}
, exiting Name {nameString = "addInteger", nameUnique = Unique {unUnique = 93}}
, exiting Name {nameString = "fib", nameUnique = Unique {unUnique = 81}}
, entering Name {nameString = "addInteger", nameUnique = Unique {unUnique = 93}}
, exiting Name {nameString = "addInteger", nameUnique = Unique {unUnique = 93}}
, exiting Name {nameString = "fib", nameUnique = Unique {unUnique = 81}} ]
[ entering fib
, entering equalsInteger
, exiting equalsInteger
, entering equalsInteger
, exiting equalsInteger
, entering subtractInteger
, exiting subtractInteger
, entering fib
, entering equalsInteger
, exiting equalsInteger
, entering equalsInteger
, exiting equalsInteger
, entering subtractInteger
, exiting subtractInteger
, entering fib
, entering equalsInteger
, exiting equalsInteger
, entering equalsInteger
, exiting equalsInteger
, entering subtractInteger
, exiting subtractInteger
, entering fib
, entering equalsInteger
, exiting equalsInteger
, entering equalsInteger
, exiting equalsInteger
, exiting fib
, entering subtractInteger
, exiting subtractInteger
, entering fib
, entering equalsInteger
, exiting equalsInteger
, exiting fib
, entering addInteger
, exiting addInteger
, exiting fib
, entering subtractInteger
, exiting subtractInteger
, entering fib
, entering equalsInteger
, exiting equalsInteger
, entering equalsInteger
, exiting equalsInteger
, exiting fib
, entering addInteger
, exiting addInteger
, exiting fib
, entering subtractInteger
, exiting subtractInteger
, entering fib
, entering equalsInteger
, exiting equalsInteger
, entering equalsInteger
, exiting equalsInteger
, entering subtractInteger
, exiting subtractInteger
, entering fib
, entering equalsInteger
, exiting equalsInteger
, entering equalsInteger
, exiting equalsInteger
, exiting fib
, entering subtractInteger
, exiting subtractInteger
, entering fib
, entering equalsInteger
, exiting equalsInteger
, exiting fib
, entering addInteger
, exiting addInteger
, exiting fib
, entering addInteger
, exiting addInteger
, exiting fib ]
3 changes: 1 addition & 2 deletions plutus-tx-plugin/test/Plugin/Profiling/id.plc.golden
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
[ entering Name {nameString = "id", nameUnique = Unique {unUnique = 82}}
, exiting Name {nameString = "id", nameUnique = Unique {unUnique = 82}} ]
[entering id, exiting id]
12 changes: 6 additions & 6 deletions plutus-tx-plugin/test/Plugin/Profiling/letInFun.plc.golden
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[ entering Name {nameString = "addInteger", nameUnique = Unique {unUnique = 84}}
, exiting Name {nameString = "addInteger", nameUnique = Unique {unUnique = 84}}
, entering Name {nameString = "addInteger", nameUnique = Unique {unUnique = 84}}
, exiting Name {nameString = "addInteger", nameUnique = Unique {unUnique = 84}}
, entering Name {nameString = "addInteger", nameUnique = Unique {unUnique = 84}}
, exiting Name {nameString = "addInteger", nameUnique = Unique {unUnique = 84}} ]
[ entering addInteger
, exiting addInteger
, entering addInteger
, exiting addInteger
, entering addInteger
, exiting addInteger ]
16 changes: 8 additions & 8 deletions plutus-tx-plugin/test/Plugin/Profiling/letInFunMoreArg.plc.golden
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[ entering Name {nameString = "addInteger", nameUnique = Unique {unUnique = 85}}
, exiting Name {nameString = "addInteger", nameUnique = Unique {unUnique = 85}}
, entering Name {nameString = "addInteger", nameUnique = Unique {unUnique = 85}}
, exiting Name {nameString = "addInteger", nameUnique = Unique {unUnique = 85}}
, entering Name {nameString = "addInteger", nameUnique = Unique {unUnique = 85}}
, exiting Name {nameString = "addInteger", nameUnique = Unique {unUnique = 85}}
, entering Name {nameString = "multiplyInteger", nameUnique = Unique {unUnique = 90}}
, exiting Name {nameString = "multiplyInteger", nameUnique = Unique {unUnique = 90}} ]
[ entering addInteger
, exiting addInteger
, entering addInteger
, exiting addInteger
, entering addInteger
, exiting addInteger
, entering multiplyInteger
, exiting multiplyInteger ]
3 changes: 1 addition & 2 deletions plutus-tx-plugin/test/Plugin/Profiling/swap.plc.golden
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
[ entering Name {nameString = "swap", nameUnique = Unique {unUnique = 88}}
, exiting Name {nameString = "swap", nameUnique = Unique {unUnique = 88}} ]
[entering swap, exiting swap]

0 comments on commit cdb102c

Please sign in to comment.