diff options
| author | Yann Herklotz <git@yannherklotz.com> | 2021-04-07 02:58:02 +0100 |
|---|---|---|
| committer | Yann Herklotz <git@yannherklotz.com> | 2021-04-07 02:58:02 +0100 |
| commit | 1fc4099fc354ce44ca00ed94d73028c347f9b470 (patch) | |
| tree | 5c64139be3bc9e5b7635f5e8021f480803279eea | |
| parent | cd821e735872abf8c32051c561abd46294e7be94 (diff) | |
| download | vericert-1fc4099fc354ce44ca00ed94d73028c347f9b470.tar.gz vericert-1fc4099fc354ce44ca00ed94d73028c347f9b470.zip | |
Remove Admitted in the highest of top-levelsv1.2.0
| -rw-r--r-- | src/Compiler.v | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/Compiler.v b/src/Compiler.v index 4e4665b..61adad1 100644 --- a/src/Compiler.v +++ b/src/Compiler.v @@ -269,6 +269,7 @@ Definition CompCert's_passes := ::: mkpass (match_if Compopts.optim_redundancy Deadcodeproof.match_prog) ::: mkpass Unusedglobproof.match_prog ::: (@mkpass _ _ HTLgenproof.match_prog (HTLgenproof.TransfHTLLink HTLgen.transl_program)) + ::: mkpass (match_if HLSOpts.optim_ram Memorygen.match_prog) ::: mkpass Veriloggenproof.match_prog ::: pass_nil _. @@ -306,7 +307,8 @@ Proof. destruct (partial_if Compopts.optim_redundancy Deadcode.transf_program p11) as [p12|e] eqn:P12; simpl in T; try discriminate. destruct (Unusedglob.transform_program p12) as [p13|e] eqn:P13; simpl in T; try discriminate. destruct (HTLgen.transl_program p13) as [p14|e] eqn:P14; simpl in T; try discriminate. - set (p15 := Veriloggen.transl_program p14) in *. + set (p15 := total_if HLSOpts.optim_ram Memorygen.transf_program p14) in *. + set (p16 := Veriloggen.transl_program p15) in *. unfold match_prog; simpl. exists p1; split. apply SimplExprproof.transf_program_match; auto. exists p2; split. apply SimplLocalsproof.match_transf_program; auto. @@ -322,9 +324,10 @@ Proof. exists p12; split. eapply partial_if_match; eauto. apply Deadcodeproof.transf_program_match. exists p13; split. apply Unusedglobproof.transf_program_match; auto. exists p14; split. apply HTLgenproof.transf_program_match; auto. - exists p15; split. apply Veriloggenproof.transf_program_match; auto. - inv T. Admitted. (*reflexivity. -Qed.*) + exists p15; split. apply total_if_match. apply Memorygen.transf_program_match; auto. + exists p16; split. apply Veriloggenproof.transf_program_match; auto. + inv T. reflexivity. +Qed. Theorem cstrategy_semantic_preservation: forall p tp, @@ -340,7 +343,7 @@ Ltac DestructM := destruct H as (p & M & MM); clear H end. repeat DestructM. subst tp. - assert (F: forward_simulation (Cstrategy.semantics p) (Verilog.semantics p15)). + assert (F: forward_simulation (Cstrategy.semantics p) (Verilog.semantics p16)). { eapply compose_forward_simulations. eapply SimplExprproof.transl_program_correct; eassumption. @@ -370,6 +373,8 @@ Ltac DestructM := eapply Unusedglobproof.transf_program_correct; eassumption. eapply compose_forward_simulations. eapply HTLgenproof.transf_program_correct. eassumption. + eapply compose_forward_simulations. + eapply match_if_simulation. eassumption. exact Memorygen.transf_program_correct; eassumption. eapply Veriloggenproof.transf_program_correct; eassumption. } split. auto. |