diff --git a/plutus-tx-plugin/src/PlutusTx/Compiler/Expr.hs b/plutus-tx-plugin/src/PlutusTx/Compiler/Expr.hs index 0cf86bd0322..f093b6f5613 100644 --- a/plutus-tx-plugin/src/PlutusTx/Compiler/Expr.hs +++ b/plutus-tx-plugin/src/PlutusTx/Compiler/Expr.hs @@ -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 diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/addInt.pir.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/addInt.pir.golden index d77b76dda76..06bbaba84bf 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/addInt.pir.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/addInt.pir.golden @@ -13,9 +13,9 @@ program in trace {unit -> integer} - "entering addInteger-131" + "entering addInteger" (\(thunk : unit) -> - trace {integer} "exiting addInteger-131" (addInteger x y)) + trace {integer} "exiting addInteger" (addInteger x y)) () ~addInt : integer -> integer -> integer = \(x : integer) -> @@ -24,9 +24,9 @@ program in trace {unit -> integer -> integer} - "entering addInt-128" + "entering addInt" (\(thunk : unit) -> - trace {integer -> integer} "exiting addInt-128" (addInteger x)) + trace {integer -> integer} "exiting addInt" (addInteger x)) () in addInt) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/addInt3.eval.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/addInt3.eval.golden index 66b848fa868..68eeb5e4784 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/addInt3.eval.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/addInt3.eval.golden @@ -1 +1 @@ -[entering addInt-128, exiting addInt-128] \ No newline at end of file +[entering addInt, exiting addInt] \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/argMismatch1.eval.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/argMismatch1.eval.golden index 19f028f27ca..a316f49d6bc 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/argMismatch1.eval.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/argMismatch1.eval.golden @@ -1,6 +1,6 @@ -[ entering runIdentity-131 -, exiting runIdentity-131 -, entering newtypeFunction-139 -, exiting newtypeFunction-139 -, entering `$fFoldableIdentity`-133 -, exiting `$fFoldableIdentity`-133 ] \ No newline at end of file +[ entering runIdentity +, exiting runIdentity +, entering newtypeFunction +, exiting newtypeFunction +, entering `$fFoldableIdentity` +, exiting `$fFoldableIdentity` ] \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/argMismatch2.eval.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/argMismatch2.eval.golden index 866a739a4c8..38bf38703e4 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/argMismatch2.eval.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/argMismatch2.eval.golden @@ -1 +1 @@ -[entering obscuredFunction-129, exiting obscuredFunction-129] \ No newline at end of file +[entering obscuredFunction, exiting obscuredFunction] \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/fact4.eval.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/fact4.eval.golden index 33f55c5979c..4752d376629 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/fact4.eval.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/fact4.eval.golden @@ -1,36 +1,36 @@ -[ entering fact-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering subtractInteger-152 -, exiting subtractInteger-152 -, entering fact-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering subtractInteger-152 -, exiting subtractInteger-152 -, entering fact-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering subtractInteger-152 -, exiting subtractInteger-152 -, entering fact-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering subtractInteger-152 -, exiting subtractInteger-152 -, entering fact-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, exiting fact-128 -, entering multiplyInteger-146 -, exiting multiplyInteger-146 -, exiting fact-128 -, entering multiplyInteger-146 -, exiting multiplyInteger-146 -, exiting fact-128 -, entering multiplyInteger-146 -, exiting multiplyInteger-146 -, exiting fact-128 -, entering multiplyInteger-146 -, exiting multiplyInteger-146 -, exiting fact-128 ] \ No newline at end of file +[ 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 ] \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/fib.pir.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/fib.pir.golden index c53e980e4c4..e719359599f 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/fib.pir.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/fib.pir.golden @@ -13,9 +13,9 @@ program in trace {unit -> integer} - "entering addInteger-150" + "entering addInteger" (\(thunk : unit) -> - trace {integer} "exiting addInteger-150" (addInteger x y)) + trace {integer} "exiting addInteger" (addInteger x y)) () data Bool | Bool_match where True : Bool @@ -33,11 +33,11 @@ program in trace {unit -> Bool} - "entering equalsInteger-135" + "entering equalsInteger" (\(thunk : unit) -> trace {Bool} - "exiting equalsInteger-135" + "exiting equalsInteger" (let !b : bool = equalsInteger x y in @@ -55,11 +55,11 @@ program in trace {unit -> integer} - "entering subtractInteger-156" + "entering subtractInteger" (\(thunk : unit) -> trace {integer} - "exiting subtractInteger-156" + "exiting subtractInteger" (subtractInteger x y)) () in @@ -71,11 +71,11 @@ program in trace {unit -> integer} - "entering fib-128" + "entering fib" (\(thunk : unit) -> trace {integer} - "exiting fib-128" + "exiting fib" (Bool_match (equalsInteger n 0) {all dead. integer} diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/fib4.eval.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/fib4.eval.golden index 693c65f8713..9ba81e62d9d 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/fib4.eval.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/fib4.eval.golden @@ -1,74 +1,74 @@ -[ entering fib-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering subtractInteger-156 -, exiting subtractInteger-156 -, entering fib-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering subtractInteger-156 -, exiting subtractInteger-156 -, entering fib-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering subtractInteger-156 -, exiting subtractInteger-156 -, entering fib-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, exiting fib-128 -, entering subtractInteger-156 -, exiting subtractInteger-156 -, entering fib-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, exiting fib-128 -, entering addInteger-150 -, exiting addInteger-150 -, exiting fib-128 -, entering subtractInteger-156 -, exiting subtractInteger-156 -, entering fib-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, exiting fib-128 -, entering addInteger-150 -, exiting addInteger-150 -, exiting fib-128 -, entering subtractInteger-156 -, exiting subtractInteger-156 -, entering fib-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering subtractInteger-156 -, exiting subtractInteger-156 -, entering fib-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, exiting fib-128 -, entering subtractInteger-156 -, exiting subtractInteger-156 -, entering fib-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, exiting fib-128 -, entering addInteger-150 -, exiting addInteger-150 -, exiting fib-128 -, entering addInteger-150 -, exiting addInteger-150 -, exiting fib-128 ] \ No newline at end of file +[ 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 ] \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/id.eval.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/id.eval.golden index 5e31f19d924..ca3df46b62a 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/id.eval.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/id.eval.golden @@ -1 +1 @@ -[entering id-129, exiting id-129, entering id-129, exiting id-129] \ No newline at end of file +[entering id, exiting id, entering id, exiting id] \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/idCode.pir.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/idCode.pir.golden index e8874d71960..8dba2c447fe 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/idCode.pir.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/idCode.pir.golden @@ -6,8 +6,8 @@ program \(x : a) -> trace {unit -> a} - "entering id-129" - (\(thunk : unit) -> trace {a} "exiting id-129" x) + "entering id" + (\(thunk : unit) -> trace {a} "exiting id" x) () in id {integer} (id {integer} 1)) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/letInFun.eval.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/letInFun.eval.golden index e598b91086d..7da8f83021d 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/letInFun.eval.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/letInFun.eval.golden @@ -1,10 +1,10 @@ -[ entering f-140 -, entering addInteger-134 -, exiting addInteger-134 -, exiting f-140 -, entering f-140 -, entering addInteger-134 -, exiting addInteger-134 -, exiting f-140 -, entering addInteger-134 -, exiting addInteger-134 ] \ No newline at end of file +[ entering f +, entering addInteger +, exiting addInteger +, exiting f +, entering f +, entering addInteger +, exiting addInteger +, exiting f +, entering addInteger +, exiting addInteger ] \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/letInFunMoreArg.eval.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/letInFunMoreArg.eval.golden index 42995b25478..dc9cc516585 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/letInFunMoreArg.eval.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/letInFunMoreArg.eval.golden @@ -1,12 +1,12 @@ -[ 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 multiplyInteger-144 -, exiting multiplyInteger-144 ] \ No newline at end of file +[ entering f +, entering addInteger +, exiting addInteger +, exiting f +, entering f +, entering addInteger +, exiting addInteger +, exiting f +, entering addInteger +, exiting addInteger +, entering multiplyInteger +, exiting multiplyInteger ] \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/letRecInFun.eval.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/letRecInFun.eval.golden index dce946b6315..6ffdaa268eb 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/letRecInFun.eval.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/letRecInFun.eval.golden @@ -1,28 +1,28 @@ -[ entering f-130 -, entering equalsInteger-137 -, exiting equalsInteger-137 -, entering subtractInteger-154 -, exiting subtractInteger-154 -, entering f-130 -, entering equalsInteger-137 -, exiting equalsInteger-137 -, entering subtractInteger-154 -, exiting subtractInteger-154 -, entering f-130 -, entering equalsInteger-137 -, exiting equalsInteger-137 -, entering subtractInteger-154 -, exiting subtractInteger-154 -, entering f-130 -, entering equalsInteger-137 -, exiting equalsInteger-137 -, exiting f-130 -, entering addInteger-148 -, exiting addInteger-148 -, exiting f-130 -, entering addInteger-148 -, exiting addInteger-148 -, exiting f-130 -, entering addInteger-148 -, exiting addInteger-148 -, exiting f-130 ] \ No newline at end of file +[ entering f +, entering equalsInteger +, exiting equalsInteger +, entering subtractInteger +, exiting subtractInteger +, entering f +, entering equalsInteger +, exiting equalsInteger +, entering subtractInteger +, exiting subtractInteger +, entering f +, entering equalsInteger +, exiting equalsInteger +, entering subtractInteger +, exiting subtractInteger +, entering f +, entering equalsInteger +, exiting equalsInteger +, exiting f +, entering addInteger +, exiting addInteger +, exiting f +, entering addInteger +, exiting addInteger +, exiting f +, entering addInteger +, exiting addInteger +, exiting f ] \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/swap.eval.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/swap.eval.golden index ea3312abd43..238bb53a13e 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/swap.eval.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/swap.eval.golden @@ -1 +1 @@ -[entering swap-135, exiting swap-135] \ No newline at end of file +[entering swap, exiting swap] \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/typeclass.eval.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/typeclass.eval.golden index 5698abc5173..1d9414013aa 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/typeclass.eval.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/typeclass.eval.golden @@ -1,12 +1,12 @@ -[ entering useTypeclass-137 -, entering methodA-151 -, exiting methodA-151 -, entering addInteger-144 -, exiting addInteger-144 -, entering methodB-162 -, exiting methodB-162 -, entering subtractInteger-174 -, exiting subtractInteger-174 -, entering addInteger-144 -, exiting addInteger-144 -, exiting useTypeclass-137 ] \ No newline at end of file +[ entering useTypeclass +, entering methodA +, exiting methodA +, entering addInteger +, exiting addInteger +, entering methodB +, exiting methodB +, entering subtractInteger +, exiting subtractInteger +, entering addInteger +, exiting addInteger +, exiting useTypeclass ] \ No newline at end of file