Consider 'constr i []' work-free

effectfully · effectfully · commit 68a00d11dff0 · 2025-04-16T01:11:56.000+02:00
diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.cbor.size.golden b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.cbor.size.golden
@@ -1 +1 @@
-2144
+2143
diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.small.budget.golden b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.small.budget.golden
@@ -1 +1 @@
-ExBudget {exBudgetCPU = ExCPU 82949157, exBudgetMemory = ExMemory 360005}
+ExBudget {exBudgetCPU = ExCPU 82853157, exBudgetMemory = ExMemory 359405}
diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.uplc.golden b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/sorted.uplc.golden
@@ -1325,11 +1325,10 @@ program
                 (equalsInteger eta eta)
                 (delay (constr 0 []))
                 (delay
-                   (force
-                      (force ifThenElse
-                         (lessThanEqualsInteger eta eta)
-                         (delay (constr 2 []))
-                         (delay (constr 1 []))))))))
+                   (force ifThenElse
+                      (lessThanEqualsInteger eta eta)
+                      (constr 2 [])
+                      (constr 1 []))))))
      (\ds ds ->
         case
           ds
diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.cbor.size.golden b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.cbor.size.golden
@@ -1 +1 @@
-2139
+2138
diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.uplc.golden b/cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests/unsorted.uplc.golden
@@ -1340,11 +1340,10 @@ program
                 (equalsInteger eta eta)
                 (delay (constr 0 []))
                 (delay
-                   (force
-                      (force ifThenElse
-                         (lessThanEqualsInteger eta eta)
-                         (delay (constr 2 []))
-                         (delay (constr 1 []))))))))
+                   (force ifThenElse
+                      (lessThanEqualsInteger eta eta)
+                      (constr 2 [])
+                      (constr 1 []))))))
      (\ds ds ->
         case
           ds
diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.cbor.size.golden b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.cbor.size.golden
@@ -1 +1 @@
-2147
+2145
diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.small.budget.golden b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.small.budget.golden
@@ -1 +1 @@
-ExBudget {exBudgetCPU = ExCPU 83093157, exBudgetMemory = ExMemory 360905}
+ExBudget {exBudgetCPU = ExCPU 82997157, exBudgetMemory = ExMemory 360305}
diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.uplc.golden b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.uplc.golden
@@ -1324,11 +1324,10 @@ program
                 (equalsInteger eta eta)
                 (delay (constr 0 []))
                 (delay
-                   (force
-                      (force ifThenElse
-                         (lessThanEqualsInteger eta eta)
-                         (delay (constr 2 []))
-                         (delay (constr 1 []))))))))
+                   (force ifThenElse
+                      (lessThanEqualsInteger eta eta)
+                      (constr 2 [])
+                      (constr 1 []))))))
      (\ds ds ->
         case
           ds
diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.cbor.size.golden b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.cbor.size.golden
@@ -1 +1 @@
-2136
+2135
diff --git a/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.uplc.golden b/cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.uplc.golden
@@ -1334,11 +1334,10 @@ program
                 (equalsInteger eta eta)
                 (delay (constr 0 []))
                 (delay
-                   (force
-                      (force ifThenElse
-                         (lessThanEqualsInteger eta eta)
-                         (delay (constr 2 []))
-                         (delay (constr 1 []))))))))
+                   (force ifThenElse
+                      (lessThanEqualsInteger eta eta)
+                      (constr 2 [])
+                      (constr 1 []))))))
      (\ds ds ->
         case
           ds
diff --git a/plutus-benchmark/nofib/test/9.6/clausify-F5.size.golden b/plutus-benchmark/nofib/test/9.6/clausify-F5.size.golden
@@ -1 +1 @@
-1594
+1591
diff --git a/plutus-benchmark/nofib/test/9.6/knights10-4x4.budget.golden b/plutus-benchmark/nofib/test/9.6/knights10-4x4.budget.golden
@@ -1,2 +1,2 @@
-({cpu: 1395406000
-| mem: 7030012})
+({cpu: 1395086000
+| mem: 7028012})
diff --git a/plutus-benchmark/nofib/test/9.6/knights10-4x4.size.golden b/plutus-benchmark/nofib/test/9.6/knights10-4x4.size.golden
@@ -1 +1 @@
-2027
+2021
diff --git a/plutus-benchmark/nofib/test/9.6/queens4-bt.budget.golden b/plutus-benchmark/nofib/test/9.6/queens4-bt.budget.golden
@@ -1,2 +1,2 @@
-({cpu: 4382302267
-| mem: 23479730})
+({cpu: 4302046267
+| mem: 22978130})
diff --git a/plutus-benchmark/nofib/test/9.6/queens4-bt.size.golden b/plutus-benchmark/nofib/test/9.6/queens4-bt.size.golden
@@ -1 +1 @@
-2070
+2061
diff --git a/plutus-benchmark/nofib/test/9.6/queens5-fc.budget.golden b/plutus-benchmark/nofib/test/9.6/queens5-fc.budget.golden
@@ -1,2 +1,2 @@
-({cpu: 153378014621
-| mem: 861736266})
+({cpu: 153231070621
+| mem: 860817866})
diff --git a/plutus-benchmark/nofib/test/9.6/queens5-fc.size.golden b/plutus-benchmark/nofib/test/9.6/queens5-fc.size.golden
@@ -1 +1 @@
-2070
+2061
diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Purity.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Purity.hs
@@ -204,8 +204,9 @@ termEvaluationOrder builtinSemanticsVariant = goTerm
     t@(Constr _ _ ts) ->
       -- first the arguments, in left-to-right order
       foldMap goTerm ts
-        -- then the whole term, which means constructing the value, so work
-        <> evalThis (EvalTerm Pure MaybeWork t)
+        -- then the whole term, which means constructing the value, so work, unless there's no
+        -- arguments, in which case it's not more work than evaluating, say, a @Delay@ node
+        <> evalThis (EvalTerm Pure (if null ts then WorkFree else MaybeWork) t)
     t@(Case _ scrut _) ->
       -- first the scrutinee
       goTerm scrut
diff --git a/plutus-tx-plugin/test/Budget/9.6/not-not.budget.golden b/plutus-tx-plugin/test/Budget/9.6/not-not.budget.golden
@@ -1,2 +1,2 @@
-({cpu: 457439
-| mem: 2202})
+({cpu: 361439
+| mem: 1602})
diff --git a/plutus-tx-plugin/test/Budget/9.6/not-not.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/not-not.uplc.golden
@@ -1,12 +1,4 @@
 (program
    1.1.0
-   ((\x ->
-       force
-         (case
-            (force
-               (force ifThenElse
-                  (lessThanInteger 0 x)
-                  (delay (constr 1 []))
-                  (delay (constr 0 []))))
-            [(delay (constr 1 [])), (delay (constr 0 []))]))
+   ((\x -> force ifThenElse (lessThanInteger 0 x) (constr 0 []) (constr 1 []))
       1))
diff --git a/plutus-tx-plugin/test/size/Golden/Rational/Ord/compare.size.golden b/plutus-tx-plugin/test/size/Golden/Rational/Ord/compare.size.golden
@@ -1 +1 @@
-53
+50

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-ExBudget {exBudgetCPU = ExCPU 82949157, exBudgetMemory = ExMemory 360005}`
	`1`	`+ExBudget {exBudgetCPU = ExCPU 82853157, exBudgetMemory = ExMemory 359405}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-ExBudget {exBudgetCPU = ExCPU 83093157, exBudgetMemory = ExMemory 360905}`
	`1`	`+ExBudget {exBudgetCPU = ExCPU 82997157, exBudgetMemory = ExMemory 360305}`