fix: remaining cost models (mod integer)

  Also, separate the extra conformance tsts to avoid accidentally
  overriding them when re-generating new tests."

Author: KtorZ

crates/uplc/src/machine/cost_model/builtin_costs/builtin_costs_v3.rs

@@ -169,8 +169,8 @@ impl Default for BuiltinCostsV3 {
             ),
             mod_integer: TwoArgumentsCosting::new(
                 TwoArgumentsCosting::linear_in_y(0, 1),
-                TwoArgumentsCosting::above_and_below_diagonal_into_quadratic_x_and_y(
-                    85848, 123203, 7305, -900, 1716, 960, 57,
+                TwoArgumentsCosting::const_above_diagonal_into_quadratic_x_and_y(
+                    85848, 85848, 123203, 7305, -900, 1716, 960, 57,
                 ),
             ),
             equals_integer: TwoArgumentsCosting::new(
@@ -782,7 +782,8 @@ impl BuiltinCostModel for BuiltinCostsV3 {
                     cost_map["mod_integer-mem-arguments-intercept"],
                     cost_map["mod_integer-mem-arguments-slope"],
                 ),
-                TwoArgumentsCosting::above_and_below_diagonal_into_quadratic_x_and_y(
+                TwoArgumentsCosting::const_above_diagonal_into_quadratic_x_and_y(
+                    cost_map["mod_integer-cpu-arguments-constant"],
                     cost_map["mod_integer-cpu-arguments-minimum"],
                     cost_map["mod_integer-cpu-arguments-c00"],
                     cost_map["mod_integer-cpu-arguments-c01"],

crates/uplc/src/machine/cost_model/costing.rs

@@ -72,7 +72,6 @@ pub enum TwoArguments {
     ConstAboveDiagonalIntoQuadraticXAndY(i64, TwoArgumentsQuadraticFunction),
     ConstAboveDiagonalIntoMultipliedSizes(i64, MultipliedSizes),
     WithInteraction(WithInteraction),
-    AboveAndBelowDiagonalIntoQuadraticXAndY(TwoArgumentsQuadraticFunction),
 }
 
 pub type TwoArgumentsCosting = Costing<2, TwoArguments>;
@@ -155,27 +154,6 @@ impl TwoArgumentsCosting {
         })
     }
 
-    #[allow(clippy::too_many_arguments)]
-    pub fn above_and_below_diagonal_into_quadratic_x_and_y(
-        minimum: i64,
-        coeff_00: i64,
-        coeff_01: i64,
-        coeff_02: i64,
-        coeff_10: i64,
-        coeff_11: i64,
-        coeff_20: i64,
-    ) -> TwoArguments {
-        TwoArguments::AboveAndBelowDiagonalIntoQuadraticXAndY(TwoArgumentsQuadraticFunction {
-            minimum,
-            coeff_00,
-            coeff_01,
-            coeff_02,
-            coeff_10,
-            coeff_11,
-            coeff_20,
-        })
-    }
-
     pub fn const_above_diagonal_into_multiplied_sizes(
         constant: i64,
         intercept: i64,
@@ -237,19 +215,6 @@ impl Cost<2> for TwoArguments {
                 }
             }
             TwoArguments::WithInteraction(w) => w.c00 + w.c10 * x + w.c01 * y + w.c11 * x * y,
-            TwoArguments::AboveAndBelowDiagonalIntoQuadraticXAndY(q) => {
-                let max_arg = x.max(y);
-                let min_arg = x.min(y);
-                std::cmp::max(
-                    q.minimum,
-                    q.coeff_00
-                        + q.coeff_10 * max_arg
-                        + q.coeff_01 * min_arg
-                        + q.coeff_20 * max_arg * max_arg
-                        + q.coeff_11 * max_arg * min_arg
-                        + q.coeff_02 * min_arg * min_arg,
-                )
-            }
         }
     }
 }

crates/uplc/src/syn/term.rs

@@ -212,7 +212,7 @@ pub fn builtin_from_str<'a>(arena: &'a Arena, name: &str) -> Option<&'a Term<'a,
         "blake2b_256" => Some(Term::blake2b_256(arena)),
         "keccak_256" => Some(Term::keccak_256(arena)),
         "blake2b_224" => Some(Term::blake2b_224(arena)),
-        "verifyEd25519Signature" => Some(Term::verify_ed25519_signature(arena)),
+        "verifySignature" | "verifyEd25519Signature" => Some(Term::verify_ed25519_signature(arena)),
         "verifyEcdsaSecp256k1Signature" => Some(Term::verify_ecdsa_secp256k1_signature(arena)),
         "verifySchnorrSecp256k1Signature" => Some(Term::verify_schnorr_secp256k1_signature(arena)),
         "appendString" => Some(Term::append_string(arena)),

crates/uplc/tests/conformance/textual/builtin/semantics/equalsByteString/v3-off-diagonal-intercept/v3-off-diagonal-intercept.uplc.budget.expected

@@ -0,0 +1,98 @@
+use amaru_uplc::{
+    arena::Arena,
+    machine::{ExBudget, PlutusVersion},
+    syn::parse_program,
+};
+
+const EXTRA_V3_COSTS: &[i64] = &[
+    100788, 420, 1, 1, 1000, 173, 0, 1, 1000, 59957, 4, 1, 11183, 32, 201305, 8356, 4, 16000, 100,
+    16000, 100, 16000, 100, 16000, 100, 16000, 100, 16000, 100, 100, 100, 16000, 100, 94375, 32,
+    132994, 32, 61462, 4, 72010, 178, 0, 1, 22151, 32, 91189, 769, 4, 2, 85848, 123203, 7305, -900,
+    1716, 549, 57, 85848, 0, 1, 1, 1000, 42921, 4, 2, 24548, 29498, 38, 1, 898148, 27279, 1, 51775,
+    558, 1, 39184, 1000, 60594, 1, 141895, 32, 83150, 32, 15299, 32, 76049, 1, 13169, 4, 22100, 10,
+    28999, 74, 1, 28999, 74, 1, 43285, 552, 1, 44749, 541, 1, 33852, 32, 68246, 32, 72362, 32,
+    7243, 32, 7391, 32, 11546, 32, 85848, 123203, 7305, -900, 1716, 549, 57, 85848, 0, 1, 90434,
+    519, 0, 1, 74433, 32, 85848, 123203, 7305, -900, 1716, 549, 57, 85848, 0, 1, 1, 85848, 123203,
+    7305, -900, 1716, 549, 57, 85848, 0, 1, 955506, 213312, 0, 2, 270652, 22588, 4, 1457325, 64566,
+    4, 20467, 1, 4, 0, 141992, 32, 100788, 420, 1, 1, 81663, 32, 59498, 32, 20142, 32, 24588, 32,
+    20744, 32, 25933, 32, 24623, 32, 43053543, 10, 53384111, 14333, 10, 43574283, 26308, 10, 16000,
+    100, 16000, 100, 962335, 18, 2780678, 6, 442008, 1, 52538055, 3756, 18, 267929, 18, 76433006,
+    8868, 18, 52948122, 18, 1995836, 36, 3227919, 12, 901022, 1, 166917843, 4307, 36, 284546, 36,
+    158221314, 26549, 36, 74698472, 36, 333849714, 1, 254006273, 72, 2174038, 72, 2261318, 64571,
+    4, 207616, 8310, 4, 1293828, 28716, 63, 0, 1, 1006041, 43623, 251, 0, 1, 100181, 726, 719, 0,
+    1, 100181, 726, 719, 0, 1, 100181, 726, 719, 0, 1, 107878, 680, 0, 1, 95336, 1, 281145, 18848,
+    0, 1, 180194, 159, 1, 1, 158519, 8942, 0, 1, 159378, 8813, 0, 1, 107490, 3298, 1, 106057, 655,
+    1, 1964219, 24520, 3,
+];
+
+fn run_conformance_with_params(file_contents: &str, expected_output: &str, expected_budget: &str) {
+    let arena = Arena::new();
+
+    let Ok(program) = parse_program(&arena, file_contents).into_result() else {
+        pretty_assertions::assert_eq!("parse error", expected_output.trim_end());
+        pretty_assertions::assert_eq!("parse error", expected_budget.trim_end());
+        return;
+    };
+
+    let result = program.eval_with_params(
+        &arena,
+        PlutusVersion::V3,
+        EXTRA_V3_COSTS,
+        ExBudget::default(),
+    );
+
+    let info = result.info;
+
+    let Ok(term) = result.term else {
+        pretty_assertions::assert_eq!("evaluation failure", expected_output.trim_end());
+        pretty_assertions::assert_eq!("evaluation failure", expected_budget.trim_end());
+        return;
+    };
+
+    let expected = parse_program(&arena, expected_output)
+        .into_result()
+        .unwrap();
+
+    pretty_assertions::assert_eq!(expected.term, term);
+
+    let consumed_budget = format!(
+        "({{cpu: {}\n| mem: {}}})",
+        info.consumed_budget.cpu, info.consumed_budget.mem
+    );
+
+    pretty_assertions::assert_eq!(consumed_budget, expected_budget.trim_end());
+}
+
+macro_rules! regression_case {
+    ($name:ident, $path:literal) => {
+        #[test]
+        fn $name() {
+            run_conformance_with_params(
+                include_str!($path),
+                include_str!(concat!($path, ".expected")),
+                include_str!(concat!($path, ".budget.expected")),
+            );
+        }
+    };
+}
+
+regression_case!(
+    builtin_semantics_divideinteger_v3_below_diagonal_constant_regression,
+    "conformance_extra/textual/builtin/semantics/divideInteger/v3-below-diagonal-constant/v3-below-diagonal-constant.uplc"
+);
+regression_case!(
+    builtin_semantics_divideinteger_v3_diagonal_c11_regression,
+    "conformance_extra/textual/builtin/semantics/divideInteger/v3-diagonal-c11/v3-diagonal-c11.uplc"
+);
+regression_case!(
+    builtin_semantics_modinteger_v3_below_diagonal_constant_regression,
+    "conformance_extra/textual/builtin/semantics/modInteger/v3-below-diagonal-constant/v3-below-diagonal-constant.uplc"
+);
+regression_case!(
+    builtin_semantics_equalsbytestring_v3_off_diagonal_intercept_regression,
+    "conformance_extra/textual/builtin/semantics/equalsByteString/v3-off-diagonal-intercept/v3-off-diagonal-intercept.uplc"
+);
+regression_case!(
+    builtin_semantics_verifysignature_legacy_alias_test_vector_25_regression,
+    "conformance_extra/textual/builtin/semantics/verifySignature/legacy-alias-test-vector-25/legacy-alias-test-vector-25.uplc"
+);

crates/uplc/tests/conformance_extra.rs

@@ -1,2 +1,2 @@
 ({cpu: 165948
-| mem: 601})
+| mem: 601})

…constant/v3-below-diagonal-constant.uplc …constant/v3-below-diagonal-constant.uplccrates/uplc/tests/conformance/textual/builtin/semantics/divideInteger/v3-below-diagonal-constant/v3-below-diagonal-constant.uplc renamed to crates/uplc/tests/conformance_extra/textual/builtin/semantics/divideInteger/v3-below-diagonal-constant/v3-below-diagonal-constant.uplc crates/uplc/tests/conformance/textual/builtin/semantics/divideInteger/v3-below-diagonal-constant/v3-below-diagonal-constant.uplc renamed to crates/uplc/tests/conformance_extra/textual/builtin/semantics/divideInteger/v3-below-diagonal-constant/v3-below-diagonal-constant.uplc

@@ -0,0 +1,9 @@
+(program 1.0.0
+ [
+  [
+   (builtin divideInteger)
+   (con integer 1)
+  ]
+  (con integer 1)
+ ]
+)

…w-diagonal-constant.uplc.budget.expected …w-diagonal-constant.uplc.budget.expectedcrates/uplc/tests/conformance/textual/builtin/semantics/divideInteger/v3-below-diagonal-constant/v3-below-diagonal-constant.uplc.budget.expected renamed to crates/uplc/tests/conformance_extra/textual/builtin/semantics/divideInteger/v3-below-diagonal-constant/v3-below-diagonal-constant.uplc.budget.expected crates/uplc/tests/conformance/textual/builtin/semantics/divideInteger/v3-below-diagonal-constant/v3-below-diagonal-constant.uplc.budget.expected renamed to crates/uplc/tests/conformance_extra/textual/builtin/semantics/divideInteger/v3-below-diagonal-constant/v3-below-diagonal-constant.uplc.budget.expected

@@ -0,0 +1,2 @@
+({cpu: 212030
+| mem: 601})