Remove profile effect

app/Commands/Dev/Nockma/Eval.hs

@@ -2,8 +2,6 @@ module Commands.Dev.Nockma.Eval where
 
 import Commands.Base hiding (Atom)
 import Commands.Dev.Nockma.Eval.Options
-import Juvix.Compiler.Nockma.EvalCompiled
-import Juvix.Compiler.Nockma.Evaluator
 import Juvix.Compiler.Nockma.Pretty
 import Juvix.Compiler.Nockma.Translation.FromSource qualified as Nockma
 
@@ -13,15 +11,7 @@ runCommand opts = do
   parsedTerm <- Nockma.parseTermFile afile
   case parsedTerm of
     Left err -> exitJuvixError (JuvixError err)
-    Right (TermCell c) -> do
-      (counts, res) <-
-        runOpCounts
-          . runReader defaultEvalOptions
-          . runOutputSem @(Term Natural) (say . ppTrace)
-          $ evalCompiledNock' (c ^. cellLeft) (c ^. cellRight)
-      putStrLn (ppPrint res)
-      let statsFile = replaceExtension' ".profile" afile
-      writeFileEnsureLn statsFile (prettyText counts)
+    Right (TermCell c) -> impossible
     Right TermAtom {} -> exitFailMsg "Expected nockma input to be a cell"
   where
     file :: AppPath File

app/Commands/Dev/Nockma/Run.hs

@@ -20,14 +20,11 @@ runCommand opts = do
   case parsedTerm of
     t@(TermCell {}) -> do
       let formula = anomaCallTuple parsedEnvTerm parsedArgs
-      (counts, res) <-
-        runOpCounts
-          . runReader defaultEvalOptions
+      res <-
+          runReader defaultEvalOptions
           . runOutputSem @(Term Natural) (say . ppTrace)
           $ evalCompiledNock' t formula
       putStrLn (ppPrint res)
-      let statsFile = replaceExtension' ".profile" afile
-      writeFileEnsureLn statsFile (prettyText counts)
     TermAtom {} -> exitFailMsg "Expected nockma input to be a cell"
   where
     inputFile :: AppPath File

src/Juvix/Compiler/Nockma/EvalCompiled.hs

@@ -5,7 +5,7 @@ import Juvix.Compiler.Nockma.Language
 import Juvix.Compiler.Nockma.Pretty (ppTrace)
 import Juvix.Prelude
 
-evalCompiledNock' :: (Members '[State OpCounts, Reader EvalOptions, Output (Term Natural)] r) => Term Natural -> Term Natural -> Sem r (Term Natural)
+evalCompiledNock' :: (Members '[Reader EvalOptions, Output (Term Natural)] r) => Term Natural -> Term Natural -> Sem r (Term Natural)
 evalCompiledNock' stack mainTerm = do
   evalT <-
     runError @(ErrNockNatural Natural)

src/Juvix/Compiler/Nockma/Evaluator.hs

@@ -11,35 +11,35 @@ import Juvix.Compiler.Nockma.Language
 import Juvix.Prelude hiding (Atom, Path)
 import Juvix.Prelude.Pretty
 
-newtype OpCounts = OpCounts
-  { _opCountsMap :: HashMap NockOp Int
-  }
+-- newtype OpCounts = OpCounts
+--   { _opCountsMap :: HashMap NockOp Int
+--   }
 
-makeLenses ''OpCounts
+-- makeLenses ''OpCounts
 
-initOpCounts :: OpCounts
-initOpCounts = OpCounts mempty
+-- initOpCounts :: OpCounts
+-- initOpCounts = OpCounts mempty
 
-ignoreOpCounts :: Sem (State OpCounts ': r) a -> Sem r a
-ignoreOpCounts = evalState initOpCounts
+-- ignoreOpCounts :: Sem (State OpCounts ': r) a -> Sem r a
+-- ignoreOpCounts = evalState initOpCounts
 
-countOp :: (Members '[State OpCounts] r) => NockOp -> Sem r ()
-countOp op =
-  modify
-    ( over
-        (opCountsMap . at op)
-        ( \case
-            Nothing -> Just 1
-            Just n -> Just (n + 1)
-        )
-    )
+-- countOp :: (Members '[State OpCounts] r) => NockOp -> Sem r ()
+-- countOp op =
+--   modify
+--     ( over
+--         (opCountsMap . at op)
+--         ( \case
+--             Nothing -> Just 1
+--             Just n -> Just (n + 1)
+--         )
+--     )
 
-runOpCounts :: Sem (State OpCounts ': r) a -> Sem r (OpCounts, a)
-runOpCounts = runState initOpCounts
+-- runOpCounts :: Sem (State OpCounts ': r) a -> Sem r (OpCounts, a)
+-- runOpCounts = runState initOpCounts
 
-instance Pretty OpCounts where
-  pretty :: OpCounts -> Doc a
-  pretty (OpCounts m) = vsepHard [pretty op <+> ":" <+> pretty (fromMaybe 0 (m ^. at op)) | op <- allElements]
+-- instance Pretty OpCounts where
+--   pretty :: OpCounts -> Doc a
+--   pretty (OpCounts m) = vsepHard [pretty op <+> ":" <+> pretty (fromMaybe 0 (m ^. at op)) | op <- allElements]
 
 asAtom :: (Members '[Reader EvalCtx, Error (NockEvalError a)] r) => Term a -> Sem r (Atom a)
 asAtom = \case
@@ -163,11 +163,11 @@ eval ::
   Term a ->
   Term a ->
   Sem s (Term a)
-eval initstack initterm = ignoreOpCounts (evalProfile initstack initterm)
+eval initstack initterm = evalProfile initstack initterm
 
 evalProfile ::
   forall s a.
-  (Integral a, Members '[State OpCounts, Reader EvalOptions, Output (Term a), Error (NockEvalError a), Error (ErrNockNatural a)] s, NockNatural a) =>
+  (Integral a, Members '[Reader EvalOptions, Output (Term a), Error (NockEvalError a), Error (ErrNockNatural a)] s, NockNatural a) =>
   Term a ->
   Term a ->
   Sem s (Term a)
@@ -240,7 +240,7 @@ evalProfile inistack initerm =
 
         goOperatorCell :: OperatorCell a -> Sem r (Term a)
         goOperatorCell c = do
-          countOp (c ^. operatorCellOp)
+          -- countOp (c ^. operatorCellOp)
           case c ^. operatorCellOp of
             OpAddress -> goOpAddress
             OpQuote -> return goOpQuote

test/Anoma/Compilation/Positive.hs

@@ -176,7 +176,7 @@ allTests =
         "Test017: Tail recursion through higher-order functions"
         $(mkRelDir ".")
         $(mkRelFile "test017.juvix")
-        [nockNatLiteral 1000]
+        [nockNatLiteral 100]
         $ checkNatOutput [500500],
       mkAnomaCallTest
         "Test018: Higher-order functions and recursion"

test/Nockma/Compile/Tree/Positive.hs

@@ -24,7 +24,6 @@ runNockmaAssertion hout _main tab = do
       . runOutputSem @(Term Natural)
         (embed . hPutStrLn hout . Nockma.ppTest)
       . runReader NockmaEval.defaultEvalOptions
-      . NockmaEval.ignoreOpCounts
       $ evalCompiledNock' (anomaRes ^. anomaClosure) (anomaCall (anomaRes ^. anomaEnv) [])
   let ret = getReturn res
   whenJust ret (hPutStrLn hout . Nockma.ppTest)