Upgrade to F* Universes

.github/workflows/nightly.yml

@@ -25,10 +25,10 @@ jobs:
         with:
           submodules: true
           fetch-depth: 0
-          ref: ${{ github.event_name == 'schedule' && '_nik_smt_univs_2025' || '' }}
+          ref: ${{ github.event_name == 'schedule' && 'master' || '' }}
       - name: Record base ref
         run: |
-          echo "base_branch=${{ github.event_name == 'schedule' && '_nik_smt_univs_2025' || github.ref_name }}" > base_ref.txt
+          echo "base_branch=${{ github.event_name == 'schedule' && 'master' || github.ref_name }}" > base_ref.txt
           echo "base_sha=$(git rev-parse HEAD)" >> base_ref.txt
       - name: Set up git
         run: |

README.md

@@ -356,6 +356,15 @@ Then, whenever you make a change in your clones:
 Then, in EverParse, `make` will automatically rebuild F\*, Karamel and
 Pulse from your clones with your patches.
 
+## Using a specific branch of F\*, Karamel, Pulse etc. 
+
+1. Run `make -C opt FStar pulse karamel` to clone the default branches of those repositories
+
+2. In the cloned directories, switch to your branch, e.g., `git checkout <mybranch>`
+
+3. Then run `make -C opt snapshot` to record the hashes you intend to use
+
+
 ## Using an existing opam root, F\*, etc.
 
 If you want to use existing dependencies instead of letting EverParse

deps.Makefile

@@ -13,7 +13,7 @@ export EVERPARSE_OPT_PATH := $(shell cygpath -m $(EVERPARSE_OPT_PATH))
 NO_PULSE := 1
 endif
 
-Z3_VERSION := 4.13.3
+EVERPARSE_Z3_VERSION ?= 4.13.3
 
 ifeq (1,$(EVERPARSE_USE_MY_DEPS))
 export EVERPARSE_USE_OPAMROOT:=1
@@ -51,7 +51,7 @@ NEED_FSTAR :=
 ifneq (1,$(EVERPARSE_USE_FSTAR_EXE))
 export FSTAR_EXE := $(EVERPARSE_OPT_PATH)/FStar/out/bin/fstar.exe
 NEED_FSTAR := $(EVERPARSE_OPT_PATH)/FStar.done
-z3_exe := $(shell $(FSTAR_EXE) --locate_z3 \$(Z3_VERSION) 2>/dev/null)
+z3_exe := $(shell $(FSTAR_EXE) --locate_z3 \$(EVERPARSE_Z3_VERSION) 2>/dev/null)
 ifneq (0,$(.SHELLSTATUS))
 z3_exe :=
 endif
@@ -74,7 +74,7 @@ with_opam := eval "$$($(EVERPARSE_OPT_PATH)/opam-env.sh --shell)" &&
 
 NEED_Z3 :=
 ifeq (,$(z3_exe))
-z3_exe := $(shell which z3-$(Z3_VERSION))
+z3_exe := $(shell which z3-$(EVERPARSE_Z3_VERSION))
 ifneq (0,$(.SHELLSTATUS))
 z3_exe :=
 endif
@@ -170,6 +170,7 @@ ifeq ($(OS),Windows_NT)
 else
 	@echo export EVERPARSE_HOME=$(CURDIR)
 endif
+	@echo export EVERPARSE_Z3_VERSION=$(EVERPARSE_Z3_VERSION)
 	@echo export PATH=\"$(z3_dir):'$$PATH'\"
 
 .PHONY: env

fstar.sh

@@ -3,4 +3,4 @@ set -e
 unset CDPATH
 EVERPARSE_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source "$EVERPARSE_HOME"/env.sh
-exec "$FSTAR_EXE" --include "$KRML_HOME/krmllib" --include "$KRML_HOME/krmllib/obj" --include "$PULSE_HOME/lib/pulse" "$@"
+exec "$FSTAR_EXE" --z3version $EVERPARSE_Z3_VERSION --include "$KRML_HOME/krmllib" --include "$KRML_HOME/krmllib/obj" --include "$PULSE_HOME/lib/pulse" "$@"

opt/advance.Makefile

@@ -1,3 +1,3 @@
 FStar_hash := origin/master
-karamel_hash := origin/master
+karamel_hash := fb36fecb552c9fb202beb38a6c5a732c3f2cd49f
 pulse_hash := origin/main

opt/hashes.Makefile

@@ -1,3 +1,3 @@
-FStar_hash := 1cff8d796deed8834926389a986d015498780041
+FStar_hash := b829d21f1d68051caeff664f515d17bdb84ad203
 karamel_hash := fb36fecb552c9fb202beb38a6c5a732c3f2cd49f
-pulse_hash := a1a94bae512a7ca56fd03ae8da5154409a1cca06
+pulse_hash := 6e5c85213db9ff97ded29e136210ce092d573f0e

src/3d/prelude/EverParse3d.Actions.Base.fst

@@ -400,7 +400,7 @@ let validate_ret
   = fun ctxt error_handler_fn input input_length start_position ->
     start_position
 
-#push-options "--z3rlimit 32"
+#push-options "--z3rlimit 128"
 
 module LPC = LowParse.Spec.Combinators
 
@@ -514,7 +514,7 @@ let validate_dep_pair
 
 #pop-options
 
-#push-options "--z3rlimit 128"
+#push-options "--z3rlimit 512"
 #restart-solver
 
 inline_for_extraction noextract

src/3d/tests/Makefile

@@ -94,7 +94,7 @@ specialize_test2:
 .PHONY: specialize_tagged_union_array
 specialize_tagged_union_array:
 	+$(MAKE) -C $@
-	
+
 batch-test-negative: $(addsuffix .negtest,$(wildcard FAIL*.3d))
 
 %.3d.negtest: %.3d
@@ -167,6 +167,6 @@ clean-files:
 
 .PHONY: clean-files
 
-clean: clean-files specialize_test.clean specialize_test2.clean probe.clean extern.clean exttype.clean funptr.clean ifdefs.clean iter/coarse.clean iter/fine.clean modules.clean output_types.clean static.clean tcpip.clean
+clean: clean-files specialize_test.clean specialize_test2.clean probe.clean extern.clean exttype.clean funptr.clean ifdefs.clean iter/coarse.clean iter/fine.clean modules.clean output_types.clean static.clean tcpip.clean specialize_tagged_union_array.clean
 
 .PHONY: all batch-test batch-test-negative %.negtest clean batch-cleanup-test inplace-hash-test modules tcpip extern %.interpret batch-interpret-test static funptr ifdefs

src/ASN1/ASN1.Spec.Interpreter.fst

@@ -78,6 +78,8 @@ let auto_asn1_sequence_any_t_equiv' (items : list asn1_gen_item_k) (suffix_t : T
   [SMTPat (asn1_sequence_any_t items suffix_t)]
 = asn1_sequence_any_t_equiv' items suffix_t
 
+#push-options "--z3rlimit 20"
+
 let rec dasn1_terminal_as_parser (k : asn1_terminal_k) : asn1_weak_parser (asn1_terminal_t k)  =
   parse_debug #(asn1_terminal_t k) #(asn1_weak_parser_kind) "asn1_terminal_as_parser"
   (match k with
@@ -200,6 +202,10 @@ and dasn1_decorated_as_parser_twin
     let p : asn1_weak_parser (asn1_decorated_pure_t item) = weaken _ ((dasn1_terminal_as_parser k) `parse_filter` is_valid) in
     Mkgendcparser item (parse_asn1_ILC id #(ASN1_RESTRICTED_TERMINAL k is_valid) p) (parse_asn1_ILC_twin id #(ASN1_RESTRICTED_TERMINAL k is_valid) p)
 
+#pop-options
+
+
+#push-options "--z3rlimit 20"
 
 let rec asn1_terminal_as_parser (k : asn1_terminal_k) : asn1_weak_parser (asn1_terminal_t k)  =
   match k with

src/ASN1/ASN1.Spec.Sequence.fst

@@ -145,6 +145,8 @@ let and_then_cases_injective_some_elim
   (ensures (x1 == x2))
 = ()
 
+#push-options "--z3rlimit 20"
+
 let parse_asn1_sequence_item_twin_cases_injective
   (item : gen_decorated_parser_twin)
 : Lemma
@@ -186,6 +188,7 @@ let parse_asn1_sequence_item_twin_cases_injective
               and_then_cases_injective_elim fp id1 id2 b1 b2
           )
 
+#pop-options
 
 (* FIXME: using option type as the state might cause problems for extracting the validator *)
 
@@ -266,6 +269,8 @@ let make_asn1_sequence_parser_body_twin
     //assert (forall id. parse_defaultable_injective_cond_prop (generate_defaultable_items itemtwins) (ret id));
     ret  
 
+#push-options "--z3rlimit 10"
+
 let make_asn1_sequence_parser_body_twin_and_then_cases_injective
   (itemtwins : list (gen_decorated_parser_twin) {Cons? itemtwins})
 //  (pf : (asn1_sequence_k_wf (List.map project_set_decorator itemtwins)))
@@ -353,6 +358,8 @@ let make_asn1_sequence_parser_body_twin_and_then_cases_injective
                 nondep_then_eq p' p2 b2;
                 and_then_cases_injective_some_elim (ploop tl) id1 id2 b1 b2))
 
+#pop-options
+
 let make_asn1_sequence_parser_body_twin_spec
   (#itemtwins : list (gen_decorated_parser_twin) {Cons? itemtwins})
   (pbodytwin : asn1_id_t -> (asn1_weak_parser (asn1_sequence_t (List.map (Mkgendcparser?.d) itemtwins))))
@@ -379,6 +386,8 @@ let make_asn1_sequence_parser_body
   | _ -> and_then_defaultable p pbodytwin ov) in
   weaken asn1_weak_parser_kind (p `and_then` pbodytwin)
 
+#push-options "--z3rlimit 10"
+
 let make_asn1_sequence_parser_body_and_then_cases_injective
   (#itemtwins : list (gen_decorated_parser_twin) {Cons? itemtwins})
 //  (pf : (asn1_sequence_k_wf (List.map project_set_decorator itemtwins)))
@@ -400,6 +409,8 @@ let make_asn1_sequence_parser_body_and_then_cases_injective
             and_then_eq p2 p' b2;
             and_then_cases_injective_elim p' v1 v2 b1 b2)
 
+#pop-options
+
 let make_asn1_sequence_parser_body_spec
   (itemtwins : list (gen_decorated_parser_twin))
   (pbody : (l : list (gen_decorated_parser_twin) {Cons? l /\ (l << itemtwins \/ (l == itemtwins /\ 0 << 1))}) -> (st : option asn1_id_t) -> asn1_weak_parser (asn1_sequence_t (List.map (Mkgendcparser?.d) l)))

src/ASN1/ASN1.X509.fst

@@ -1,4 +1,5 @@
 module ASN1.X509
+#push-options "--split_queries no --fuel 2 --ifuel 0"
 
 module U32 = FStar.UInt32
 module List = FStar.List.Tot
@@ -302,11 +303,12 @@ let id_pe = id_pkix /+ 1
 let id_pe_authorityInformationAccess = id_pe /+ 1
 
 //Warning: Partly using the mitls spec which is loosened from rfc5280
-
+#push-options "--fuel 3 --ifuel 1"
 let mk_expansion (critical : asn1_gen_item_k) (#s : _) (value : asn1_k s)
   (pf : squash (asn1_sequence_k_wf [proj2_of_3 critical; (Set.singleton octetstring_id, PLAIN)]))
 = let items = [critical; "extnValue" *^ (PLAIN ^: (ASN1_ILC octetstring_id (ASN1_PREFIXED value)))] in
   mk_gen_items items pf
+#pop-options
 
 let critical_field
 = mk_default_field asn1_boolean false
@@ -562,8 +564,7 @@ let extension
 let extensions
 = asn1_sequence_of extension
 
-#push-options "--z3rlimit 16"
-
+#push-options "--fuel 0 --z3rlimit_factor 2"
 let x509_TBSCertificate
 = asn1_sequence [
     "version" *^ (PLAIN ^: (mk_prefixed (mk_custom_id CONTEXT_SPECIFIC CONSTRUCTED 0) version));
@@ -578,14 +579,13 @@ let x509_TBSCertificate
     "extensions" *^ (OPTION ^: (mk_prefixed (mk_custom_id CONTEXT_SPECIFIC CONSTRUCTED 3) extensions))]
     (_ by (seq_tac ()))
 
-#pop-options
-
 let x509_certificate
 = asn1_sequence [
     "tbsCertificate" *^ (PLAIN ^: x509_TBSCertificate);
     "signatureAlgorithm" *^ (PLAIN ^: algorithmIdentifier);
     "signatureValue" *^ (PLAIN ^: asn1_bitstring)]
     (_ by (seq_tac ()))
+#pop-options
 
 // let's go boom!
 
@@ -605,4 +605,4 @@ let parse_cert (b:bytes) = x509_certificate_parser b
                              iota;
                              primops]]
 let dparse_cert (b:bytes) = dasn1_as_parser x509_certificate b
-
+#show-options