Add more logging and a test.

IntersectMBO · Sep 16, 2021 · 883b93e · 883b93e
1 parent d38d3d6
commit 883b93e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Evaluation/Machine/Cek.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Evaluation/Machine/Cek.hs
@@ -1,10 +1,8 @@
 -- | The API to the CEK machine.
 
-{-# LANGUAGE DataKinds         #-}
-{-# LANGUAGE TypeApplications  #-}
-{-# LANGUAGE TypeOperators     #-}
-
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE DataKinds        #-}
+{-# LANGUAGE TypeApplications #-}
+{-# LANGUAGE TypeOperators    #-}
 
 module UntypedPlutusCore.Evaluation.Machine.Cek
     (
@@ -115,7 +113,7 @@ evaluateCek
     -> (Either (CekEvaluationException uni fun) (Term Name uni fun ()), [Text])
 evaluateCek emitMode params term =
     case runCek params restrictingEnormous emitMode term of
-         (errOrRes, _, logs) -> (errOrRes, "testing evaluateCek log empty" : logs)
+         (errOrRes, _, logs) -> (errOrRes, logs)
 
 -- | Evaluate a term using the CEK machine with logging disabled.
 evaluateCekNoEmit

diff --git a/plutus-tx-plugin/src/PlutusTx/Compiler/Expr.hs b/plutus-tx-plugin/src/PlutusTx/Compiler/Expr.hs
@@ -404,13 +404,18 @@ hoistExpr var t =
                     (PIR.Def var' (PIR.mkVar () var', PIR.Strict))
                     mempty
 
-                -- CompileContext {ccOpts=profileOpts} <- ask
+                CompileContext {ccOpts=profileOpts} <- ask
                 t' <- do
+                    if coProfile profileOpts==All then do
                         let ty = PLC.varDeclType var'
-                    -- if coProfile profileOpts==All then do
                         t'' <- compileExpr t
-                        return $ mkTrace ty "entering" ((\() -> mkTrace ty "exiting" t'') ())
-                    -- else compileExpr t
+                        let tInText = T.pack (show t'')
+                        return $
+                            mkTrace
+                                ty
+                                ("entering" <> tInText)
+                                ((\() -> mkTrace ty ("exiting"<> tInText) t'') ())
+                    else compileExpr t
 
                 -- See Note [Non-strict let-bindings]
                 let strict = PIR.isPure (const PIR.NonStrict) t'

diff --git a/plutus-tx-plugin/test/Plugin/Profiling.hs b/plutus-tx-plugin/test/Plugin/Profiling.hs
@@ -29,7 +29,7 @@ import           Data.Text               (Text)
 
 profiling :: TestNested
 profiling = testNested "Profiling" [
-  goldenPir "fib" fibTest
+  goldenUEvalProfile "fib4" [ toUPlc fibTest, toUPlc $ plc (Proxy @"4") (4::Integer) ]
   ]
 
 fib :: Integer -> Integer
@@ -42,3 +42,4 @@ fib n = if Builtins.equalsInteger n 0
 fibTest :: CompiledCode (Integer -> Integer)
 -- not using case to avoid literal cases
 fibTest = plc (Proxy @"fib") fib
+