From 75adb30d34fd0c0d7adeefe746de137effdc0250 Mon Sep 17 00:00:00 2001 From: Jun Furuse Date: Sat, 9 Sep 2023 16:42:40 +0900 Subject: [PATCH] Snoop: updates the default value for the fixed point transformation --- docs/developer/snoop_example.rst | 2 +- src/bin_snoop/main_snoop.ml | 7 +------ src/lib_benchmark/fixed_point_transform.ml | 4 ++-- tezt/snoop/perform_codegen.ml | 6 +++--- tezt/tests/snoop_codegen/fp.json | 2 +- tezt/tests/snoop_codegen/lsl_bytes.ml.expect | 6 +++--- 6 files changed, 11 insertions(+), 16 deletions(-) diff --git a/docs/developer/snoop_example.rst b/docs/developer/snoop_example.rst index 6772184c95a2..3db94037cd9c 100644 --- a/docs/developer/snoop_example.rst +++ b/docs/developer/snoop_example.rst @@ -241,7 +241,7 @@ of the grid used when prettifying constants (in nanoseconds). .. code-block:: JSON - { "precision": 5, "max_relative_error": 0.1, "cast_mode": "Round", "inverse_scaling": 3, "resolution": 5 } + { "precision": 6, "max_relative_error": 0.1, "cast_mode": "Round", "inverse_scaling": 10, "resolution": 5 } Calling the tool: diff --git a/src/bin_snoop/main_snoop.ml b/src/bin_snoop/main_snoop.ml index e5918572a9b4..1f0b5bf560b4 100644 --- a/src/bin_snoop/main_snoop.ml +++ b/src/bin_snoop/main_snoop.ml @@ -1150,12 +1150,7 @@ module Auto_build = struct let codegen_options = Cmdline. { - transform = - Some - { - Fixed_point_transform.default_options with - max_relative_error = 0.5; - }; + transform = Some Fixed_point_transform.default_options; save_to = Some (mkfilename ".ml"); split; } diff --git a/src/lib_benchmark/fixed_point_transform.ml b/src/lib_benchmark/fixed_point_transform.ml index 6e1e542f7895..981a680d7003 100644 --- a/src/lib_benchmark/fixed_point_transform.ml +++ b/src/lib_benchmark/fixed_point_transform.ml @@ -53,10 +53,10 @@ exception Fixed_point_transform_error of fixed_point_transform_error let default_options = { - precision = 4; + precision = 6; max_relative_error = 0.1; cast_mode = Round; - inverse_scaling = 3; + inverse_scaling = 10; resolution = 5; } diff --git a/tezt/snoop/perform_codegen.ml b/tezt/snoop/perform_codegen.ml index 2a455b4ff520..278ced0eb186 100644 --- a/tezt/snoop/perform_codegen.ml +++ b/tezt/snoop/perform_codegen.ml @@ -29,10 +29,10 @@ let prepare_fp_json inference_root = Base.write_file fn ~contents: - {|{ "precision": 4, - "max_relative_error": 0.5, + {|{ "precision": 6, + "max_relative_error": 0.1, "cast_mode": "Round", - "inverse_scaling": 3, + "inverse_scaling": 10, "resolution": 5 }|} ; fn diff --git a/tezt/tests/snoop_codegen/fp.json b/tezt/tests/snoop_codegen/fp.json index ece8e232d986..dba67f2daeb8 100644 --- a/tezt/tests/snoop_codegen/fp.json +++ b/tezt/tests/snoop_codegen/fp.json @@ -1 +1 @@ -{ "precision": 5, "max_relative_error": 0.2, "cast_mode": "Round", "inverse_scaling": 3, "resolution": 5 } +{ "precision": 6, "max_relative_error": 0.1, "cast_mode": "Round", "inverse_scaling": 10, "resolution": 5 } diff --git a/tezt/tests/snoop_codegen/lsl_bytes.ml.expect b/tezt/tests/snoop_codegen/lsl_bytes.ml.expect index 22a0120a12e5..2784420ed4c6 100644 --- a/tezt/tests/snoop_codegen/lsl_bytes.ml.expect +++ b/tezt/tests/snoop_codegen/lsl_bytes.ml.expect @@ -28,15 +28,15 @@ let cost_N_ILsl_bytes size1 size2 = let v1 = size1 in let v0 = S.sub size2 (S.safe_int 1) in S.safe_int 70 - + ((v1 lsr 4) + (v1 lsr 5) + (v1 lsr 6) + (v1 lsr 7) + (v1 lsr 8)) - + ((v0 lsr 8) + (v0 lsr 10) + (v0 lsr 12)) + + ((v1 lsr 4) + (v1 lsr 5) + (v1 lsr 6) + (v1 lsr 7) + (v1 lsr 9)) + + ((v0 lsr 8) + (v0 lsr 10) + (v0 lsr 13)) (* model interpreter/amplification_loop_model *) (* fun size -> 0.318599639559 * size *) let cost_amplification_loop_model size = let size = S.safe_int size in let v0 = size in - (v0 lsr 2) + (v0 lsr 4) + (v0 lsr 6) + (v0 lsr 2) + (v0 lsr 4) + (v0 lsr 7) (* model zero *) (* 0 *) -- GitLab