Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/input-output-hk/plutus in…
Browse files Browse the repository at this point in the history
…to effectfully/builtins/add-dropList
  • Loading branch information
effectfully committed Sep 14, 2024
2 parents 82b2f45 + e34cda9 commit e22a57b
Show file tree
Hide file tree
Showing 15 changed files with 197 additions and 197 deletions.
2 changes: 1 addition & 1 deletion plutus-tx-plugin/src/PlutusTx/Compiler/Expr.hs
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ maybeProfileRhs var t = do
CompileContext{ccOpts = compileOpts} <- ask
let ty = PLC._varDeclType var
varName = PLC._varDeclName var
displayName = T.pack $ PP.displayPlc varName
displayName = T.pack $ PP.displayPlcSimple varName
isFunctionOrAbstraction = case ty of PLC.TyFun{} -> True; PLC.TyForall{} -> True; _ -> False
-- Trace only if profiling is on *and* the thing being defined is a function
if coProfile compileOpts == All && isFunctionOrAbstraction
Expand Down
8 changes: 4 additions & 4 deletions plutus-tx-plugin/test/Plugin/Profiling/9.6/addInt.pir.golden
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ program
in
trace
{unit -> integer}
"entering addInteger-133"
"entering addInteger"
(\(thunk : unit) ->
trace {integer} "exiting addInteger-133" (addInteger x y))
trace {integer} "exiting addInteger" (addInteger x y))
()
~addInt : integer -> integer -> integer
= \(x : integer) ->
Expand All @@ -24,9 +24,9 @@ program
in
trace
{unit -> integer -> integer}
"entering addInt-130"
"entering addInt"
(\(thunk : unit) ->
trace {integer -> integer} "exiting addInt-130" (addInteger x))
trace {integer -> integer} "exiting addInt" (addInteger x))
()
in
addInt)
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[entering addInt-130, exiting addInt-130]
[entering addInt, exiting addInt]
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[ entering runIdentity-133
, exiting runIdentity-133
, entering newtypeFunction-141
, exiting newtypeFunction-141
, entering `$fFoldableIdentity`-135
, exiting `$fFoldableIdentity`-135 ]
[ entering runIdentity
, exiting runIdentity
, entering newtypeFunction
, exiting newtypeFunction
, entering `$fFoldableIdentity`
, exiting `$fFoldableIdentity` ]
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[entering obscuredFunction-131, exiting obscuredFunction-131]
[entering obscuredFunction, exiting obscuredFunction]
72 changes: 36 additions & 36 deletions plutus-tx-plugin/test/Plugin/Profiling/9.6/fact4.eval.golden
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
[ entering fact-130
, entering equalsInteger-137
, exiting equalsInteger-137
, entering subtractInteger-154
, exiting subtractInteger-154
, entering fact-130
, entering equalsInteger-137
, exiting equalsInteger-137
, entering subtractInteger-154
, exiting subtractInteger-154
, entering fact-130
, entering equalsInteger-137
, exiting equalsInteger-137
, entering subtractInteger-154
, exiting subtractInteger-154
, entering fact-130
, entering equalsInteger-137
, exiting equalsInteger-137
, entering subtractInteger-154
, exiting subtractInteger-154
, entering fact-130
, entering equalsInteger-137
, exiting equalsInteger-137
, exiting fact-130
, entering multiplyInteger-148
, exiting multiplyInteger-148
, exiting fact-130
, entering multiplyInteger-148
, exiting multiplyInteger-148
, exiting fact-130
, entering multiplyInteger-148
, exiting multiplyInteger-148
, exiting fact-130
, entering multiplyInteger-148
, exiting multiplyInteger-148
, exiting fact-130 ]
[ entering fact
, entering equalsInteger
, exiting equalsInteger
, entering subtractInteger
, exiting subtractInteger
, entering fact
, entering equalsInteger
, exiting equalsInteger
, entering subtractInteger
, exiting subtractInteger
, entering fact
, entering equalsInteger
, exiting equalsInteger
, entering subtractInteger
, exiting subtractInteger
, entering fact
, entering equalsInteger
, exiting equalsInteger
, entering subtractInteger
, exiting subtractInteger
, entering fact
, entering equalsInteger
, exiting equalsInteger
, exiting fact
, entering multiplyInteger
, exiting multiplyInteger
, exiting fact
, entering multiplyInteger
, exiting multiplyInteger
, exiting fact
, entering multiplyInteger
, exiting multiplyInteger
, exiting fact
, entering multiplyInteger
, exiting multiplyInteger
, exiting fact ]
16 changes: 8 additions & 8 deletions plutus-tx-plugin/test/Plugin/Profiling/9.6/fib.pir.golden
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ program
in
trace
{unit -> integer}
"entering addInteger-152"
"entering addInteger"
(\(thunk : unit) ->
trace {integer} "exiting addInteger-152" (addInteger x y))
trace {integer} "exiting addInteger" (addInteger x y))
()
data Bool | Bool_match where
True : Bool
Expand All @@ -33,11 +33,11 @@ program
in
trace
{unit -> Bool}
"entering equalsInteger-137"
"entering equalsInteger"
(\(thunk : unit) ->
trace
{Bool}
"exiting equalsInteger-137"
"exiting equalsInteger"
(let
!b : bool = equalsInteger x y
in
Expand All @@ -55,11 +55,11 @@ program
in
trace
{unit -> integer}
"entering subtractInteger-158"
"entering subtractInteger"
(\(thunk : unit) ->
trace
{integer}
"exiting subtractInteger-158"
"exiting subtractInteger"
(subtractInteger x y))
()
in
Expand All @@ -71,11 +71,11 @@ program
in
trace
{unit -> integer}
"entering fib-130"
"entering fib"
(\(thunk : unit) ->
trace
{integer}
"exiting fib-130"
"exiting fib"
(Bool_match
(equalsInteger n 0)
{all dead. integer}
Expand Down
148 changes: 74 additions & 74 deletions plutus-tx-plugin/test/Plugin/Profiling/9.6/fib4.eval.golden
Original file line number Diff line number Diff line change
@@ -1,74 +1,74 @@
[ entering fib-130
, entering equalsInteger-137
, exiting equalsInteger-137
, entering equalsInteger-137
, exiting equalsInteger-137
, entering subtractInteger-158
, exiting subtractInteger-158
, entering fib-130
, entering equalsInteger-137
, exiting equalsInteger-137
, entering equalsInteger-137
, exiting equalsInteger-137
, entering subtractInteger-158
, exiting subtractInteger-158
, entering fib-130
, entering equalsInteger-137
, exiting equalsInteger-137
, entering equalsInteger-137
, exiting equalsInteger-137
, entering subtractInteger-158
, exiting subtractInteger-158
, entering fib-130
, entering equalsInteger-137
, exiting equalsInteger-137
, entering equalsInteger-137
, exiting equalsInteger-137
, exiting fib-130
, entering subtractInteger-158
, exiting subtractInteger-158
, entering fib-130
, entering equalsInteger-137
, exiting equalsInteger-137
, exiting fib-130
, entering addInteger-152
, exiting addInteger-152
, exiting fib-130
, entering subtractInteger-158
, exiting subtractInteger-158
, entering fib-130
, entering equalsInteger-137
, exiting equalsInteger-137
, entering equalsInteger-137
, exiting equalsInteger-137
, exiting fib-130
, entering addInteger-152
, exiting addInteger-152
, exiting fib-130
, entering subtractInteger-158
, exiting subtractInteger-158
, entering fib-130
, entering equalsInteger-137
, exiting equalsInteger-137
, entering equalsInteger-137
, exiting equalsInteger-137
, entering subtractInteger-158
, exiting subtractInteger-158
, entering fib-130
, entering equalsInteger-137
, exiting equalsInteger-137
, entering equalsInteger-137
, exiting equalsInteger-137
, exiting fib-130
, entering subtractInteger-158
, exiting subtractInteger-158
, entering fib-130
, entering equalsInteger-137
, exiting equalsInteger-137
, exiting fib-130
, entering addInteger-152
, exiting addInteger-152
, exiting fib-130
, entering addInteger-152
, exiting addInteger-152
, exiting fib-130 ]
[ 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 ]
2 changes: 1 addition & 1 deletion plutus-tx-plugin/test/Plugin/Profiling/9.6/id.eval.golden
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[entering id-131, exiting id-131, entering id-131, exiting id-131]
[entering id, exiting id, entering id, exiting id]
4 changes: 2 additions & 2 deletions plutus-tx-plugin/test/Plugin/Profiling/9.6/idCode.pir.golden
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ program
\(x : a) ->
trace
{unit -> a}
"entering id-131"
(\(thunk : unit) -> trace {a} "exiting id-131" x)
"entering id"
(\(thunk : unit) -> trace {a} "exiting id" x)
()
in
id {integer} (id {integer} 1))
20 changes: 10 additions & 10 deletions plutus-tx-plugin/test/Plugin/Profiling/9.6/letInFun.eval.golden
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[ entering f-142
, entering addInteger-136
, exiting addInteger-136
, exiting f-142
, entering f-142
, entering addInteger-136
, exiting addInteger-136
, exiting f-142
, entering addInteger-136
, exiting addInteger-136 ]
[ entering f
, entering addInteger
, exiting addInteger
, exiting f
, entering f
, entering addInteger
, exiting addInteger
, exiting f
, entering addInteger
, exiting addInteger ]
Loading

0 comments on commit e22a57b

Please sign in to comment.