From 02465d4be1824ae8e504b65ae9c50c6e4c98630d Mon Sep 17 00:00:00 2001 From: Damien Pretet Date: Sat, 25 Nov 2023 21:15:41 +0100 Subject: [PATCH] New: Add MCOUNTEREN checks --- doc/TODO.md | 2 +- doc/project_mgt_hw.md | 12 +- test/apps/tests/coremark/LICENSE.md | 100 +++ test/apps/tests/coremark/Makefile | 140 ++++ test/apps/tests/coremark/README.md | 402 ++++++++++ .../tests/coremark/barebones/core_portme.c | 157 ++++ .../tests/coremark/barebones/core_portme.h | 210 ++++++ .../tests/coremark/barebones/core_portme.mak | 87 +++ test/apps/tests/coremark/barebones/cvt.c | 127 ++++ .../apps/tests/coremark/barebones/ee_printf.c | 700 ++++++++++++++++++ test/apps/tests/coremark/core_list_join.c | 595 +++++++++++++++ test/apps/tests/coremark/core_main.c | 442 +++++++++++ test/apps/tests/coremark/core_matrix.c | 359 +++++++++ test/apps/tests/coremark/core_state.c | 330 +++++++++ test/apps/tests/coremark/core_util.c | 249 +++++++ test/apps/tests/coremark/coremark.h | 183 +++++ test/apps/tests/coremark/coremark.md5 | 6 + .../tests/env/pmp_service.S | 16 + .../priv_sec_testsuite/tests/rv32ui-p-test2.v | 48 +- .../priv_sec_testsuite/tests/rv32ui-p-test3.v | 48 +- .../priv_sec_testsuite/tests/rv32ui-p-test4.v | 48 +- .../priv_sec_testsuite/tests/rv32ui-p-test5.v | 175 +++++ .../priv_sec_testsuite/tests/rv32ui-v-test2.v | 167 ++--- .../priv_sec_testsuite/tests/rv32ui-v-test3.v | 150 ++-- .../priv_sec_testsuite/tests/rv32ui-v-test4.v | 160 ++-- .../priv_sec_testsuite/tests/rv32ui-v-test5.v | 355 +++++++++ test/priv_sec_testsuite/tests/rv32ui/Makefrag | 1 + test/priv_sec_testsuite/tests/rv32ui/test5.S | 8 + .../priv_sec_testsuite/tests/rv64ui-p-test2.v | 46 +- .../priv_sec_testsuite/tests/rv64ui-p-test3.v | 46 +- .../priv_sec_testsuite/tests/rv64ui-p-test4.v | 46 +- .../priv_sec_testsuite/tests/rv64ui-p-test5.v | 165 +++++ .../priv_sec_testsuite/tests/rv64ui-v-test2.v | 163 ++-- .../priv_sec_testsuite/tests/rv64ui-v-test3.v | 146 ++-- .../priv_sec_testsuite/tests/rv64ui-v-test4.v | 156 ++-- .../priv_sec_testsuite/tests/rv64ui-v-test5.v | 343 +++++++++ test/priv_sec_testsuite/tests/rv64ui/Makefrag | 1 + test/priv_sec_testsuite/tests/rv64ui/test4.S | 4 +- test/priv_sec_testsuite/tests/rv64ui/test5.S | 163 ++++ 39 files changed, 5948 insertions(+), 608 deletions(-) create mode 100644 test/apps/tests/coremark/LICENSE.md create mode 100644 test/apps/tests/coremark/Makefile create mode 100644 test/apps/tests/coremark/README.md create mode 100644 test/apps/tests/coremark/barebones/core_portme.c create mode 100644 test/apps/tests/coremark/barebones/core_portme.h create mode 100755 test/apps/tests/coremark/barebones/core_portme.mak create mode 100644 test/apps/tests/coremark/barebones/cvt.c create mode 100644 test/apps/tests/coremark/barebones/ee_printf.c create mode 100644 test/apps/tests/coremark/core_list_join.c create mode 100644 test/apps/tests/coremark/core_main.c create mode 100644 test/apps/tests/coremark/core_matrix.c create mode 100644 test/apps/tests/coremark/core_state.c create mode 100644 test/apps/tests/coremark/core_util.c create mode 100644 test/apps/tests/coremark/coremark.h create mode 100644 test/apps/tests/coremark/coremark.md5 create mode 100755 test/priv_sec_testsuite/tests/rv32ui-p-test5.v create mode 100755 test/priv_sec_testsuite/tests/rv32ui-v-test5.v create mode 100644 test/priv_sec_testsuite/tests/rv32ui/test5.S create mode 100755 test/priv_sec_testsuite/tests/rv64ui-p-test5.v create mode 100755 test/priv_sec_testsuite/tests/rv64ui-v-test5.v create mode 100644 test/priv_sec_testsuite/tests/rv64ui/test5.S diff --git a/doc/TODO.md b/doc/TODO.md index eede234..4c193f5 100644 --- a/doc/TODO.md +++ b/doc/TODO.md @@ -59,7 +59,7 @@ MPU: - [X] execute in M-mode without X + locked region - [X] locked access to change configuration -MCOUNTER: +MCOUNTEREN: - Bit x = 1, lower privilege mode can read the counter - Bit x = 0, lower privilege mode access is forbidden and raise an illegal instruction exception diff --git a/doc/project_mgt_hw.md b/doc/project_mgt_hw.md index e463c50..ae887e0 100644 --- a/doc/project_mgt_hw.md +++ b/doc/project_mgt_hw.md @@ -4,16 +4,20 @@ - [X] Supporter des set de config du core en test bench. - [X] Support U-mode - [X] Support PMP/PMA + - [ ] https://github.com/eembc/coremark + - [ ] Advanced Interrupt controller + - [ ] AXI ERR handling + - [ ] AXI EXOKAY handling - [ ] Atomic operations - stage to execute the instruction, controlling ldst Stages - memfy exposes two interfaces for requests. - memfy drives back response along register write channel - - support exclusive access in cache, don't substitute tag, so support single access + - memfy supports two tags, one for regular, one for exclusive + - support exclusive access in cache + - support in-order for same tag (don't always subsitute) + - exclusive can't be cachable - support exclusive access in memory, track the ID with a LUT - - [ ] Advanced Interrupt controller - - [ ] AXI Exception management - [ ] Zc extension - - [ ] https://github.com/eembc/coremark # BACKLOG diff --git a/test/apps/tests/coremark/LICENSE.md b/test/apps/tests/coremark/LICENSE.md new file mode 100644 index 0000000..14e53e9 --- /dev/null +++ b/test/apps/tests/coremark/LICENSE.md @@ -0,0 +1,100 @@ +# COREMARK® ACCEPTABLE USE AGREEMENT + +This ACCEPTABLE USE AGREEMENT (this “Agreement”) is offered by Embedded Microprocessor Benchmark Consortium, a California nonprofit corporation (“Licensor”), to users of its CoreMark® software (“Licensee”) exclusively on the following terms. + +Licensor offers benchmarking software (“Software”) pursuant to an open source license, but carefully controls use of its benchmarks and their associated goodwill. Licensor has registered its trademark in one of the benchmarks available through the Software, COREMARK, Ser. No. 85/487,290; Reg. No. 4,179,307 (the “Trademark”), and promotes the use of a standard metric as a benchmark for assessing the performance of embedded systems. Solely on the terms described herein, Licensee may use and display the Trademark in connection with the generation of data regarding measurement and analysis of computer and embedded system benchmarking via the Software (the “Licensed Use”). + +## Article 1 – License Grant. +1.1. License. Subject to the terms and conditions of this Agreement, Licensor hereby grants to Licensee, and Licensee hereby accepts from Licensor, a personal, non-exclusive, royalty-free, revocable right and license to use and display the Trademark during the term of this Agreement (the “Term”), solely and exclusively in connection with the Licensed Use. During the Term, Licensee (i) shall not modify or otherwise create derivative works of the Trademark, and (ii) may use the Trademark only to the extent permitted under this License. Neither Licensee nor any affiliate or agent thereof shall otherwise use the Trademark without the prior express written consent of Licensor, which may be withheld in its sole and absolute discretion. All rights not expressly granted to Licensee hereunder shall remain the exclusive property of Licensor. + +1.2. Modifications to the Software. Licensee shall not use the Trademark in connection with any use of a modified, derivative, or otherwise altered copy of the Software. + +1.3. Licensor’s Use. Nothing in this Agreement shall preclude Licensor or any of its successors or assigns from using or permitting other entities to use the Trademark, whether or not such entity directly or indirectly competes or conflicts with Licensee’s Licensed Use in any manner. + +1.4. Term and Termination. This Agreement is perpetual unless terminated by either of the parties. Licensee may terminate this Agreement for convenience, without cause or liability, for any reason or for no reason whatsoever, upon ten (10) business days written notice. Licensor may terminate this Agreement effective immediately upon notice of breach. Upon termination, Licensee shall immediately remove all implementations of the Trademark from the Licensed Use, and delete all digitals files and records of all materials related to the Trademark. + +## Article 2 – Ownership. +2.1. Ownership. Licensee acknowledges and agrees that Licensor is the owner of all right, title, and interest in and to the Trademark, and all such right, title, and interest shall remain with Licensor. Licensee shall not contest, dispute, challenge, oppose, or seek to cancel Licensor’s right, title, and interest in and to the Trademark. Licensee shall not prosecute any application for registration of the Trademark. Licensee shall display appropriate notices regarding ownership of the Trademark in connection with the Licensed Use. + +2.2. Goodwill. Licensee acknowledges that Licensee shall not acquire any right, title, or interest in the Trademark by virtue of this Agreement other than the license granted hereunder, and disclaims any such right, title, interest, or ownership. All goodwill and reputation generated by Licensee’s use of the Trademark shall inure to the exclusive benefit of Licensor. Licensee shall not by any act or omission use the Trademark in any manner that disparages or reflects adversely on Licensor or its Licensed Use or reputation. Licensee shall not take any action that would interfere with or prejudice Licensor’s ownership or registration of the Trademark, the validity of the Trademark or the validity of the license granted by this Agreement. If Licensor determines and notifies Licensee that any act taken in connection with the Licensed Use (i) is inaccurate, unlawful or offensive to good taste; (ii) fails to provide for proper trademark notices, or (iii) otherwise violates Licensee’s obligations under this Agreement, the license granted under this Agreement shall terminate. + +## Article 3 – Indemnification. +3.1. Indemnification Generally. Licensee agrees to indemnify, defend, and hold harmless (collectively “indemnify” or “indemnification”) Licensor, including Licensor’s members, managers, officers, and employees (collectively “Related Persons”), from and against, and pay or reimburse Licensor and such Related Persons for, any and all third-party actions, claims, demands, proceedings, investigations, inquiries (collectively, “Claims”), and any and all liabilities, obligations, fines, deficiencies, costs, expenses, royalties, losses, and damages (including reasonable outside counsel fees and expenses) associated with such Claims, to the extent that such Claim arises out of (i) Licensee’s material breach of this Agreement, or (ii) any allegation(s) that Licensee’s actions infringe or violate any third-party intellectual property right, including without limitation, any U.S. copyright, patent, or trademark, or are otherwise found to be tortious or criminal (whether or not such indemnified person is a named party in a legal proceeding). + +3.2. Notice and Defense of Claims. Licensor shall promptly notify Licensee of any Claim for which indemnification is sought, following actual knowledge of such Claim, provided however that the failure to give such notice shall not relieve Licensee of its obligations hereunder except to the extent that Licensee is materially prejudiced by such failure. In the event that any third-party Claim is brought, Licensee shall have the right and option to undertake and control the defense of such action with counsel of its choice, provided however that (i) Licensor at its own expense may participate and appear on an equal footing with Licensee in the defense of any such Claim, (ii) Licensor may undertake and control such defense in the event of the material failure of Licensee to undertake and control the same; and (iii) the defense of any Claim relating to the intellectual property rights of Licensor or its licensors and any related counterclaims shall be solely controlled by Licensor with counsel of its choice. Licensee shall not consent to judgment or concede or settle or compromise any Claim without the prior written approval of Licensor (whose approval shall not be unreasonably withheld), unless such concession or settlement or compromise includes a full and unconditional release of Licensor and any applicable Related Persons from all liabilities in respect of such Claim. + +## Article 4 – Miscellaneous. +4.1. Relationship of the Parties. This Agreement does not create a partnership, franchise, joint venture, agency, fiduciary, or employment relationship between the parties. + +4.2. No Third-Party Beneficiaries. Except for the rights of Related Persons under Article 3 (Indemnification), there are no third-party beneficiaries to this Agreement. + +4.3. Assignment. Licensee’s rights hereunder are non-assignable, and may not be sublicensed. + +4.4. Equitable Relief. Licensee acknowledges that the remedies available at law for any breach of this Agreement will, by their nature, be inadequate. Accordingly, Licensor may obtain injunctive relief or other equitable relief to restrain a breach or threatened breach of this Agreement or to specifically enforce this Agreement, without proving that any monetary damages have been sustained, and without the requirement of posting of a bond prior to obtaining such equitable relief. + +4.5. Governing Law. This Agreement will be interpreted, construed, and enforced in all respects in accordance with the laws of the State of California, without reference to its conflict of law principles. + +4.6. Attorneys’ Fees. If any legal action, arbitration or other proceeding is brought for the enforcement of this Agreement, or because of an alleged dispute, breach, default, or misrepresentation in connection with any of the provisions of this Agreement, the successful or prevailing party shall be entitled to recover its reasonable attorneys’ fees and other reasonable costs incurred in that action or proceeding, in addition to any other relief to which it may be entitled. + +4.7. Amendment; Waiver. This Agreement may not be amended, nor may any rights under it be waived, except in writing by Licensor. + +4.8. Severability. If any provision of this Agreement is held by a court of competent jurisdiction to be contrary to law, the provision shall be modified by the court and interpreted so as best to accomplish the objectives of the original provision to the fullest extent +permitted by law, and the remaining provisions of this Agreement shall remain in effect. + +4.9. Entire Agreement. This Agreement constitutes the entire agreement between the parties and supersedes all prior and contemporaneous agreements, proposals or representations, written or oral, concerning its subject matter. + + +# Apache License + +Version 2.0, January 2004 + +http://www.apache.org/licenses/ + +## TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + + You must give any other recipients of the Work or Derivative Works a copy of this License; and + You must cause any modified files to carry prominent notices stating that You changed the files; and + You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and + If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + + You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS diff --git a/test/apps/tests/coremark/Makefile b/test/apps/tests/coremark/Makefile new file mode 100644 index 0000000..c2db7cc --- /dev/null +++ b/test/apps/tests/coremark/Makefile @@ -0,0 +1,140 @@ +# Copyright 2018 Embedded Microprocessor Benchmark Consortium (EEMBC) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Original Author: Shay Gal-on + +# Make sure the default target is to simply build and run the benchmark. +RSTAMP = v1.0 + +.PHONY: run score +run: $(OUTFILE) rerun score + +score: + @echo "Check run1.log and run2.log for results." + @echo "See README.md for run and reporting rules." + +ifndef PORT_DIR +# Ports for a couple of common self hosted platforms +UNAME=$(shell if command -v uname 2> /dev/null; then uname ; fi) +ifneq (,$(findstring CYGWIN,$(UNAME))) +PORT_DIR=cygwin +endif +ifneq (,$(findstring Darwin,$(UNAME))) +PORT_DIR=macos +endif +ifneq (,$(findstring FreeBSD,$(UNAME))) +PORT_DIR=freebsd +endif +ifneq (,$(findstring Linux,$(UNAME))) +PORT_DIR=linux +endif +endif +ifndef PORT_DIR +$(error PLEASE define PORT_DIR! (e.g. make PORT_DIR=simple)) +endif +vpath %.c $(PORT_DIR) +vpath %.h $(PORT_DIR) +vpath %.mak $(PORT_DIR) +include $(PORT_DIR)/core_portme.mak + +ifndef ITERATIONS +ITERATIONS=0 +endif +ifdef REBUILD +FORCE_REBUILD=force_rebuild +endif + +CFLAGS += -DITERATIONS=$(ITERATIONS) + +CORE_FILES = core_list_join core_main core_matrix core_state core_util +ORIG_SRCS = $(addsuffix .c,$(CORE_FILES)) +SRCS = $(ORIG_SRCS) $(PORT_SRCS) +OBJS = $(addprefix $(OPATH),$(addsuffix $(OEXT),$(CORE_FILES)) $(PORT_OBJS)) +OUTNAME = coremark$(EXE) +OUTFILE = $(OPATH)$(OUTNAME) +LOUTCMD = $(OFLAG) $(OUTFILE) $(LFLAGS_END) +OUTCMD = $(OUTFLAG) $(OUTFILE) $(LFLAGS_END) + +HEADERS = coremark.h +CHECK_FILES = $(ORIG_SRCS) $(HEADERS) + +$(OPATH): + $(MKDIR) $(OPATH) + +.PHONY: compile link +ifdef SEPARATE_COMPILE +$(OPATH)$(PORT_DIR): + $(MKDIR) $(OPATH)$(PORT_DIR) + +compile: $(OPATH) $(OPATH)$(PORT_DIR) $(OBJS) $(HEADERS) +link: compile + $(LD) $(LFLAGS) $(XLFLAGS) $(OBJS) $(LOUTCMD) + +else + +compile: $(OPATH) $(SRCS) $(HEADERS) + $(CC) $(CFLAGS) $(XCFLAGS) $(SRCS) $(OUTCMD) +link: compile + @echo "Link performed along with compile" + +endif + +$(OUTFILE): $(SRCS) $(HEADERS) Makefile core_portme.mak $(EXTRA_DEPENDS) $(FORCE_REBUILD) + $(MAKE) port_prebuild + $(MAKE) link + $(MAKE) port_postbuild + +.PHONY: rerun +rerun: + $(MAKE) XCFLAGS="$(XCFLAGS) -DPERFORMANCE_RUN=1" load run1.log + $(MAKE) XCFLAGS="$(XCFLAGS) -DVALIDATION_RUN=1" load run2.log + +PARAM1=$(PORT_PARAMS) 0x0 0x0 0x66 $(ITERATIONS) +PARAM2=$(PORT_PARAMS) 0x3415 0x3415 0x66 $(ITERATIONS) +PARAM3=$(PORT_PARAMS) 8 8 8 $(ITERATIONS) + +run1.log-PARAM=$(PARAM1) 7 1 2000 +run2.log-PARAM=$(PARAM2) 7 1 2000 +run3.log-PARAM=$(PARAM3) 7 1 1200 + +run1.log run2.log run3.log: load + $(MAKE) port_prerun + $(RUN) $(OUTFILE) $($(@)-PARAM) > $(OPATH)$@ + $(MAKE) port_postrun + +.PHONY: gen_pgo_data +gen_pgo_data: run3.log + +.PHONY: load +load: $(OUTFILE) + $(MAKE) port_preload + $(LOAD) $(OUTFILE) + $(MAKE) port_postload + +.PHONY: clean +clean: + rm -f $(OUTFILE) $(OBJS) $(OPATH)*.log *.info $(OPATH)index.html $(PORT_CLEAN) + +.PHONY: force_rebuild +force_rebuild: + echo "Forcing Rebuild" + +.PHONY: check +check: + md5sum -c coremark.md5 + +ifdef ETC +# Targets related to testing and releasing CoreMark. Not part of the general release! +include Makefile.internal +endif diff --git a/test/apps/tests/coremark/README.md b/test/apps/tests/coremark/README.md new file mode 100644 index 0000000..c2c2a37 --- /dev/null +++ b/test/apps/tests/coremark/README.md @@ -0,0 +1,402 @@ + +# Introduction + +CoreMark's primary goals are simplicity and providing a method for testing only a processor's core features. For more information about EEMBC's comprehensive embedded benchmark suites, please see www.eembc.org. + +For a more compute-intensive version of CoreMark that uses larger datasets and execution loops taken from common applications, please check out EEMBC's [CoreMark-PRO](https://www.github.com/eembc/coremark-pro) benchmark, also on GitHub. + +# Building and Running + +To build and run the benchmark, type + +`> make` + +Full results are available in the files `run1.log` and `run2.log`. CoreMark result can be found in `run1.log`. + +## Cross Compiling + +For cross compile platforms please adjust `core_portme.mak`, `core_portme.h` (and possibly `core_portme.c`) according to the specific platform used. When porting to a new platform, it is recommended to copy one of the default port folders (e.g. `mkdir && cp linux/* `), adjust the porting files, and run: +~~~ +% make PORT_DIR= +~~~ + +## Make Targets +* `run` - Default target, creates `run1.log` and `run2.log`. +* `run1.log` - Run the benchmark with performance parameters, and output to `run1.log` +* `run2.log` - Run the benchmark with validation parameters, and output to `run2.log` +* `run3.log` - Run the benchmark with profile generation parameters, and output to `run3.log` +* `compile` - compile the benchmark executable +* `link` - link the benchmark executable +* `check` - test MD5 of sources that may not be modified +* `clean` - clean temporary files + +### Make flag: `ITERATIONS` +By default, the benchmark will run between 10-100 seconds. To override, use `ITERATIONS=N` +~~~ +% make ITERATIONS=10 +~~~ +Will run the benchmark for 10 iterations. It is recommended to set a specific number of iterations in certain situations e.g.: + +* Running with a simulator +* Measuring power/energy +* Timing cannot be restarted + +Minimum required run time: **Results are only valid for reporting if the benchmark ran for at least 10 secs!** + +### Make flag: `XCFLAGS` +To add compiler flags from the command line, use `XCFLAGS` e.g.: + +~~~ +% make XCFLAGS="-DMULTITHREAD=4 -DUSE_FORK" +~~~ + +### Make flag: `CORE_DEBUG` + +Define to compile for a debug run if you get incorrect CRC. + +~~~ +% make XCFLAGS="-DCORE_DEBUG=1" +~~~ + +### Make flag: `REBUILD` + +Force a rebuild of the executable. + +## Systems Without `make` +The following files need to be compiled: +* `core_list_join.c` +* `core_main.c` +* `core_matrix.c` +* `core_state.c` +* `core_util.c` +* `PORT_DIR/core_portme.c` + +For example: +~~~ +% gcc -O2 -o coremark.exe core_list_join.c core_main.c core_matrix.c core_state.c core_util.c simple/core_portme.c -DPERFORMANCE_RUN=1 -DITERATIONS=1000 +% ./coremark.exe > run1.log +~~~ +The above will compile the benchmark for a performance run and 1000 iterations. Output is redirected to `run1.log`. + +# Parallel Execution +Use `XCFLAGS=-DMULTITHREAD=N` where N is number of threads to run in parallel. Several implementations are available to execute in multiple contexts, or you can implement your own in `core_portme.c`. + +~~~ +% make XCFLAGS="-DMULTITHREAD=4 -DUSE_PTHREAD -pthread" +~~~ + +The above will compile the benchmark for execution on 4 cores, using POSIX Threads API. Forking is also supported: + +~~~ +% make XCFLAGS="-DMULTITHREAD=4 -DUSE_FORK" +~~~ + +Note: linking may fail on the previous command if your linker does not automatically add the `pthread` library. If you encounter `undefined reference` errors, please modify the `core_portme.mak` file for your platform, (e.g. `linux/core_portme.mak`) and add `-pthread` to the `LFLAGS_END` parameter. + +# Run Parameters for the Benchmark Executable +CoreMark's executable takes several parameters as follows (but only if `main()` accepts arguments): +1st - A seed value used for initialization of data. +2nd - A seed value used for initialization of data. +3rd - A seed value used for initialization of data. +4th - Number of iterations (0 for auto : default value) +5th - Reserved for internal use. +6th - Reserved for internal use. +7th - For malloc users only, ovreride the size of the input data buffer. + +The run target from make will run coremark with 2 different data initialization seeds. + +## Alternative parameters: +If not using `malloc` or command line arguments are not supported, the buffer size +for the algorithms must be defined via the compiler define `TOTAL_DATA_SIZE`. +`TOTAL_DATA_SIZE` must be set to 2000 bytes (default) for standard runs. +The default for such a target when testing different configurations could be: + +~~~ +% make XCFLAGS="-DTOTAL_DATA_SIZE=6000 -DMAIN_HAS_NOARGC=1" +~~~ + +# Submitting Results + +CoreMark results can be submitted on the web. Open a web browser and go to the [submission page](https://www.eembc.org/coremark/submit.php). After registering an account you may enter a score. + +# Run Rules +What is and is not allowed. + +## Required +1. The benchmark needs to run for at least 10 seconds. +2. All validation must succeed for seeds `0,0,0x66` and `0x3415,0x3415,0x66`, buffer size of 2000 bytes total. + * If not using command line arguments to main: +~~~ + % make XCFLAGS="-DPERFORMANCE_RUN=1" REBUILD=1 run1.log + % make XCFLAGS="-DVALIDATION_RUN=1" REBUILD=1 run2.log +~~~ +3. If using profile guided optimization, profile must be generated using seeds of `8,8,8`, and buffer size of 1200 bytes total. +~~~ + % make XCFLAGS="-DTOTAL_DATA_SIZE=1200 -DPROFILE_RUN=1" REBUILD=1 run3.log +~~~ +4. All source files must be compiled with the same flags. +5. All data type sizes must match size in bits such that: + * `ee_u8` is an unsigned 8-bit datatype. + * `ee_s16` is a signed 16-bit datatype. + * `ee_u16` is an unsigned 16-bit datatype. + * `ee_s32` is a signed 32-bit datatype. + * `ee_u32` is an unsigned 32-bit datatype. + +## Allowed + +1. Changing number of iterations +2. Changing toolchain and build/load/run options +3. Changing method of acquiring a data memory block +5. Changing the method of acquiring seed values +6. Changing implementation `in core_portme.c` +7. Changing configuration values in `core_portme.h` +8. Changing `core_portme.mak` + +## NOT ALLOWED +1. Changing of source file other then `core_portme*` (use `make check` to validate) + +# Reporting rules +Use the following syntax to report results on a data sheet: + +CoreMark 1.0 : N / C [/ P] [/ M] + +N - Number of iterations per second with seeds 0,0,0x66,size=2000) + +C - Compiler version and flags + +P - Parameters such as data and code allocation specifics + +* This parameter *may* be omitted if all data was allocated on the heap in RAM. +* This parameter *may not* be omitted when reporting CoreMark/MHz + +M - Type of parallel execution (if used) and number of contexts +* This parameter may be omitted if parallel execution was not used. + +e.g.: + +~~~ +CoreMark 1.0 : 128 / GCC 4.1.2 -O2 -fprofile-use / Heap in TCRAM / FORK:2 +~~~ +or +~~~ +CoreMark 1.0 : 1400 / GCC 3.4 -O4 +~~~ + +If reporting scaling results, the results must be reported as follows: + +CoreMark/MHz 1.0 : N / C / P [/ M] + +P - When reporting scaling results, memory parameter must also indicate memory frequency:core frequency ratio. +1. If the core has cache and cache frequency to core frequency ratio is configurable, that must also be included. + +e.g.: + +~~~ +CoreMark/MHz 1.0 : 1.47 / GCC 4.1.2 -O2 / DDR3(Heap) 30:1 Memory 1:1 Cache +~~~ + +# Log File Format +The log files have the following format + +~~~ +2K performance run parameters for coremark. (Run type) +CoreMark Size : 666 (Buffer size) +Total ticks : 25875 (platform dependent value) +Total time (secs) : 25.875000 (actual time in seconds) +Iterations/Sec : 3864.734300 (Performance value to report) +Iterations : 100000 (number of iterations used) +Compiler version : GCC3.4.4 (Compiler and version) +Compiler flags : -O2 (Compiler and linker flags) +Memory location : Code in flash, data in on chip RAM +seedcrc : 0xe9f5 (identifier for the input seeds) +[0]crclist : 0xe714 (validation for list part) +[0]crcmatrix : 0x1fd7 (validation for matrix part) +[0]crcstate : 0x8e3a (validation for state part) +[0]crcfinal : 0x33ff (iteration dependent output) +Correct operation validated. See README.md for run and reporting rules. (*Only when run is successful*) +CoreMark 1.0 : 6508.490622 / GCC3.4.4 -O2 / Heap (*Only on a successful performance run*) +~~~ + +# Theory of Operation + +This section describes the initial goals of CoreMark and their implementation. + +## Small and easy to understand + +* X number of source code lines for timed portion of the benchmark. +* Meaningful names for variables and functions. +* Comments for each block of code more than 10 lines long. + +## Portability + +A thin abstraction layer will be provided for I/O and timing in a separate file. All I/O and timing of the benchmark will be done through this layer. + +### Code / data size + +* Compile with gcc on x86 and make sure all sizes are according to requirements. +* If dynamic memory allocation is used, take total memory allocated into account as well. +* Avoid recursive functions and keep track of stack usage. +* Use the same memory block as data site for all algorithms, and initialize the data before each algorithm – while this means that initialization with data happens during the timed portion, it will only happen once during the timed portion and so have negligible effect on the results. + +## Controlled output + +This may be the most difficult goal. Compilers are constantly improving and getting better at analyzing code. To create work that cannot be computed at compile time and must be computed at run time, we will rely on two assumptions: + +* Some system functions (e.g. time, scanf) and parameters cannot be computed at compile time. In most cases, marking a variable volatile means the compiler is force to read this variable every time it is read. This will be used to introduce a factor into the input that cannot be precomputed at compile time. Since the results are input dependent, that will make sure that computation has to happen at run time. + +* Either a system function or I/O (e.g. scanf) or command line parameters or volatile variables will be used before the timed portion to generate data which is not available at compile time. Specific method used is not relevant as long as it can be controlled, and that it cannot be computed or eliminated by the compiler at compile time. E.g. if the clock() functions is a compiler stub, it may not be used. The derived values will be reported on the output so that verification can be done on a different machine. + +* We cannot rely on command line parameters since some embedded systems do not have the capability to provide command line parameters. All 3 methods above will be implemented (time based, scanf and command line parameters) and all 3 are valid if the compiler cannot determine the value at compile time. + +* It is important to note that The actual values that are to be supplied at run time will be standardized. The methodology is not intended to provide random data, but simply to provide controlled data that cannot be precomputed at compile time. + +* Printed results must be valid at run time. This will be used to make sure the computation has been executed. + +* Some embedded systems do not provide “printf” or other I/O functionality. All I/O will be done through a thin abstraction interface to allow execution on such systems (e.g. allow output via JTAG). + +## Key Algorithms + +### Linked List + +The following linked list structure will be used: + +~~~ +typedef struct list_data_s { + ee_s16 data16; + ee_s16 idx; +} list_data; + +typedef struct list_head_s { + struct list_head_s *next; + struct list_data_s *info; +} list_head; +~~~ + +While adding a level of indirection accessing the data, this structure is realistic and used in many embedded applications for small to medium lists. + +The list itself will be initialized on a block of memory that will be passed in to the initialization function. While in general linked lists use malloc for new nodes, embedded applications sometime control the memory for small data structures such as arrays and lists directly to avoid the overhead of system calls, so this approach is realistic. + +The linked list will be initialized such that 1/4 of the list pointers point to sequential areas in memory, and 3/4 of the list pointers are distributed in a non sequential manner. This is done to emulate a linked list that had add/remove happen for a while disrupting the neat order, and then a series of adds that are likely to come from sequential memory locations. + +For the benchmark itself: +- Multiple find operations are going to be performed. These find operations may result in the whole list being traversed. The result of each find will become part of the output chain. +- The list will be sorted using merge sort based on the data16 value, and then derive CRC of the data16 item in order for part of the list. The CRC will become part of the output chain. +- The list will be sorted again using merge sort based on the idx value. This sort will guarantee that the list is returned to the primary state before leaving the function, so that multiple iterations of the function will have the same result. CRC of the data16 for part of the list will again be calculated and become part of the output chain. + +The actual `data16` in each cell will be pseudo random based on a single 16b input that cannot be determined at compile time. In addition, the part of the list which is used for CRC will also be passed to the function, and determined based on an input that cannot be determined at run time. + +### Matrix Multiply + +This very simple algorithm forms the basis of many more complex algorithms. The tight inner loop is the focus of many optimizations (compiler as well as hardware based) and is thus relevant for embedded processing. + +The total available data space will be divided to 3 parts: +1. NxN matrix A. +2. NxN matrix B. +3. NxN matrix C. + +E.g. for 2K we will have 3 12x12 matrices (assuming data type of 32b 12(len)*12(wid)*4(size)*3(num) =1728 bytes). + +Matrix A will be initialized with small values (upper 3/4 of the bits all zero). +Matrix B will be initialized with medium values (upper half of the bits all zero). +Matrix C will be used for the result. + +For the benchmark itself: +- Multiple A by a constant into C, add the upper bits of each of the values in the result matrix. The result will become part of the output chain. +- Multiple A by column X of B into C, add the upper bits of each of the values in the result matrix. The result will become part of the output chain. +- Multiple A by B into C, add the upper bits of each of the values in the result matrix. The result will become part of the output chain. + +The actual values for A and B must be derived based on input that is not available at compile time. + +### State Machine + +This part of the code needs to exercise switch and if statements. As such, we will use a small Moore state machine. In particular, this will be a state machine that identifies string input as numbers and divides them according to format. + +The state machine will parse the input string until either a “,” separator or end of input is encountered. An invalid number will cause the state machine to return invalid state and a valid number will cause the state machine to return with type of number format (int/float/scientific). + +This code will perform a realistic task, be small enough to easily understand, and exercise the required functionality. The other option used in embedded systems is a mealy based state machine, which is driven by a table. The table then determines the number of states and complexity of transitions. This approach, however, tests mainly the load/store and function call mechanisms and less the handling of branches. If analysis of the final results shows that the load/store functionality of the processor is not exercised thoroughly, it may be a good addition to the benchmark (codesize allowing). + +For input, the memory block will be initialized with comma separated values of mixed formats, as well as invalid inputs. + +For the benchmark itself: +- Invoke the state machine on all of the input and count final states and state transitions. CRC of all final states and transitions will become part of the output chain. +- Modify the input at intervals (inject errors) and repeat the state machine operation. +- Modify the input back to original form. + +The actual input must be initialized based on data that cannot be determined at compile time. In addition the intervals for modification of the input and the actual modification must be based on input that cannot be determined at compile time. + +# Validation + +This release was tested on the following platforms: +* x86 cygwin and gcc 3.4 (Quad, dual and single core systems) +* x86 linux (Ubuntu/Fedora) and gcc (4.2/4.1) (Quad and single core systems) +* MIPS64 BE linux and gcc 3.4 16 cores system +* MIPS32 BE linux with CodeSourcery compiler 4.2-177 on Malta/Linux with a 1004K 3-core system +* PPC simulator with gcc 4.2.2 (No OS) +* PPC 64b BE linux (yellowdog) with gcc 3.4 and 4.1 (Dual core system) +* BF533 with VDSP50 +* Renesas R8C/H8 MCU with HEW 4.05 +* NXP LPC1700 armcc v4.0.0.524 +* NEC 78K with IAR v4.61 +* ARM simulator with armcc v4 + +# Memory Analysis + +Valgrind 3.4.0 used and no errors reported. + +# Balance Analysis + +Number of instructions executed for each function tested with cachegrind and found balanced with gcc and -O0. + +# Statistics + +Lines: +~~~ +Lines Blank Cmnts Source AESL +===== ===== ===== ===== ========== ======================================= + 469 66 170 251 627.5 core_list_join.c (C) + 330 18 54 268 670.0 core_main.c (C) + 256 32 80 146 365.0 core_matrix.c (C) + 240 16 51 186 465.0 core_state.c (C) + 165 11 20 134 335.0 core_util.c (C) + 150 23 36 98 245.0 coremark.h (C) + 1610 166 411 1083 2707.5 ----- Benchmark ----- (6 files) + 293 15 74 212 530.0 linux/core_portme.c (C) + 235 30 104 104 260.0 linux/core_portme.h (C) + 528 45 178 316 790.0 ----- Porting ----- (2 files) + +* For comparison, here are the stats for Dhrystone +Lines Blank Cmnts Source AESL +===== ===== ===== ===== ========== ======================================= + 311 15 242 54 135.0 dhry.h (C) + 789 132 119 553 1382.5 dhry_1.c (C) + 186 26 68 107 267.5 dhry_2.c (C) + 1286 173 429 714 1785.0 ----- C ----- (3 files) +~~~ + +# Credits +Many thanks to all of the individuals who helped with the development or testing of CoreMark including (Sorted by company name; note that company names may no longer be accurate as this was written in 2009). +* Alan Anderson, ADI +* Adhikary Rajiv, ADI +* Elena Stohr, ARM +* Ian Rickards, ARM +* Andrew Pickard, ARM +* Trent Parker, CAVIUM +* Shay Gal-On, EEMBC +* Markus Levy, EEMBC +* Peter Torelli, EEMBC +* Ron Olson, IBM +* Eyal Barzilay, MIPS +* Jens Eltze, NEC +* Hirohiko Ono, NEC +* Ulrich Drees, NEC +* Frank Roscheda, NEC +* Rob Cosaro, NXP +* Shumpei Kawasaki, RENESAS + +# Legal +Please refer to LICENSE.md in this repository for a description of your rights to use this code. + +# Copyright +Copyright © 2009 EEMBC All rights reserved. +CoreMark is a trademark of EEMBC and EEMBC is a registered trademark of the Embedded Microprocessor Benchmark Consortium. + diff --git a/test/apps/tests/coremark/barebones/core_portme.c b/test/apps/tests/coremark/barebones/core_portme.c new file mode 100644 index 0000000..30112ff --- /dev/null +++ b/test/apps/tests/coremark/barebones/core_portme.c @@ -0,0 +1,157 @@ +/* +Copyright 2018 Embedded Microprocessor Benchmark Consortium (EEMBC) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Original Author: Shay Gal-on +*/ +#include "coremark.h" +#include "core_portme.h" + +#if VALIDATION_RUN +volatile ee_s32 seed1_volatile = 0x3415; +volatile ee_s32 seed2_volatile = 0x3415; +volatile ee_s32 seed3_volatile = 0x66; +#endif +#if PERFORMANCE_RUN +volatile ee_s32 seed1_volatile = 0x0; +volatile ee_s32 seed2_volatile = 0x0; +volatile ee_s32 seed3_volatile = 0x66; +#endif +#if PROFILE_RUN +volatile ee_s32 seed1_volatile = 0x8; +volatile ee_s32 seed2_volatile = 0x8; +volatile ee_s32 seed3_volatile = 0x8; +#endif +volatile ee_s32 seed4_volatile = ITERATIONS; +volatile ee_s32 seed5_volatile = 0; +/* Porting : Timing functions + How to capture time and convert to seconds must be ported to whatever is + supported by the platform. e.g. Read value from on board RTC, read value from + cpu clock cycles performance counter etc. Sample implementation for standard + time.h and windows.h definitions included. +*/ +CORETIMETYPE +barebones_clock() +{ +#error \ + "You must implement a method to measure time in barebones_clock()! This function should return current time.\n" +} +/* Define : TIMER_RES_DIVIDER + Divider to trade off timer resolution and total time that can be + measured. + + Use lower values to increase resolution, but make sure that overflow + does not occur. If there are issues with the return value overflowing, + increase this value. + */ +#define GETMYTIME(_t) (*_t = barebones_clock()) +#define MYTIMEDIFF(fin, ini) ((fin) - (ini)) +#define TIMER_RES_DIVIDER 1 +#define SAMPLE_TIME_IMPLEMENTATION 1 +#define EE_TICKS_PER_SEC (CLOCKS_PER_SEC / TIMER_RES_DIVIDER) + +/** Define Host specific (POSIX), or target specific global time variables. */ +static CORETIMETYPE start_time_val, stop_time_val; + +/* Function : start_time + This function will be called right before starting the timed portion of + the benchmark. + + Implementation may be capturing a system timer (as implemented in the + example code) or zeroing some system parameters - e.g. setting the cpu clocks + cycles to 0. +*/ +void +start_time(void) +{ + GETMYTIME(&start_time_val); +} +/* Function : stop_time + This function will be called right after ending the timed portion of the + benchmark. + + Implementation may be capturing a system timer (as implemented in the + example code) or other system parameters - e.g. reading the current value of + cpu cycles counter. +*/ +void +stop_time(void) +{ + GETMYTIME(&stop_time_val); +} +/* Function : get_time + Return an abstract "ticks" number that signifies time on the system. + + Actual value returned may be cpu cycles, milliseconds or any other + value, as long as it can be converted to seconds by . This + methodology is taken to accommodate any hardware or simulated platform. The + sample implementation returns millisecs by default, and the resolution is + controlled by +*/ +CORE_TICKS +get_time(void) +{ + CORE_TICKS elapsed + = (CORE_TICKS)(MYTIMEDIFF(stop_time_val, start_time_val)); + return elapsed; +} +/* Function : time_in_secs + Convert the value returned by get_time to seconds. + + The type is used to accommodate systems with no support for + floating point. Default implementation implemented by the EE_TICKS_PER_SEC + macro above. +*/ +secs_ret +time_in_secs(CORE_TICKS ticks) +{ + secs_ret retval = ((secs_ret)ticks) / (secs_ret)EE_TICKS_PER_SEC; + return retval; +} + +ee_u32 default_num_contexts = 1; + +/* Function : portable_init + Target specific initialization code + Test for some common mistakes. +*/ +void +portable_init(core_portable *p, int *argc, char *argv[]) +{ +#error \ + "Call board initialization routines in portable init (if needed), in particular initialize UART!\n" + + (void)argc; // prevent unused warning + (void)argv; // prevent unused warning + + if (sizeof(ee_ptr_int) != sizeof(ee_u8 *)) + { + ee_printf( + "ERROR! Please define ee_ptr_int to a type that holds a " + "pointer!\n"); + } + if (sizeof(ee_u32) != 4) + { + ee_printf("ERROR! Please define ee_u32 to a 32b unsigned type!\n"); + } + p->portable_id = 1; +} +/* Function : portable_fini + Target specific final code +*/ +void +portable_fini(core_portable *p) +{ + p->portable_id = 0; +} diff --git a/test/apps/tests/coremark/barebones/core_portme.h b/test/apps/tests/coremark/barebones/core_portme.h new file mode 100644 index 0000000..b221363 --- /dev/null +++ b/test/apps/tests/coremark/barebones/core_portme.h @@ -0,0 +1,210 @@ +/* +Copyright 2018 Embedded Microprocessor Benchmark Consortium (EEMBC) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Original Author: Shay Gal-on +*/ +/* Topic : Description + This file contains configuration constants required to execute on + different platforms +*/ +#ifndef CORE_PORTME_H +#define CORE_PORTME_H +/************************/ +/* Data types and settings */ +/************************/ +/* Configuration : HAS_FLOAT + Define to 1 if the platform supports floating point. +*/ +#ifndef HAS_FLOAT +#define HAS_FLOAT 1 +#endif +/* Configuration : HAS_TIME_H + Define to 1 if platform has the time.h header file, + and implementation of functions thereof. +*/ +#ifndef HAS_TIME_H +#define HAS_TIME_H 1 +#endif +/* Configuration : USE_CLOCK + Define to 1 if platform has the time.h header file, + and implementation of functions thereof. +*/ +#ifndef USE_CLOCK +#define USE_CLOCK 1 +#endif +/* Configuration : HAS_STDIO + Define to 1 if the platform has stdio.h. +*/ +#ifndef HAS_STDIO +#define HAS_STDIO 0 +#endif +/* Configuration : HAS_PRINTF + Define to 1 if the platform has stdio.h and implements the printf + function. +*/ +#ifndef HAS_PRINTF +#define HAS_PRINTF 0 +#endif + +/* Definitions : COMPILER_VERSION, COMPILER_FLAGS, MEM_LOCATION + Initialize these strings per platform +*/ +#ifndef COMPILER_VERSION +#ifdef __GNUC__ +#define COMPILER_VERSION "GCC"__VERSION__ +#else +#define COMPILER_VERSION "Please put compiler version here (e.g. gcc 4.1)" +#endif +#endif +#ifndef COMPILER_FLAGS +#define COMPILER_FLAGS \ + FLAGS_STR /* "Please put compiler flags here (e.g. -o3)" */ +#endif +#ifndef MEM_LOCATION +#define MEM_LOCATION "STACK" +#endif + +/* Data Types : + To avoid compiler issues, define the data types that need ot be used for + 8b, 16b and 32b in . + + *Imprtant* : + ee_ptr_int needs to be the data type used to hold pointers, otherwise + coremark may fail!!! +*/ +typedef signed short ee_s16; +typedef unsigned short ee_u16; +typedef signed int ee_s32; +typedef double ee_f32; +typedef unsigned char ee_u8; +typedef unsigned int ee_u32; +typedef ee_u32 ee_ptr_int; +typedef size_t ee_size_t; +#define NULL ((void *)0) +/* align_mem : + This macro is used to align an offset to point to a 32b value. It is + used in the Matrix algorithm to initialize the input memory blocks. +*/ +#define align_mem(x) (void *)(4 + (((ee_ptr_int)(x)-1) & ~3)) + +/* Configuration : CORE_TICKS + Define type of return from the timing functions. + */ +#define CORETIMETYPE ee_u32 +typedef ee_u32 CORE_TICKS; + +/* Configuration : SEED_METHOD + Defines method to get seed values that cannot be computed at compile + time. + + Valid values : + SEED_ARG - from command line. + SEED_FUNC - from a system function. + SEED_VOLATILE - from volatile variables. +*/ +#ifndef SEED_METHOD +#define SEED_METHOD SEED_VOLATILE +#endif + +/* Configuration : MEM_METHOD + Defines method to get a block of memry. + + Valid values : + MEM_MALLOC - for platforms that implement malloc and have malloc.h. + MEM_STATIC - to use a static memory array. + MEM_STACK - to allocate the data block on the stack (NYI). +*/ +#ifndef MEM_METHOD +#define MEM_METHOD MEM_STACK +#endif + +/* Configuration : MULTITHREAD + Define for parallel execution + + Valid values : + 1 - only one context (default). + N>1 - will execute N copies in parallel. + + Note : + If this flag is defined to more then 1, an implementation for launching + parallel contexts must be defined. + + Two sample implementations are provided. Use or + to enable them. + + It is valid to have a different implementation of + and in , to fit a particular architecture. +*/ +#ifndef MULTITHREAD +#define MULTITHREAD 1 +#define USE_PTHREAD 0 +#define USE_FORK 0 +#define USE_SOCKET 0 +#endif + +/* Configuration : MAIN_HAS_NOARGC + Needed if platform does not support getting arguments to main. + + Valid values : + 0 - argc/argv to main is supported + 1 - argc/argv to main is not supported + + Note : + This flag only matters if MULTITHREAD has been defined to a value + greater then 1. +*/ +#ifndef MAIN_HAS_NOARGC +#define MAIN_HAS_NOARGC 0 +#endif + +/* Configuration : MAIN_HAS_NORETURN + Needed if platform does not support returning a value from main. + + Valid values : + 0 - main returns an int, and return value will be 0. + 1 - platform does not support returning a value from main +*/ +#ifndef MAIN_HAS_NORETURN +#define MAIN_HAS_NORETURN 0 +#endif + +/* Variable : default_num_contexts + Not used for this simple port, must contain the value 1. +*/ +extern ee_u32 default_num_contexts; + +typedef struct CORE_PORTABLE_S +{ + ee_u8 portable_id; +} core_portable; + +/* target specific init/fini */ +void portable_init(core_portable *p, int *argc, char *argv[]); +void portable_fini(core_portable *p); + +#if !defined(PROFILE_RUN) && !defined(PERFORMANCE_RUN) \ + && !defined(VALIDATION_RUN) +#if (TOTAL_DATA_SIZE == 1200) +#define PROFILE_RUN 1 +#elif (TOTAL_DATA_SIZE == 2000) +#define PERFORMANCE_RUN 1 +#else +#define VALIDATION_RUN 1 +#endif +#endif + +int ee_printf(const char *fmt, ...); + +#endif /* CORE_PORTME_H */ diff --git a/test/apps/tests/coremark/barebones/core_portme.mak b/test/apps/tests/coremark/barebones/core_portme.mak new file mode 100755 index 0000000..8159469 --- /dev/null +++ b/test/apps/tests/coremark/barebones/core_portme.mak @@ -0,0 +1,87 @@ +# Copyright 2018 Embedded Microprocessor Benchmark Consortium (EEMBC) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Original Author: Shay Gal-on + +#File : core_portme.mak + +# Flag : OUTFLAG +# Use this flag to define how to to get an executable (e.g -o) +OUTFLAG= -o +# Flag : CC +# Use this flag to define compiler to use +CC = gcc +# Flag : LD +# Use this flag to define compiler to use +LD = gld +# Flag : AS +# Use this flag to define compiler to use +AS = gas +# Flag : CFLAGS +# Use this flag to define compiler options. Note, you can add compiler options from the command line using XCFLAGS="other flags" +PORT_CFLAGS = -O0 -g +FLAGS_STR = "$(PORT_CFLAGS) $(XCFLAGS) $(XLFLAGS) $(LFLAGS_END)" +CFLAGS = $(PORT_CFLAGS) -I$(PORT_DIR) -I. -DFLAGS_STR=\"$(FLAGS_STR)\" +#Flag : LFLAGS_END +# Define any libraries needed for linking or other flags that should come at the end of the link line (e.g. linker scripts). +# Note : On certain platforms, the default clock_gettime implementation is supported but requires linking of librt. +SEPARATE_COMPILE=1 +# Flag : SEPARATE_COMPILE +# You must also define below how to create an object file, and how to link. +OBJOUT = -o +LFLAGS = +ASFLAGS = +OFLAG = -o +COUT = -c + +LFLAGS_END = +# Flag : PORT_SRCS +# Port specific source files can be added here +# You may also need cvt.c if the fcvt functions are not provided as intrinsics by your compiler! +PORT_SRCS = $(PORT_DIR)/core_portme.c $(PORT_DIR)/ee_printf.c +vpath %.c $(PORT_DIR) +vpath %.s $(PORT_DIR) + +# Flag : LOAD +# For a simple port, we assume self hosted compile and run, no load needed. + +# Flag : RUN +# For a simple port, we assume self hosted compile and run, simple invocation of the executable + +LOAD = echo "Please set LOAD to the process of loading the executable to the flash" +RUN = echo "Please set LOAD to the process of running the executable (e.g. via jtag, or board reset)" + +OEXT = .o +EXE = .bin + +$(OPATH)$(PORT_DIR)/%$(OEXT) : %.c + $(CC) $(CFLAGS) $(XCFLAGS) $(COUT) $< $(OBJOUT) $@ + +$(OPATH)%$(OEXT) : %.c + $(CC) $(CFLAGS) $(XCFLAGS) $(COUT) $< $(OBJOUT) $@ + +$(OPATH)$(PORT_DIR)/%$(OEXT) : %.s + $(AS) $(ASFLAGS) $< $(OBJOUT) $@ + +# Target : port_pre% and port_post% +# For the purpose of this simple port, no pre or post steps needed. + +.PHONY : port_prebuild port_postbuild port_prerun port_postrun port_preload port_postload +port_pre% port_post% : + +# FLAG : OPATH +# Path to the output folder. Default - current folder. +OPATH = ./ +MKDIR = mkdir -p + diff --git a/test/apps/tests/coremark/barebones/cvt.c b/test/apps/tests/coremark/barebones/cvt.c new file mode 100644 index 0000000..333e8ea --- /dev/null +++ b/test/apps/tests/coremark/barebones/cvt.c @@ -0,0 +1,127 @@ +/* +Copyright 2018 Embedded Microprocessor Benchmark Consortium (EEMBC) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ +#include +#define CVTBUFSIZE 80 +static char CVTBUF[CVTBUFSIZE]; + +static char * +cvt(double arg, int ndigits, int *decpt, int *sign, char *buf, int eflag) +{ + int r2; + double fi, fj; + char * p, *p1; + + if (ndigits < 0) + ndigits = 0; + if (ndigits >= CVTBUFSIZE - 1) + ndigits = CVTBUFSIZE - 2; + r2 = 0; + *sign = 0; + p = &buf[0]; + if (arg < 0) + { + *sign = 1; + arg = -arg; + } + arg = modf(arg, &fi); + p1 = &buf[CVTBUFSIZE]; + + if (fi != 0) + { + p1 = &buf[CVTBUFSIZE]; + while (fi != 0) + { + fj = modf(fi / 10, &fi); + *--p1 = (int)((fj + .03) * 10) + '0'; + r2++; + } + while (p1 < &buf[CVTBUFSIZE]) + *p++ = *p1++; + } + else if (arg > 0) + { + while ((fj = arg * 10) < 1) + { + arg = fj; + r2--; + } + } + p1 = &buf[ndigits]; + if (eflag == 0) + p1 += r2; + *decpt = r2; + if (p1 < &buf[0]) + { + buf[0] = '\0'; + return buf; + } + while (p <= p1 && p < &buf[CVTBUFSIZE]) + { + arg *= 10; + arg = modf(arg, &fj); + *p++ = (int)fj + '0'; + } + if (p1 >= &buf[CVTBUFSIZE]) + { + buf[CVTBUFSIZE - 1] = '\0'; + return buf; + } + p = p1; + *p1 += 5; + while (*p1 > '9') + { + *p1 = '0'; + if (p1 > buf) + ++*--p1; + else + { + *p1 = '1'; + (*decpt)++; + if (eflag == 0) + { + if (p > buf) + *p = '0'; + p++; + } + } + } + *p = '\0'; + return buf; +} + +char * +ecvt(double arg, int ndigits, int *decpt, int *sign) +{ + return cvt(arg, ndigits, decpt, sign, CVTBUF, 1); +} + +char * +ecvtbuf(double arg, int ndigits, int *decpt, int *sign, char *buf) +{ + return cvt(arg, ndigits, decpt, sign, buf, 1); +} + +char * +fcvt(double arg, int ndigits, int *decpt, int *sign) +{ + return cvt(arg, ndigits, decpt, sign, CVTBUF, 0); +} + +char * +fcvtbuf(double arg, int ndigits, int *decpt, int *sign, char *buf) +{ + return cvt(arg, ndigits, decpt, sign, buf, 0); +} diff --git a/test/apps/tests/coremark/barebones/ee_printf.c b/test/apps/tests/coremark/barebones/ee_printf.c new file mode 100644 index 0000000..f2d362d --- /dev/null +++ b/test/apps/tests/coremark/barebones/ee_printf.c @@ -0,0 +1,700 @@ +/* +Copyright 2018 Embedded Microprocessor Benchmark Consortium (EEMBC) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +#include +#include + +#define ZEROPAD (1 << 0) /* Pad with zero */ +#define SIGN (1 << 1) /* Unsigned/signed long */ +#define PLUS (1 << 2) /* Show plus */ +#define SPACE (1 << 3) /* Spacer */ +#define LEFT (1 << 4) /* Left justified */ +#define HEX_PREP (1 << 5) /* 0x */ +#define UPPERCASE (1 << 6) /* 'ABCDEF' */ + +#define is_digit(c) ((c) >= '0' && (c) <= '9') + +static char * digits = "0123456789abcdefghijklmnopqrstuvwxyz"; +static char * upper_digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; +static ee_size_t strnlen(const char *s, ee_size_t count); + +static ee_size_t +strnlen(const char *s, ee_size_t count) +{ + const char *sc; + for (sc = s; *sc != '\0' && count--; ++sc) + ; + return sc - s; +} + +static int +skip_atoi(const char **s) +{ + int i = 0; + while (is_digit(**s)) + i = i * 10 + *((*s)++) - '0'; + return i; +} + +static char * +number(char *str, long num, int base, int size, int precision, int type) +{ + char c, sign, tmp[66]; + char *dig = digits; + int i; + + if (type & UPPERCASE) + dig = upper_digits; + if (type & LEFT) + type &= ~ZEROPAD; + if (base < 2 || base > 36) + return 0; + + c = (type & ZEROPAD) ? '0' : ' '; + sign = 0; + if (type & SIGN) + { + if (num < 0) + { + sign = '-'; + num = -num; + size--; + } + else if (type & PLUS) + { + sign = '+'; + size--; + } + else if (type & SPACE) + { + sign = ' '; + size--; + } + } + + if (type & HEX_PREP) + { + if (base == 16) + size -= 2; + else if (base == 8) + size--; + } + + i = 0; + + if (num == 0) + tmp[i++] = '0'; + else + { + while (num != 0) + { + tmp[i++] = dig[((unsigned long)num) % (unsigned)base]; + num = ((unsigned long)num) / (unsigned)base; + } + } + + if (i > precision) + precision = i; + size -= precision; + if (!(type & (ZEROPAD | LEFT))) + while (size-- > 0) + *str++ = ' '; + if (sign) + *str++ = sign; + + if (type & HEX_PREP) + { + if (base == 8) + *str++ = '0'; + else if (base == 16) + { + *str++ = '0'; + *str++ = digits[33]; + } + } + + if (!(type & LEFT)) + while (size-- > 0) + *str++ = c; + while (i < precision--) + *str++ = '0'; + while (i-- > 0) + *str++ = tmp[i]; + while (size-- > 0) + *str++ = ' '; + + return str; +} + +static char * +eaddr(char *str, unsigned char *addr, int size, int precision, int type) +{ + char tmp[24]; + char *dig = digits; + int i, len; + + if (type & UPPERCASE) + dig = upper_digits; + len = 0; + for (i = 0; i < 6; i++) + { + if (i != 0) + tmp[len++] = ':'; + tmp[len++] = dig[addr[i] >> 4]; + tmp[len++] = dig[addr[i] & 0x0F]; + } + + if (!(type & LEFT)) + while (len < size--) + *str++ = ' '; + for (i = 0; i < len; ++i) + *str++ = tmp[i]; + while (len < size--) + *str++ = ' '; + + return str; +} + +static char * +iaddr(char *str, unsigned char *addr, int size, int precision, int type) +{ + char tmp[24]; + int i, n, len; + + len = 0; + for (i = 0; i < 4; i++) + { + if (i != 0) + tmp[len++] = '.'; + n = addr[i]; + + if (n == 0) + tmp[len++] = digits[0]; + else + { + if (n >= 100) + { + tmp[len++] = digits[n / 100]; + n = n % 100; + tmp[len++] = digits[n / 10]; + n = n % 10; + } + else if (n >= 10) + { + tmp[len++] = digits[n / 10]; + n = n % 10; + } + + tmp[len++] = digits[n]; + } + } + + if (!(type & LEFT)) + while (len < size--) + *str++ = ' '; + for (i = 0; i < len; ++i) + *str++ = tmp[i]; + while (len < size--) + *str++ = ' '; + + return str; +} + +#if HAS_FLOAT + +char * ecvtbuf(double arg, int ndigits, int *decpt, int *sign, char *buf); +char * fcvtbuf(double arg, int ndigits, int *decpt, int *sign, char *buf); +static void ee_bufcpy(char *d, char *s, int count); + +void +ee_bufcpy(char *pd, char *ps, int count) +{ + char *pe = ps + count; + while (ps != pe) + *pd++ = *ps++; +} + +static void +parse_float(double value, char *buffer, char fmt, int precision) +{ + int decpt, sign, exp, pos; + char *digits = NULL; + char cvtbuf[80]; + int capexp = 0; + int magnitude; + + if (fmt == 'G' || fmt == 'E') + { + capexp = 1; + fmt += 'a' - 'A'; + } + + if (fmt == 'g') + { + digits = ecvtbuf(value, precision, &decpt, &sign, cvtbuf); + magnitude = decpt - 1; + if (magnitude < -4 || magnitude > precision - 1) + { + fmt = 'e'; + precision -= 1; + } + else + { + fmt = 'f'; + precision -= decpt; + } + } + + if (fmt == 'e') + { + digits = ecvtbuf(value, precision + 1, &decpt, &sign, cvtbuf); + + if (sign) + *buffer++ = '-'; + *buffer++ = *digits; + if (precision > 0) + *buffer++ = '.'; + ee_bufcpy(buffer, digits + 1, precision); + buffer += precision; + *buffer++ = capexp ? 'E' : 'e'; + + if (decpt == 0) + { + if (value == 0.0) + exp = 0; + else + exp = -1; + } + else + exp = decpt - 1; + + if (exp < 0) + { + *buffer++ = '-'; + exp = -exp; + } + else + *buffer++ = '+'; + + buffer[2] = (exp % 10) + '0'; + exp = exp / 10; + buffer[1] = (exp % 10) + '0'; + exp = exp / 10; + buffer[0] = (exp % 10) + '0'; + buffer += 3; + } + else if (fmt == 'f') + { + digits = fcvtbuf(value, precision, &decpt, &sign, cvtbuf); + if (sign) + *buffer++ = '-'; + if (*digits) + { + if (decpt <= 0) + { + *buffer++ = '0'; + *buffer++ = '.'; + for (pos = 0; pos < -decpt; pos++) + *buffer++ = '0'; + while (*digits) + *buffer++ = *digits++; + } + else + { + pos = 0; + while (*digits) + { + if (pos++ == decpt) + *buffer++ = '.'; + *buffer++ = *digits++; + } + } + } + else + { + *buffer++ = '0'; + if (precision > 0) + { + *buffer++ = '.'; + for (pos = 0; pos < precision; pos++) + *buffer++ = '0'; + } + } + } + + *buffer = '\0'; +} + +static void +decimal_point(char *buffer) +{ + while (*buffer) + { + if (*buffer == '.') + return; + if (*buffer == 'e' || *buffer == 'E') + break; + buffer++; + } + + if (*buffer) + { + int n = strnlen(buffer, 256); + while (n > 0) + { + buffer[n + 1] = buffer[n]; + n--; + } + + *buffer = '.'; + } + else + { + *buffer++ = '.'; + *buffer = '\0'; + } +} + +static void +cropzeros(char *buffer) +{ + char *stop; + + while (*buffer && *buffer != '.') + buffer++; + if (*buffer++) + { + while (*buffer && *buffer != 'e' && *buffer != 'E') + buffer++; + stop = buffer--; + while (*buffer == '0') + buffer--; + if (*buffer == '.') + buffer--; + while (buffer != stop) + *++buffer = 0; + } +} + +static char * +flt(char *str, double num, int size, int precision, char fmt, int flags) +{ + char tmp[80]; + char c, sign; + int n, i; + + // Left align means no zero padding + if (flags & LEFT) + flags &= ~ZEROPAD; + + // Determine padding and sign char + c = (flags & ZEROPAD) ? '0' : ' '; + sign = 0; + if (flags & SIGN) + { + if (num < 0.0) + { + sign = '-'; + num = -num; + size--; + } + else if (flags & PLUS) + { + sign = '+'; + size--; + } + else if (flags & SPACE) + { + sign = ' '; + size--; + } + } + + // Compute the precision value + if (precision < 0) + precision = 6; // Default precision: 6 + + // Convert floating point number to text + parse_float(num, tmp, fmt, precision); + + if ((flags & HEX_PREP) && precision == 0) + decimal_point(tmp); + if (fmt == 'g' && !(flags & HEX_PREP)) + cropzeros(tmp); + + n = strnlen(tmp, 256); + + // Output number with alignment and padding + size -= n; + if (!(flags & (ZEROPAD | LEFT))) + while (size-- > 0) + *str++ = ' '; + if (sign) + *str++ = sign; + if (!(flags & LEFT)) + while (size-- > 0) + *str++ = c; + for (i = 0; i < n; i++) + *str++ = tmp[i]; + while (size-- > 0) + *str++ = ' '; + + return str; +} + +#endif + +static int +ee_vsprintf(char *buf, const char *fmt, va_list args) +{ + int len; + unsigned long num; + int i, base; + char * str; + char * s; + + int flags; // Flags to number() + + int field_width; // Width of output field + int precision; // Min. # of digits for integers; max number of chars for + // from string + int qualifier; // 'h', 'l', or 'L' for integer fields + + for (str = buf; *fmt; fmt++) + { + if (*fmt != '%') + { + *str++ = *fmt; + continue; + } + + // Process flags + flags = 0; + repeat: + fmt++; // This also skips first '%' + switch (*fmt) + { + case '-': + flags |= LEFT; + goto repeat; + case '+': + flags |= PLUS; + goto repeat; + case ' ': + flags |= SPACE; + goto repeat; + case '#': + flags |= HEX_PREP; + goto repeat; + case '0': + flags |= ZEROPAD; + goto repeat; + } + + // Get field width + field_width = -1; + if (is_digit(*fmt)) + field_width = skip_atoi(&fmt); + else if (*fmt == '*') + { + fmt++; + field_width = va_arg(args, int); + if (field_width < 0) + { + field_width = -field_width; + flags |= LEFT; + } + } + + // Get the precision + precision = -1; + if (*fmt == '.') + { + ++fmt; + if (is_digit(*fmt)) + precision = skip_atoi(&fmt); + else if (*fmt == '*') + { + ++fmt; + precision = va_arg(args, int); + } + if (precision < 0) + precision = 0; + } + + // Get the conversion qualifier + qualifier = -1; + if (*fmt == 'l' || *fmt == 'L') + { + qualifier = *fmt; + fmt++; + } + + // Default base + base = 10; + + switch (*fmt) + { + case 'c': + if (!(flags & LEFT)) + while (--field_width > 0) + *str++ = ' '; + *str++ = (unsigned char)va_arg(args, int); + while (--field_width > 0) + *str++ = ' '; + continue; + + case 's': + s = va_arg(args, char *); + if (!s) + s = ""; + len = strnlen(s, precision); + if (!(flags & LEFT)) + while (len < field_width--) + *str++ = ' '; + for (i = 0; i < len; ++i) + *str++ = *s++; + while (len < field_width--) + *str++ = ' '; + continue; + + case 'p': + if (field_width == -1) + { + field_width = 2 * sizeof(void *); + flags |= ZEROPAD; + } + str = number(str, + (unsigned long)va_arg(args, void *), + 16, + field_width, + precision, + flags); + continue; + + case 'A': + flags |= UPPERCASE; + + case 'a': + if (qualifier == 'l') + str = eaddr(str, + va_arg(args, unsigned char *), + field_width, + precision, + flags); + else + str = iaddr(str, + va_arg(args, unsigned char *), + field_width, + precision, + flags); + continue; + + // Integer number formats - set up the flags and "break" + case 'o': + base = 8; + break; + + case 'X': + flags |= UPPERCASE; + + case 'x': + base = 16; + break; + + case 'd': + case 'i': + flags |= SIGN; + + case 'u': + break; + +#if HAS_FLOAT + + case 'f': + str = flt(str, + va_arg(args, double), + field_width, + precision, + *fmt, + flags | SIGN); + continue; + +#endif + + default: + if (*fmt != '%') + *str++ = '%'; + if (*fmt) + *str++ = *fmt; + else + --fmt; + continue; + } + + if (qualifier == 'l') + num = va_arg(args, unsigned long); + else if (flags & SIGN) + num = va_arg(args, int); + else + num = va_arg(args, unsigned int); + + str = number(str, num, base, field_width, precision, flags); + } + + *str = '\0'; + return str - buf; +} + +void +uart_send_char(char c) +{ +#error "You must implement the method uart_send_char to use this file!\n"; + /* Output of a char to a UART usually follows the following model: + Wait until UART is ready + Write char to UART + Wait until UART is done + + Or in code: + while (*UART_CONTROL_ADDRESS != UART_READY); + *UART_DATA_ADDRESS = c; + while (*UART_CONTROL_ADDRESS != UART_READY); + + Check the UART sample code on your platform or the board + documentation. + */ +} + +int +ee_printf(const char *fmt, ...) +{ + char buf[1024], *p; + va_list args; + int n = 0; + + va_start(args, fmt); + ee_vsprintf(buf, fmt, args); + va_end(args); + p = buf; + while (*p) + { + uart_send_char(*p); + n++; + p++; + } + + return n; +} diff --git a/test/apps/tests/coremark/core_list_join.c b/test/apps/tests/coremark/core_list_join.c new file mode 100644 index 0000000..5d76b4d --- /dev/null +++ b/test/apps/tests/coremark/core_list_join.c @@ -0,0 +1,595 @@ +/* +Copyright 2018 Embedded Microprocessor Benchmark Consortium (EEMBC) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Original Author: Shay Gal-on +*/ + +#include "coremark.h" +/* +Topic: Description + Benchmark using a linked list. + + Linked list is a common data structure used in many applications. + + For our purposes, this will excercise the memory units of the processor. + In particular, usage of the list pointers to find and alter data. + + We are not using Malloc since some platforms do not support this +library. + + Instead, the memory block being passed in is used to create a list, + and the benchmark takes care not to add more items then can be + accommodated by the memory block. The porting layer will make sure + that we have a valid memory block. + + All operations are done in place, without using any extra memory. + + The list itself contains list pointers and pointers to data items. + Data items contain the following: + + idx - An index that captures the initial order of the list. + data - Variable data initialized based on the input parameters. The 16b +are divided as follows: o Upper 8b are backup of original data. o Bit 7 +indicates if the lower 7 bits are to be used as is or calculated. o Bits 0-2 +indicate type of operation to perform to get a 7b value. o Bits 3-6 provide +input for the operation. + +*/ + +/* local functions */ + +list_head *core_list_find(list_head *list, list_data *info); +list_head *core_list_reverse(list_head *list); +list_head *core_list_remove(list_head *item); +list_head *core_list_undo_remove(list_head *item_removed, + list_head *item_modified); +list_head *core_list_insert_new(list_head * insert_point, + list_data * info, + list_head **memblock, + list_data **datablock, + list_head * memblock_end, + list_data * datablock_end); +typedef ee_s32 (*list_cmp)(list_data *a, list_data *b, core_results *res); +list_head *core_list_mergesort(list_head * list, + list_cmp cmp, + core_results *res); + +ee_s16 +calc_func(ee_s16 *pdata, core_results *res) +{ + ee_s16 data = *pdata; + ee_s16 retval; + ee_u8 optype + = (data >> 7) + & 1; /* bit 7 indicates if the function result has been cached */ + if (optype) /* if cached, use cache */ + return (data & 0x007f); + else + { /* otherwise calculate and cache the result */ + ee_s16 flag = data & 0x7; /* bits 0-2 is type of function to perform */ + ee_s16 dtype + = ((data >> 3) + & 0xf); /* bits 3-6 is specific data for the operation */ + dtype |= dtype << 4; /* replicate the lower 4 bits to get an 8b value */ + switch (flag) + { + case 0: + if (dtype < 0x22) /* set min period for bit corruption */ + dtype = 0x22; + retval = core_bench_state(res->size, + res->memblock[3], + res->seed1, + res->seed2, + dtype, + res->crc); + if (res->crcstate == 0) + res->crcstate = retval; + break; + case 1: + retval = core_bench_matrix(&(res->mat), dtype, res->crc); + if (res->crcmatrix == 0) + res->crcmatrix = retval; + break; + default: + retval = data; + break; + } + res->crc = crcu16(retval, res->crc); + retval &= 0x007f; + *pdata = (data & 0xff00) | 0x0080 | retval; /* cache the result */ + return retval; + } +} +/* Function: cmp_complex + Compare the data item in a list cell. + + Can be used by mergesort. +*/ +ee_s32 +cmp_complex(list_data *a, list_data *b, core_results *res) +{ + ee_s16 val1 = calc_func(&(a->data16), res); + ee_s16 val2 = calc_func(&(b->data16), res); + return val1 - val2; +} + +/* Function: cmp_idx + Compare the idx item in a list cell, and regen the data. + + Can be used by mergesort. +*/ +ee_s32 +cmp_idx(list_data *a, list_data *b, core_results *res) +{ + if (res == NULL) + { + a->data16 = (a->data16 & 0xff00) | (0x00ff & (a->data16 >> 8)); + b->data16 = (b->data16 & 0xff00) | (0x00ff & (b->data16 >> 8)); + } + return a->idx - b->idx; +} + +void +copy_info(list_data *to, list_data *from) +{ + to->data16 = from->data16; + to->idx = from->idx; +} + +/* Benchmark for linked list: + - Try to find multiple data items. + - List sort + - Operate on data from list (crc) + - Single remove/reinsert + * At the end of this function, the list is back to original state +*/ +ee_u16 +core_bench_list(core_results *res, ee_s16 finder_idx) +{ + ee_u16 retval = 0; + ee_u16 found = 0, missed = 0; + list_head *list = res->list; + ee_s16 find_num = res->seed3; + list_head *this_find; + list_head *finder, *remover; + list_data info = {0}; + ee_s16 i; + + info.idx = finder_idx; + /* find values in the list, and change the list each time + * (reverse and cache if value found) */ + for (i = 0; i < find_num; i++) + { + info.data16 = (i & 0xff); + this_find = core_list_find(list, &info); + list = core_list_reverse(list); + if (this_find == NULL) + { + missed++; + retval += (list->next->info->data16 >> 8) & 1; + } + else + { + found++; + if (this_find->info->data16 & 0x1) /* use found value */ + retval += (this_find->info->data16 >> 9) & 1; + /* and cache next item at the head of the list (if any) */ + if (this_find->next != NULL) + { + finder = this_find->next; + this_find->next = finder->next; + finder->next = list->next; + list->next = finder; + } + } + if (info.idx >= 0) + info.idx++; +#if CORE_DEBUG + ee_printf("List find %d: [%d,%d,%d]\n", i, retval, missed, found); +#endif + } + retval += found * 4 - missed; + /* sort the list by data content and remove one item*/ + if (finder_idx > 0) + list = core_list_mergesort(list, cmp_complex, res); + remover = core_list_remove(list->next); + /* CRC data content of list from location of index N forward, and then undo + * remove */ + finder = core_list_find(list, &info); + if (!finder) + finder = list->next; + while (finder) + { + retval = crc16(list->info->data16, retval); + finder = finder->next; + } +#if CORE_DEBUG + ee_printf("List sort 1: %04x\n", retval); +#endif + remover = core_list_undo_remove(remover, list->next); + /* sort the list by index, in effect returning the list to original state */ + list = core_list_mergesort(list, cmp_idx, NULL); + /* CRC data content of list */ + finder = list->next; + while (finder) + { + retval = crc16(list->info->data16, retval); + finder = finder->next; + } +#if CORE_DEBUG + ee_printf("List sort 2: %04x\n", retval); +#endif + return retval; +} +/* Function: core_list_init + Initialize list with data. + + Parameters: + blksize - Size of memory to be initialized. + memblock - Pointer to memory block. + seed - Actual values chosen depend on the seed parameter. + The seed parameter MUST be supplied from a source that cannot be + determined at compile time + + Returns: + Pointer to the head of the list. + +*/ +list_head * +core_list_init(ee_u32 blksize, list_head *memblock, ee_s16 seed) +{ + /* calculated pointers for the list */ + ee_u32 per_item = 16 + sizeof(struct list_data_s); + ee_u32 size = (blksize / per_item) + - 2; /* to accommodate systems with 64b pointers, and make sure + same code is executed, set max list elements */ + list_head *memblock_end = memblock + size; + list_data *datablock = (list_data *)(memblock_end); + list_data *datablock_end = datablock + size; + /* some useful variables */ + ee_u32 i; + list_head *finder, *list = memblock; + list_data info; + + /* create a fake items for the list head and tail */ + list->next = NULL; + list->info = datablock; + list->info->idx = 0x0000; + list->info->data16 = (ee_s16)0x8080; + memblock++; + datablock++; + info.idx = 0x7fff; + info.data16 = (ee_s16)0xffff; + core_list_insert_new( + list, &info, &memblock, &datablock, memblock_end, datablock_end); + + /* then insert size items */ + for (i = 0; i < size; i++) + { + ee_u16 datpat = ((ee_u16)(seed ^ i) & 0xf); + ee_u16 dat + = (datpat << 3) | (i & 0x7); /* alternate between algorithms */ + info.data16 = (dat << 8) | dat; /* fill the data with actual data and + upper bits with rebuild value */ + core_list_insert_new( + list, &info, &memblock, &datablock, memblock_end, datablock_end); + } + /* and now index the list so we know initial seed order of the list */ + finder = list->next; + i = 1; + while (finder->next != NULL) + { + if (i < size / 5) /* first 20% of the list in order */ + finder->info->idx = i++; + else + { + ee_u16 pat = (ee_u16)(i++ ^ seed); /* get a pseudo random number */ + finder->info->idx = 0x3fff + & (((i & 0x07) << 8) + | pat); /* make sure the mixed items end up + after the ones in sequence */ + } + finder = finder->next; + } + list = core_list_mergesort(list, cmp_idx, NULL); +#if CORE_DEBUG + ee_printf("Initialized list:\n"); + finder = list; + while (finder) + { + ee_printf( + "[%04x,%04x]", finder->info->idx, (ee_u16)finder->info->data16); + finder = finder->next; + } + ee_printf("\n"); +#endif + return list; +} + +/* Function: core_list_insert + Insert an item to the list + + Parameters: + insert_point - where to insert the item. + info - data for the cell. + memblock - pointer for the list header + datablock - pointer for the list data + memblock_end - end of region for list headers + datablock_end - end of region for list data + + Returns: + Pointer to new item. +*/ +list_head * +core_list_insert_new(list_head * insert_point, + list_data * info, + list_head **memblock, + list_data **datablock, + list_head * memblock_end, + list_data * datablock_end) +{ + list_head *newitem; + + if ((*memblock + 1) >= memblock_end) + return NULL; + if ((*datablock + 1) >= datablock_end) + return NULL; + + newitem = *memblock; + (*memblock)++; + newitem->next = insert_point->next; + insert_point->next = newitem; + + newitem->info = *datablock; + (*datablock)++; + copy_info(newitem->info, info); + + return newitem; +} + +/* Function: core_list_remove + Remove an item from the list. + + Operation: + For a singly linked list, remove by copying the data from the next item + over to the current cell, and unlinking the next item. + + Note: + since there is always a fake item at the end of the list, no need to + check for NULL. + + Returns: + Removed item. +*/ +list_head * +core_list_remove(list_head *item) +{ + list_data *tmp; + list_head *ret = item->next; + /* swap data pointers */ + tmp = item->info; + item->info = ret->info; + ret->info = tmp; + /* and eliminate item */ + item->next = item->next->next; + ret->next = NULL; + return ret; +} + +/* Function: core_list_undo_remove + Undo a remove operation. + + Operation: + Since we want each iteration of the benchmark to be exactly the same, + we need to be able to undo a remove. + Link the removed item back into the list, and switch the info items. + + Parameters: + item_removed - Return value from the + item_modified - List item that was modified during + + Returns: + The item that was linked back to the list. + +*/ +list_head * +core_list_undo_remove(list_head *item_removed, list_head *item_modified) +{ + list_data *tmp; + /* swap data pointers */ + tmp = item_removed->info; + item_removed->info = item_modified->info; + item_modified->info = tmp; + /* and insert item */ + item_removed->next = item_modified->next; + item_modified->next = item_removed; + return item_removed; +} + +/* Function: core_list_find + Find an item in the list + + Operation: + Find an item by idx (if not 0) or specific data value + + Parameters: + list - list head + info - idx or data to find + + Returns: + Found item, or NULL if not found. +*/ +list_head * +core_list_find(list_head *list, list_data *info) +{ + if (info->idx >= 0) + { + while (list && (list->info->idx != info->idx)) + list = list->next; + return list; + } + else + { + while (list && ((list->info->data16 & 0xff) != info->data16)) + list = list->next; + return list; + } +} +/* Function: core_list_reverse + Reverse a list + + Operation: + Rearrange the pointers so the list is reversed. + + Parameters: + list - list head + info - idx or data to find + + Returns: + Found item, or NULL if not found. +*/ + +list_head * +core_list_reverse(list_head *list) +{ + list_head *next = NULL, *tmp; + while (list) + { + tmp = list->next; + list->next = next; + next = list; + list = tmp; + } + return next; +} +/* Function: core_list_mergesort + Sort the list in place without recursion. + + Description: + Use mergesort, as for linked list this is a realistic solution. + Also, since this is aimed at embedded, care was taken to use iterative + rather then recursive algorithm. The sort can either return the list to + original order (by idx) , or use the data item to invoke other other + algorithms and change the order of the list. + + Parameters: + list - list to be sorted. + cmp - cmp function to use + + Returns: + New head of the list. + + Note: + We have a special header for the list that will always be first, + but the algorithm could theoretically modify where the list starts. + + */ +list_head * +core_list_mergesort(list_head *list, list_cmp cmp, core_results *res) +{ + list_head *p, *q, *e, *tail; + ee_s32 insize, nmerges, psize, qsize, i; + + insize = 1; + + while (1) + { + p = list; + list = NULL; + tail = NULL; + + nmerges = 0; /* count number of merges we do in this pass */ + + while (p) + { + nmerges++; /* there exists a merge to be done */ + /* step `insize' places along from p */ + q = p; + psize = 0; + for (i = 0; i < insize; i++) + { + psize++; + q = q->next; + if (!q) + break; + } + + /* if q hasn't fallen off end, we have two lists to merge */ + qsize = insize; + + /* now we have two lists; merge them */ + while (psize > 0 || (qsize > 0 && q)) + { + + /* decide whether next element of merge comes from p or q */ + if (psize == 0) + { + /* p is empty; e must come from q. */ + e = q; + q = q->next; + qsize--; + } + else if (qsize == 0 || !q) + { + /* q is empty; e must come from p. */ + e = p; + p = p->next; + psize--; + } + else if (cmp(p->info, q->info, res) <= 0) + { + /* First element of p is lower (or same); e must come from + * p. */ + e = p; + p = p->next; + psize--; + } + else + { + /* First element of q is lower; e must come from q. */ + e = q; + q = q->next; + qsize--; + } + + /* add the next element to the merged list */ + if (tail) + { + tail->next = e; + } + else + { + list = e; + } + tail = e; + } + + /* now p has stepped `insize' places along, and q has too */ + p = q; + } + + tail->next = NULL; + + /* If we have done only one merge, we're finished. */ + if (nmerges <= 1) /* allow for nmerges==0, the empty list case */ + return list; + + /* Otherwise repeat, merging lists twice the size */ + insize *= 2; + } +#if COMPILER_REQUIRES_SORT_RETURN + return list; +#endif +} diff --git a/test/apps/tests/coremark/core_main.c b/test/apps/tests/coremark/core_main.c new file mode 100644 index 0000000..a4beeb6 --- /dev/null +++ b/test/apps/tests/coremark/core_main.c @@ -0,0 +1,442 @@ +/* +Copyright 2018 Embedded Microprocessor Benchmark Consortium (EEMBC) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Original Author: Shay Gal-on +*/ + +/* File: core_main.c + This file contains the framework to acquire a block of memory, seed + initial parameters, tun t he benchmark and report the results. +*/ +#include "coremark.h" + +/* Function: iterate + Run the benchmark for a specified number of iterations. + + Operation: + For each type of benchmarked algorithm: + a - Initialize the data block for the algorithm. + b - Execute the algorithm N times. + + Returns: + NULL. +*/ +static ee_u16 list_known_crc[] = { (ee_u16)0xd4b0, + (ee_u16)0x3340, + (ee_u16)0x6a79, + (ee_u16)0xe714, + (ee_u16)0xe3c1 }; +static ee_u16 matrix_known_crc[] = { (ee_u16)0xbe52, + (ee_u16)0x1199, + (ee_u16)0x5608, + (ee_u16)0x1fd7, + (ee_u16)0x0747 }; +static ee_u16 state_known_crc[] = { (ee_u16)0x5e47, + (ee_u16)0x39bf, + (ee_u16)0xe5a4, + (ee_u16)0x8e3a, + (ee_u16)0x8d84 }; +void * +iterate(void *pres) +{ + ee_u32 i; + ee_u16 crc; + core_results *res = (core_results *)pres; + ee_u32 iterations = res->iterations; + res->crc = 0; + res->crclist = 0; + res->crcmatrix = 0; + res->crcstate = 0; + + for (i = 0; i < iterations; i++) + { + crc = core_bench_list(res, 1); + res->crc = crcu16(crc, res->crc); + crc = core_bench_list(res, -1); + res->crc = crcu16(crc, res->crc); + if (i == 0) + res->crclist = res->crc; + } + return NULL; +} + +#if (SEED_METHOD == SEED_ARG) +ee_s32 get_seed_args(int i, int argc, char *argv[]); +#define get_seed(x) (ee_s16) get_seed_args(x, argc, argv) +#define get_seed_32(x) get_seed_args(x, argc, argv) +#else /* via function or volatile */ +ee_s32 get_seed_32(int i); +#define get_seed(x) (ee_s16) get_seed_32(x) +#endif + +#if (MEM_METHOD == MEM_STATIC) +ee_u8 static_memblk[TOTAL_DATA_SIZE]; +#endif +char *mem_name[3] = { "Static", "Heap", "Stack" }; +/* Function: main + Main entry routine for the benchmark. + This function is responsible for the following steps: + + 1 - Initialize input seeds from a source that cannot be determined at + compile time. 2 - Initialize memory block for use. 3 - Run and time the + benchmark. 4 - Report results, testing the validity of the output if the + seeds are known. + + Arguments: + 1 - first seed : Any value + 2 - second seed : Must be identical to first for iterations to be + identical 3 - third seed : Any value, should be at least an order of + magnitude less then the input size, but bigger then 32. 4 - Iterations : + Special, if set to 0, iterations will be automatically determined such that + the benchmark will run between 10 to 100 secs + +*/ + +#if MAIN_HAS_NOARGC +MAIN_RETURN_TYPE +main(void) +{ + int argc = 0; + char *argv[1]; +#else +MAIN_RETURN_TYPE +main(int argc, char *argv[]) +{ +#endif + ee_u16 i, j = 0, num_algorithms = 0; + ee_s16 known_id = -1, total_errors = 0; + ee_u16 seedcrc = 0; + CORE_TICKS total_time; + core_results results[MULTITHREAD]; +#if (MEM_METHOD == MEM_STACK) + ee_u8 stack_memblock[TOTAL_DATA_SIZE * MULTITHREAD]; +#endif + /* first call any initializations needed */ + portable_init(&(results[0].port), &argc, argv); + /* First some checks to make sure benchmark will run ok */ + if (sizeof(struct list_head_s) > 128) + { + ee_printf("list_head structure too big for comparable data!\n"); + return MAIN_RETURN_VAL; + } + results[0].seed1 = get_seed(1); + results[0].seed2 = get_seed(2); + results[0].seed3 = get_seed(3); + results[0].iterations = get_seed_32(4); +#if CORE_DEBUG + results[0].iterations = 1; +#endif + results[0].execs = get_seed_32(5); + if (results[0].execs == 0) + { /* if not supplied, execute all algorithms */ + results[0].execs = ALL_ALGORITHMS_MASK; + } + /* put in some default values based on one seed only for easy testing */ + if ((results[0].seed1 == 0) && (results[0].seed2 == 0) + && (results[0].seed3 == 0)) + { /* performance run */ + results[0].seed1 = 0; + results[0].seed2 = 0; + results[0].seed3 = 0x66; + } + if ((results[0].seed1 == 1) && (results[0].seed2 == 0) + && (results[0].seed3 == 0)) + { /* validation run */ + results[0].seed1 = 0x3415; + results[0].seed2 = 0x3415; + results[0].seed3 = 0x66; + } +#if (MEM_METHOD == MEM_STATIC) + results[0].memblock[0] = (void *)static_memblk; + results[0].size = TOTAL_DATA_SIZE; + results[0].err = 0; +#if (MULTITHREAD > 1) +#error "Cannot use a static data area with multiple contexts!" +#endif +#elif (MEM_METHOD == MEM_MALLOC) + for (i = 0; i < MULTITHREAD; i++) + { + ee_s32 malloc_override = get_seed(7); + if (malloc_override != 0) + results[i].size = malloc_override; + else + results[i].size = TOTAL_DATA_SIZE; + results[i].memblock[0] = portable_malloc(results[i].size); + results[i].seed1 = results[0].seed1; + results[i].seed2 = results[0].seed2; + results[i].seed3 = results[0].seed3; + results[i].err = 0; + results[i].execs = results[0].execs; + } +#elif (MEM_METHOD == MEM_STACK) +for (i = 0; i < MULTITHREAD; i++) +{ + results[i].memblock[0] = stack_memblock + i * TOTAL_DATA_SIZE; + results[i].size = TOTAL_DATA_SIZE; + results[i].seed1 = results[0].seed1; + results[i].seed2 = results[0].seed2; + results[i].seed3 = results[0].seed3; + results[i].err = 0; + results[i].execs = results[0].execs; +} +#else +#error "Please define a way to initialize a memory block." +#endif + /* Data init */ + /* Find out how space much we have based on number of algorithms */ + for (i = 0; i < NUM_ALGORITHMS; i++) + { + if ((1 << (ee_u32)i) & results[0].execs) + num_algorithms++; + } + for (i = 0; i < MULTITHREAD; i++) + results[i].size = results[i].size / num_algorithms; + /* Assign pointers */ + for (i = 0; i < NUM_ALGORITHMS; i++) + { + ee_u32 ctx; + if ((1 << (ee_u32)i) & results[0].execs) + { + for (ctx = 0; ctx < MULTITHREAD; ctx++) + results[ctx].memblock[i + 1] + = (char *)(results[ctx].memblock[0]) + results[0].size * j; + j++; + } + } + /* call inits */ + for (i = 0; i < MULTITHREAD; i++) + { + if (results[i].execs & ID_LIST) + { + results[i].list = core_list_init( + results[0].size, results[i].memblock[1], results[i].seed1); + } + if (results[i].execs & ID_MATRIX) + { + core_init_matrix(results[0].size, + results[i].memblock[2], + (ee_s32)results[i].seed1 + | (((ee_s32)results[i].seed2) << 16), + &(results[i].mat)); + } + if (results[i].execs & ID_STATE) + { + core_init_state( + results[0].size, results[i].seed1, results[i].memblock[3]); + } + } + + /* automatically determine number of iterations if not set */ + if (results[0].iterations == 0) + { + secs_ret secs_passed = 0; + ee_u32 divisor; + results[0].iterations = 1; + while (secs_passed < (secs_ret)1) + { + results[0].iterations *= 10; + start_time(); + iterate(&results[0]); + stop_time(); + secs_passed = time_in_secs(get_time()); + } + /* now we know it executes for at least 1 sec, set actual run time at + * about 10 secs */ + divisor = (ee_u32)secs_passed; + if (divisor == 0) /* some machines cast float to int as 0 since this + conversion is not defined by ANSI, but we know at + least one second passed */ + divisor = 1; + results[0].iterations *= 1 + 10 / divisor; + } + /* perform actual benchmark */ + start_time(); +#if (MULTITHREAD > 1) + if (default_num_contexts > MULTITHREAD) + { + default_num_contexts = MULTITHREAD; + } + for (i = 0; i < default_num_contexts; i++) + { + results[i].iterations = results[0].iterations; + results[i].execs = results[0].execs; + core_start_parallel(&results[i]); + } + for (i = 0; i < default_num_contexts; i++) + { + core_stop_parallel(&results[i]); + } +#else + iterate(&results[0]); +#endif + stop_time(); + total_time = get_time(); + /* get a function of the input to report */ + seedcrc = crc16(results[0].seed1, seedcrc); + seedcrc = crc16(results[0].seed2, seedcrc); + seedcrc = crc16(results[0].seed3, seedcrc); + seedcrc = crc16(results[0].size, seedcrc); + + switch (seedcrc) + { /* test known output for common seeds */ + case 0x8a02: /* seed1=0, seed2=0, seed3=0x66, size 2000 per algorithm */ + known_id = 0; + ee_printf("6k performance run parameters for coremark.\n"); + break; + case 0x7b05: /* seed1=0x3415, seed2=0x3415, seed3=0x66, size 2000 per + algorithm */ + known_id = 1; + ee_printf("6k validation run parameters for coremark.\n"); + break; + case 0x4eaf: /* seed1=0x8, seed2=0x8, seed3=0x8, size 400 per algorithm + */ + known_id = 2; + ee_printf("Profile generation run parameters for coremark.\n"); + break; + case 0xe9f5: /* seed1=0, seed2=0, seed3=0x66, size 666 per algorithm */ + known_id = 3; + ee_printf("2K performance run parameters for coremark.\n"); + break; + case 0x18f2: /* seed1=0x3415, seed2=0x3415, seed3=0x66, size 666 per + algorithm */ + known_id = 4; + ee_printf("2K validation run parameters for coremark.\n"); + break; + default: + total_errors = -1; + break; + } + if (known_id >= 0) + { + for (i = 0; i < default_num_contexts; i++) + { + results[i].err = 0; + if ((results[i].execs & ID_LIST) + && (results[i].crclist != list_known_crc[known_id])) + { + ee_printf("[%u]ERROR! list crc 0x%04x - should be 0x%04x\n", + i, + results[i].crclist, + list_known_crc[known_id]); + results[i].err++; + } + if ((results[i].execs & ID_MATRIX) + && (results[i].crcmatrix != matrix_known_crc[known_id])) + { + ee_printf("[%u]ERROR! matrix crc 0x%04x - should be 0x%04x\n", + i, + results[i].crcmatrix, + matrix_known_crc[known_id]); + results[i].err++; + } + if ((results[i].execs & ID_STATE) + && (results[i].crcstate != state_known_crc[known_id])) + { + ee_printf("[%u]ERROR! state crc 0x%04x - should be 0x%04x\n", + i, + results[i].crcstate, + state_known_crc[known_id]); + results[i].err++; + } + total_errors += results[i].err; + } + } + total_errors += check_data_types(); + /* and report results */ + ee_printf("CoreMark Size : %lu\n", (long unsigned)results[0].size); + ee_printf("Total ticks : %lu\n", (long unsigned)total_time); +#if HAS_FLOAT + ee_printf("Total time (secs): %f\n", time_in_secs(total_time)); + if (time_in_secs(total_time) > 0) + ee_printf("Iterations/Sec : %f\n", + default_num_contexts * results[0].iterations + / time_in_secs(total_time)); +#else + ee_printf("Total time (secs): %d\n", time_in_secs(total_time)); + if (time_in_secs(total_time) > 0) + ee_printf("Iterations/Sec : %d\n", + default_num_contexts * results[0].iterations + / time_in_secs(total_time)); +#endif + if (time_in_secs(total_time) < 10) + { + ee_printf( + "ERROR! Must execute for at least 10 secs for a valid result!\n"); + total_errors++; + } + + ee_printf("Iterations : %lu\n", + (long unsigned)default_num_contexts * results[0].iterations); + ee_printf("Compiler version : %s\n", COMPILER_VERSION); + ee_printf("Compiler flags : %s\n", COMPILER_FLAGS); +#if (MULTITHREAD > 1) + ee_printf("Parallel %s : %d\n", PARALLEL_METHOD, default_num_contexts); +#endif + ee_printf("Memory location : %s\n", MEM_LOCATION); + /* output for verification */ + ee_printf("seedcrc : 0x%04x\n", seedcrc); + if (results[0].execs & ID_LIST) + for (i = 0; i < default_num_contexts; i++) + ee_printf("[%d]crclist : 0x%04x\n", i, results[i].crclist); + if (results[0].execs & ID_MATRIX) + for (i = 0; i < default_num_contexts; i++) + ee_printf("[%d]crcmatrix : 0x%04x\n", i, results[i].crcmatrix); + if (results[0].execs & ID_STATE) + for (i = 0; i < default_num_contexts; i++) + ee_printf("[%d]crcstate : 0x%04x\n", i, results[i].crcstate); + for (i = 0; i < default_num_contexts; i++) + ee_printf("[%d]crcfinal : 0x%04x\n", i, results[i].crc); + if (total_errors == 0) + { + ee_printf( + "Correct operation validated. See README.md for run and reporting " + "rules.\n"); +#if HAS_FLOAT + if (known_id == 3) + { + ee_printf("CoreMark 1.0 : %f / %s %s", + default_num_contexts * results[0].iterations + / time_in_secs(total_time), + COMPILER_VERSION, + COMPILER_FLAGS); +#if defined(MEM_LOCATION) && !defined(MEM_LOCATION_UNSPEC) + ee_printf(" / %s", MEM_LOCATION); +#else + ee_printf(" / %s", mem_name[MEM_METHOD]); +#endif + +#if (MULTITHREAD > 1) + ee_printf(" / %d:%s", default_num_contexts, PARALLEL_METHOD); +#endif + ee_printf("\n"); + } +#endif + } + if (total_errors > 0) + ee_printf("Errors detected\n"); + if (total_errors < 0) + ee_printf( + "Cannot validate operation for these seed values, please compare " + "with results on a known platform.\n"); + +#if (MEM_METHOD == MEM_MALLOC) + for (i = 0; i < MULTITHREAD; i++) + portable_free(results[i].memblock[0]); +#endif + /* And last call any target specific code for finalizing */ + portable_fini(&(results[0].port)); + + return MAIN_RETURN_VAL; +} diff --git a/test/apps/tests/coremark/core_matrix.c b/test/apps/tests/coremark/core_matrix.c new file mode 100644 index 0000000..29fd8ab --- /dev/null +++ b/test/apps/tests/coremark/core_matrix.c @@ -0,0 +1,359 @@ +/* +Copyright 2018 Embedded Microprocessor Benchmark Consortium (EEMBC) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Original Author: Shay Gal-on +*/ + +#include "coremark.h" +/* +Topic: Description + Matrix manipulation benchmark + + This very simple algorithm forms the basis of many more complex +algorithms. + + The tight inner loop is the focus of many optimizations (compiler as +well as hardware based) and is thus relevant for embedded processing. + + The total available data space will be divided to 3 parts: + NxN Matrix A - initialized with small values (upper 3/4 of the bits all +zero). NxN Matrix B - initialized with medium values (upper half of the bits all +zero). NxN Matrix C - used for the result. + + The actual values for A and B must be derived based on input that is not +available at compile time. +*/ +ee_s16 matrix_test(ee_u32 N, MATRES *C, MATDAT *A, MATDAT *B, MATDAT val); +ee_s16 matrix_sum(ee_u32 N, MATRES *C, MATDAT clipval); +void matrix_mul_const(ee_u32 N, MATRES *C, MATDAT *A, MATDAT val); +void matrix_mul_vect(ee_u32 N, MATRES *C, MATDAT *A, MATDAT *B); +void matrix_mul_matrix(ee_u32 N, MATRES *C, MATDAT *A, MATDAT *B); +void matrix_mul_matrix_bitextract(ee_u32 N, MATRES *C, MATDAT *A, MATDAT *B); +void matrix_add_const(ee_u32 N, MATDAT *A, MATDAT val); + +#define matrix_test_next(x) (x + 1) +#define matrix_clip(x, y) ((y) ? (x)&0x0ff : (x)&0x0ffff) +#define matrix_big(x) (0xf000 | (x)) +#define bit_extract(x, from, to) (((x) >> (from)) & (~(0xffffffff << (to)))) + +#if CORE_DEBUG +void +printmat(MATDAT *A, ee_u32 N, char *name) +{ + ee_u32 i, j; + ee_printf("Matrix %s [%dx%d]:\n", name, N, N); + for (i = 0; i < N; i++) + { + for (j = 0; j < N; j++) + { + if (j != 0) + ee_printf(","); + ee_printf("%d", A[i * N + j]); + } + ee_printf("\n"); + } +} +void +printmatC(MATRES *C, ee_u32 N, char *name) +{ + ee_u32 i, j; + ee_printf("Matrix %s [%dx%d]:\n", name, N, N); + for (i = 0; i < N; i++) + { + for (j = 0; j < N; j++) + { + if (j != 0) + ee_printf(","); + ee_printf("%d", C[i * N + j]); + } + ee_printf("\n"); + } +} +#endif +/* Function: core_bench_matrix + Benchmark function + + Iterate N times, + changing the matrix values slightly by a constant amount each time. +*/ +ee_u16 +core_bench_matrix(mat_params *p, ee_s16 seed, ee_u16 crc) +{ + ee_u32 N = p->N; + MATRES *C = p->C; + MATDAT *A = p->A; + MATDAT *B = p->B; + MATDAT val = (MATDAT)seed; + + crc = crc16(matrix_test(N, C, A, B, val), crc); + + return crc; +} + +/* Function: matrix_test + Perform matrix manipulation. + + Parameters: + N - Dimensions of the matrix. + C - memory for result matrix. + A - input matrix + B - operator matrix (not changed during operations) + + Returns: + A CRC value that captures all results calculated in the function. + In particular, crc of the value calculated on the result matrix + after each step by . + + Operation: + + 1 - Add a constant value to all elements of a matrix. + 2 - Multiply a matrix by a constant. + 3 - Multiply a matrix by a vector. + 4 - Multiply a matrix by a matrix. + 5 - Add a constant value to all elements of a matrix. + + After the last step, matrix A is back to original contents. +*/ +ee_s16 +matrix_test(ee_u32 N, MATRES *C, MATDAT *A, MATDAT *B, MATDAT val) +{ + ee_u16 crc = 0; + MATDAT clipval = matrix_big(val); + + matrix_add_const(N, A, val); /* make sure data changes */ +#if CORE_DEBUG + printmat(A, N, "matrix_add_const"); +#endif + matrix_mul_const(N, C, A, val); + crc = crc16(matrix_sum(N, C, clipval), crc); +#if CORE_DEBUG + printmatC(C, N, "matrix_mul_const"); +#endif + matrix_mul_vect(N, C, A, B); + crc = crc16(matrix_sum(N, C, clipval), crc); +#if CORE_DEBUG + printmatC(C, N, "matrix_mul_vect"); +#endif + matrix_mul_matrix(N, C, A, B); + crc = crc16(matrix_sum(N, C, clipval), crc); +#if CORE_DEBUG + printmatC(C, N, "matrix_mul_matrix"); +#endif + matrix_mul_matrix_bitextract(N, C, A, B); + crc = crc16(matrix_sum(N, C, clipval), crc); +#if CORE_DEBUG + printmatC(C, N, "matrix_mul_matrix_bitextract"); +#endif + + matrix_add_const(N, A, -val); /* return matrix to initial value */ + return crc; +} + +/* Function : matrix_init + Initialize the memory block for matrix benchmarking. + + Parameters: + blksize - Size of memory to be initialized. + memblk - Pointer to memory block. + seed - Actual values chosen depend on the seed parameter. + p - pointers to containing initialized matrixes. + + Returns: + Matrix dimensions. + + Note: + The seed parameter MUST be supplied from a source that cannot be + determined at compile time +*/ +ee_u32 +core_init_matrix(ee_u32 blksize, void *memblk, ee_s32 seed, mat_params *p) +{ + ee_u32 N = 0; + MATDAT *A; + MATDAT *B; + ee_s32 order = 1; + MATDAT val; + ee_u32 i = 0, j = 0; + if (seed == 0) + seed = 1; + while (j < blksize) + { + i++; + j = i * i * 2 * 4; + } + N = i - 1; + A = (MATDAT *)align_mem(memblk); + B = A + N * N; + + for (i = 0; i < N; i++) + { + for (j = 0; j < N; j++) + { + seed = ((order * seed) % 65536); + val = (seed + order); + val = matrix_clip(val, 0); + B[i * N + j] = val; + val = (val + order); + val = matrix_clip(val, 1); + A[i * N + j] = val; + order++; + } + } + + p->A = A; + p->B = B; + p->C = (MATRES *)align_mem(B + N * N); + p->N = N; +#if CORE_DEBUG + printmat(A, N, "A"); + printmat(B, N, "B"); +#endif + return N; +} + +/* Function: matrix_sum + Calculate a function that depends on the values of elements in the + matrix. + + For each element, accumulate into a temporary variable. + + As long as this value is under the parameter clipval, + add 1 to the result if the element is bigger then the previous. + + Otherwise, reset the accumulator and add 10 to the result. +*/ +ee_s16 +matrix_sum(ee_u32 N, MATRES *C, MATDAT clipval) +{ + MATRES tmp = 0, prev = 0, cur = 0; + ee_s16 ret = 0; + ee_u32 i, j; + for (i = 0; i < N; i++) + { + for (j = 0; j < N; j++) + { + cur = C[i * N + j]; + tmp += cur; + if (tmp > clipval) + { + ret += 10; + tmp = 0; + } + else + { + ret += (cur > prev) ? 1 : 0; + } + prev = cur; + } + } + return ret; +} + +/* Function: matrix_mul_const + Multiply a matrix by a constant. + This could be used as a scaler for instance. +*/ +void +matrix_mul_const(ee_u32 N, MATRES *C, MATDAT *A, MATDAT val) +{ + ee_u32 i, j; + for (i = 0; i < N; i++) + { + for (j = 0; j < N; j++) + { + C[i * N + j] = (MATRES)A[i * N + j] * (MATRES)val; + } + } +} + +/* Function: matrix_add_const + Add a constant value to all elements of a matrix. +*/ +void +matrix_add_const(ee_u32 N, MATDAT *A, MATDAT val) +{ + ee_u32 i, j; + for (i = 0; i < N; i++) + { + for (j = 0; j < N; j++) + { + A[i * N + j] += val; + } + } +} + +/* Function: matrix_mul_vect + Multiply a matrix by a vector. + This is common in many simple filters (e.g. fir where a vector of + coefficients is applied to the matrix.) +*/ +void +matrix_mul_vect(ee_u32 N, MATRES *C, MATDAT *A, MATDAT *B) +{ + ee_u32 i, j; + for (i = 0; i < N; i++) + { + C[i] = 0; + for (j = 0; j < N; j++) + { + C[i] += (MATRES)A[i * N + j] * (MATRES)B[j]; + } + } +} + +/* Function: matrix_mul_matrix + Multiply a matrix by a matrix. + Basic code is used in many algorithms, mostly with minor changes such as + scaling. +*/ +void +matrix_mul_matrix(ee_u32 N, MATRES *C, MATDAT *A, MATDAT *B) +{ + ee_u32 i, j, k; + for (i = 0; i < N; i++) + { + for (j = 0; j < N; j++) + { + C[i * N + j] = 0; + for (k = 0; k < N; k++) + { + C[i * N + j] += (MATRES)A[i * N + k] * (MATRES)B[k * N + j]; + } + } + } +} + +/* Function: matrix_mul_matrix_bitextract + Multiply a matrix by a matrix, and extract some bits from the result. + Basic code is used in many algorithms, mostly with minor changes such as + scaling. +*/ +void +matrix_mul_matrix_bitextract(ee_u32 N, MATRES *C, MATDAT *A, MATDAT *B) +{ + ee_u32 i, j, k; + for (i = 0; i < N; i++) + { + for (j = 0; j < N; j++) + { + C[i * N + j] = 0; + for (k = 0; k < N; k++) + { + MATRES tmp = (MATRES)A[i * N + k] * (MATRES)B[k * N + j]; + C[i * N + j] += bit_extract(tmp, 2, 4) * bit_extract(tmp, 5, 7); + } + } + } +} diff --git a/test/apps/tests/coremark/core_state.c b/test/apps/tests/coremark/core_state.c new file mode 100644 index 0000000..01800b3 --- /dev/null +++ b/test/apps/tests/coremark/core_state.c @@ -0,0 +1,330 @@ +/* +Copyright 2018 Embedded Microprocessor Benchmark Consortium (EEMBC) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Original Author: Shay Gal-on +*/ + +#include "coremark.h" +/* local functions */ +enum CORE_STATE core_state_transition(ee_u8 **instr, ee_u32 *transition_count); + +/* +Topic: Description + Simple state machines like this one are used in many embedded products. + + For more complex state machines, sometimes a state transition table +implementation is used instead, trading speed of direct coding for ease of +maintenance. + + Since the main goal of using a state machine in CoreMark is to excercise +the switch/if behaviour, we are using a small moore machine. + + In particular, this machine tests type of string input, + trying to determine whether the input is a number or something else. + (see core_state.png). +*/ + +/* Function: core_bench_state + Benchmark function + + Go over the input twice, once direct, and once after introducing some + corruption. +*/ +ee_u16 +core_bench_state(ee_u32 blksize, + ee_u8 *memblock, + ee_s16 seed1, + ee_s16 seed2, + ee_s16 step, + ee_u16 crc) +{ + ee_u32 final_counts[NUM_CORE_STATES]; + ee_u32 track_counts[NUM_CORE_STATES]; + ee_u8 *p = memblock; + ee_u32 i; + +#if CORE_DEBUG + ee_printf("State Bench: %d,%d,%d,%04x\n", seed1, seed2, step, crc); +#endif + for (i = 0; i < NUM_CORE_STATES; i++) + { + final_counts[i] = track_counts[i] = 0; + } + /* run the state machine over the input */ + while (*p != 0) + { + enum CORE_STATE fstate = core_state_transition(&p, track_counts); + final_counts[fstate]++; +#if CORE_DEBUG + ee_printf("%d,", fstate); + } + ee_printf("\n"); +#else + } +#endif + p = memblock; + while (p < (memblock + blksize)) + { /* insert some corruption */ + if (*p != ',') + *p ^= (ee_u8)seed1; + p += step; + } + p = memblock; + /* run the state machine over the input again */ + while (*p != 0) + { + enum CORE_STATE fstate = core_state_transition(&p, track_counts); + final_counts[fstate]++; +#if CORE_DEBUG + ee_printf("%d,", fstate); + } + ee_printf("\n"); +#else + } +#endif + p = memblock; + while (p < (memblock + blksize)) + { /* undo corruption is seed1 and seed2 are equal */ + if (*p != ',') + *p ^= (ee_u8)seed2; + p += step; + } + /* end timing */ + for (i = 0; i < NUM_CORE_STATES; i++) + { + crc = crcu32(final_counts[i], crc); + crc = crcu32(track_counts[i], crc); + } + return crc; +} + +/* Default initialization patterns */ +static ee_u8 *intpat[4] + = { (ee_u8 *)"5012", (ee_u8 *)"1234", (ee_u8 *)"-874", (ee_u8 *)"+122" }; +static ee_u8 *floatpat[4] = { (ee_u8 *)"35.54400", + (ee_u8 *)".1234500", + (ee_u8 *)"-110.700", + (ee_u8 *)"+0.64400" }; +static ee_u8 *scipat[4] = { (ee_u8 *)"5.500e+3", + (ee_u8 *)"-.123e-2", + (ee_u8 *)"-87e+832", + (ee_u8 *)"+0.6e-12" }; +static ee_u8 *errpat[4] = { (ee_u8 *)"T0.3e-1F", + (ee_u8 *)"-T.T++Tq", + (ee_u8 *)"1T3.4e4z", + (ee_u8 *)"34.0e-T^" }; + +/* Function: core_init_state + Initialize the input data for the state machine. + + Populate the input with several predetermined strings, interspersed. + Actual patterns chosen depend on the seed parameter. + + Note: + The seed parameter MUST be supplied from a source that cannot be + determined at compile time +*/ +void +core_init_state(ee_u32 size, ee_s16 seed, ee_u8 *p) +{ + ee_u32 total = 0, next = 0, i; + ee_u8 *buf = 0; +#if CORE_DEBUG + ee_u8 *start = p; + ee_printf("State: %d,%d\n", size, seed); +#endif + size--; + next = 0; + while ((total + next + 1) < size) + { + if (next > 0) + { + for (i = 0; i < next; i++) + *(p + total + i) = buf[i]; + *(p + total + i) = ','; + total += next + 1; + } + seed++; + switch (seed & 0x7) + { + case 0: /* int */ + case 1: /* int */ + case 2: /* int */ + buf = intpat[(seed >> 3) & 0x3]; + next = 4; + break; + case 3: /* float */ + case 4: /* float */ + buf = floatpat[(seed >> 3) & 0x3]; + next = 8; + break; + case 5: /* scientific */ + case 6: /* scientific */ + buf = scipat[(seed >> 3) & 0x3]; + next = 8; + break; + case 7: /* invalid */ + buf = errpat[(seed >> 3) & 0x3]; + next = 8; + break; + default: /* Never happen, just to make some compilers happy */ + break; + } + } + size++; + while (total < size) + { /* fill the rest with 0 */ + *(p + total) = 0; + total++; + } +#if CORE_DEBUG + ee_printf("State Input: %s\n", start); +#endif +} + +static ee_u8 +ee_isdigit(ee_u8 c) +{ + ee_u8 retval; + retval = ((c >= '0') & (c <= '9')) ? 1 : 0; + return retval; +} + +/* Function: core_state_transition + Actual state machine. + + The state machine will continue scanning until either: + 1 - an invalid input is detected. + 2 - a valid number has been detected. + + The input pointer is updated to point to the end of the token, and the + end state is returned (either specific format determined or invalid). +*/ + +enum CORE_STATE +core_state_transition(ee_u8 **instr, ee_u32 *transition_count) +{ + ee_u8 * str = *instr; + ee_u8 NEXT_SYMBOL; + enum CORE_STATE state = CORE_START; + for (; *str && state != CORE_INVALID; str++) + { + NEXT_SYMBOL = *str; + if (NEXT_SYMBOL == ',') /* end of this input */ + { + str++; + break; + } + switch (state) + { + case CORE_START: + if (ee_isdigit(NEXT_SYMBOL)) + { + state = CORE_INT; + } + else if (NEXT_SYMBOL == '+' || NEXT_SYMBOL == '-') + { + state = CORE_S1; + } + else if (NEXT_SYMBOL == '.') + { + state = CORE_FLOAT; + } + else + { + state = CORE_INVALID; + transition_count[CORE_INVALID]++; + } + transition_count[CORE_START]++; + break; + case CORE_S1: + if (ee_isdigit(NEXT_SYMBOL)) + { + state = CORE_INT; + transition_count[CORE_S1]++; + } + else if (NEXT_SYMBOL == '.') + { + state = CORE_FLOAT; + transition_count[CORE_S1]++; + } + else + { + state = CORE_INVALID; + transition_count[CORE_S1]++; + } + break; + case CORE_INT: + if (NEXT_SYMBOL == '.') + { + state = CORE_FLOAT; + transition_count[CORE_INT]++; + } + else if (!ee_isdigit(NEXT_SYMBOL)) + { + state = CORE_INVALID; + transition_count[CORE_INT]++; + } + break; + case CORE_FLOAT: + if (NEXT_SYMBOL == 'E' || NEXT_SYMBOL == 'e') + { + state = CORE_S2; + transition_count[CORE_FLOAT]++; + } + else if (!ee_isdigit(NEXT_SYMBOL)) + { + state = CORE_INVALID; + transition_count[CORE_FLOAT]++; + } + break; + case CORE_S2: + if (NEXT_SYMBOL == '+' || NEXT_SYMBOL == '-') + { + state = CORE_EXPONENT; + transition_count[CORE_S2]++; + } + else + { + state = CORE_INVALID; + transition_count[CORE_S2]++; + } + break; + case CORE_EXPONENT: + if (ee_isdigit(NEXT_SYMBOL)) + { + state = CORE_SCIENTIFIC; + transition_count[CORE_EXPONENT]++; + } + else + { + state = CORE_INVALID; + transition_count[CORE_EXPONENT]++; + } + break; + case CORE_SCIENTIFIC: + if (!ee_isdigit(NEXT_SYMBOL)) + { + state = CORE_INVALID; + transition_count[CORE_INVALID]++; + } + break; + default: + break; + } + } + *instr = str; + return state; +} diff --git a/test/apps/tests/coremark/core_util.c b/test/apps/tests/coremark/core_util.c new file mode 100644 index 0000000..67c5d77 --- /dev/null +++ b/test/apps/tests/coremark/core_util.c @@ -0,0 +1,249 @@ +/* +Copyright 2018 Embedded Microprocessor Benchmark Consortium (EEMBC) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Original Author: Shay Gal-on +*/ + +#include "coremark.h" +/* Function: get_seed + Get a values that cannot be determined at compile time. + + Since different embedded systems and compilers are used, 3 different + methods are provided: 1 - Using a volatile variable. This method is only + valid if the compiler is forced to generate code that reads the value of a + volatile variable from memory at run time. Please note, if using this method, + you would need to modify core_portme.c to generate training profile. 2 - + Command line arguments. This is the preferred method if command line + arguments are supported. 3 - System function. If none of the first 2 methods + is available on the platform, a system function which is not a stub can be + used. + + e.g. read the value on GPIO pins connected to switches, or invoke + special simulator functions. +*/ +#if (SEED_METHOD == SEED_VOLATILE) +extern volatile ee_s32 seed1_volatile; +extern volatile ee_s32 seed2_volatile; +extern volatile ee_s32 seed3_volatile; +extern volatile ee_s32 seed4_volatile; +extern volatile ee_s32 seed5_volatile; +ee_s32 +get_seed_32(int i) +{ + ee_s32 retval; + switch (i) + { + case 1: + retval = seed1_volatile; + break; + case 2: + retval = seed2_volatile; + break; + case 3: + retval = seed3_volatile; + break; + case 4: + retval = seed4_volatile; + break; + case 5: + retval = seed5_volatile; + break; + default: + retval = 0; + break; + } + return retval; +} +#elif (SEED_METHOD == SEED_ARG) +ee_s32 +parseval(char *valstring) +{ + ee_s32 retval = 0; + ee_s32 neg = 1; + int hexmode = 0; + if (*valstring == '-') + { + neg = -1; + valstring++; + } + if ((valstring[0] == '0') && (valstring[1] == 'x')) + { + hexmode = 1; + valstring += 2; + } + /* first look for digits */ + if (hexmode) + { + while (((*valstring >= '0') && (*valstring <= '9')) + || ((*valstring >= 'a') && (*valstring <= 'f'))) + { + ee_s32 digit = *valstring - '0'; + if (digit > 9) + digit = 10 + *valstring - 'a'; + retval *= 16; + retval += digit; + valstring++; + } + } + else + { + while ((*valstring >= '0') && (*valstring <= '9')) + { + ee_s32 digit = *valstring - '0'; + retval *= 10; + retval += digit; + valstring++; + } + } + /* now add qualifiers */ + if (*valstring == 'K') + retval *= 1024; + if (*valstring == 'M') + retval *= 1024 * 1024; + + retval *= neg; + return retval; +} + +ee_s32 +get_seed_args(int i, int argc, char *argv[]) +{ + if (argc > i) + return parseval(argv[i]); + return 0; +} + +#elif (SEED_METHOD == SEED_FUNC) +/* If using OS based function, you must define and implement the functions below + * in core_portme.h and core_portme.c ! */ +ee_s32 +get_seed_32(int i) +{ + ee_s32 retval; + switch (i) + { + case 1: + retval = portme_sys1(); + break; + case 2: + retval = portme_sys2(); + break; + case 3: + retval = portme_sys3(); + break; + case 4: + retval = portme_sys4(); + break; + case 5: + retval = portme_sys5(); + break; + default: + retval = 0; + break; + } + return retval; +} +#endif + +/* Function: crc* + Service functions to calculate 16b CRC code. + +*/ +ee_u16 +crcu8(ee_u8 data, ee_u16 crc) +{ + ee_u8 i = 0, x16 = 0, carry = 0; + + for (i = 0; i < 8; i++) + { + x16 = (ee_u8)((data & 1) ^ ((ee_u8)crc & 1)); + data >>= 1; + + if (x16 == 1) + { + crc ^= 0x4002; + carry = 1; + } + else + carry = 0; + crc >>= 1; + if (carry) + crc |= 0x8000; + else + crc &= 0x7fff; + } + return crc; +} +ee_u16 +crcu16(ee_u16 newval, ee_u16 crc) +{ + crc = crcu8((ee_u8)(newval), crc); + crc = crcu8((ee_u8)((newval) >> 8), crc); + return crc; +} +ee_u16 +crcu32(ee_u32 newval, ee_u16 crc) +{ + crc = crc16((ee_s16)newval, crc); + crc = crc16((ee_s16)(newval >> 16), crc); + return crc; +} +ee_u16 +crc16(ee_s16 newval, ee_u16 crc) +{ + return crcu16((ee_u16)newval, crc); +} + +ee_u8 +check_data_types() +{ + ee_u8 retval = 0; + if (sizeof(ee_u8) != 1) + { + ee_printf("ERROR: ee_u8 is not an 8b datatype!\n"); + retval++; + } + if (sizeof(ee_u16) != 2) + { + ee_printf("ERROR: ee_u16 is not a 16b datatype!\n"); + retval++; + } + if (sizeof(ee_s16) != 2) + { + ee_printf("ERROR: ee_s16 is not a 16b datatype!\n"); + retval++; + } + if (sizeof(ee_s32) != 4) + { + ee_printf("ERROR: ee_s32 is not a 32b datatype!\n"); + retval++; + } + if (sizeof(ee_u32) != 4) + { + ee_printf("ERROR: ee_u32 is not a 32b datatype!\n"); + retval++; + } + if (sizeof(ee_ptr_int) != sizeof(int *)) + { + ee_printf( + "ERROR: ee_ptr_int is not a datatype that holds an int pointer!\n"); + retval++; + } + if (retval > 0) + { + ee_printf("ERROR: Please modify the datatypes in core_portme.h!\n"); + } + return retval; +} diff --git a/test/apps/tests/coremark/coremark.h b/test/apps/tests/coremark/coremark.h new file mode 100644 index 0000000..9c5e406 --- /dev/null +++ b/test/apps/tests/coremark/coremark.h @@ -0,0 +1,183 @@ +/* +Copyright 2018 Embedded Microprocessor Benchmark Consortium (EEMBC) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Original Author: Shay Gal-on +*/ + +/* Topic: Description + This file contains declarations of the various benchmark functions. +*/ + +/* Configuration: TOTAL_DATA_SIZE + Define total size for data algorithms will operate on +*/ +#ifndef TOTAL_DATA_SIZE +#define TOTAL_DATA_SIZE 2 * 1000 +#endif + +#define SEED_ARG 0 +#define SEED_FUNC 1 +#define SEED_VOLATILE 2 + +#define MEM_STATIC 0 +#define MEM_MALLOC 1 +#define MEM_STACK 2 + +#include "core_portme.h" + +#if HAS_STDIO +#include +#endif +#if HAS_PRINTF +#define ee_printf printf +#endif + +/* Actual benchmark execution in iterate */ +void *iterate(void *pres); + +/* Typedef: secs_ret + For machines that have floating point support, get number of seconds as + a double. Otherwise an unsigned int. +*/ +#if HAS_FLOAT +typedef double secs_ret; +#else +typedef ee_u32 secs_ret; +#endif + +#if MAIN_HAS_NORETURN +#define MAIN_RETURN_VAL +#define MAIN_RETURN_TYPE void +#else +#define MAIN_RETURN_VAL 0 +#define MAIN_RETURN_TYPE int +#endif + +void start_time(void); +void stop_time(void); +CORE_TICKS get_time(void); +secs_ret time_in_secs(CORE_TICKS ticks); + +/* Misc useful functions */ +ee_u16 crcu8(ee_u8 data, ee_u16 crc); +ee_u16 crc16(ee_s16 newval, ee_u16 crc); +ee_u16 crcu16(ee_u16 newval, ee_u16 crc); +ee_u16 crcu32(ee_u32 newval, ee_u16 crc); +ee_u8 check_data_types(void); +void * portable_malloc(ee_size_t size); +void portable_free(void *p); +ee_s32 parseval(char *valstring); + +/* Algorithm IDS */ +#define ID_LIST (1 << 0) +#define ID_MATRIX (1 << 1) +#define ID_STATE (1 << 2) +#define ALL_ALGORITHMS_MASK (ID_LIST | ID_MATRIX | ID_STATE) +#define NUM_ALGORITHMS 3 + +/* list data structures */ +typedef struct list_data_s +{ + ee_s16 data16; + ee_s16 idx; +} list_data; + +typedef struct list_head_s +{ + struct list_head_s *next; + struct list_data_s *info; +} list_head; + +/*matrix benchmark related stuff */ +#define MATDAT_INT 1 +#if MATDAT_INT +typedef ee_s16 MATDAT; +typedef ee_s32 MATRES; +#else +typedef ee_f16 MATDAT; +typedef ee_f32 MATRES; +#endif + +typedef struct MAT_PARAMS_S +{ + int N; + MATDAT *A; + MATDAT *B; + MATRES *C; +} mat_params; + +/* state machine related stuff */ +/* List of all the possible states for the FSM */ +typedef enum CORE_STATE +{ + CORE_START = 0, + CORE_INVALID, + CORE_S1, + CORE_S2, + CORE_INT, + CORE_FLOAT, + CORE_EXPONENT, + CORE_SCIENTIFIC, + NUM_CORE_STATES +} core_state_e; + +/* Helper structure to hold results */ +typedef struct RESULTS_S +{ + /* inputs */ + ee_s16 seed1; /* Initializing seed */ + ee_s16 seed2; /* Initializing seed */ + ee_s16 seed3; /* Initializing seed */ + void * memblock[4]; /* Pointer to safe memory location */ + ee_u32 size; /* Size of the data */ + ee_u32 iterations; /* Number of iterations to execute */ + ee_u32 execs; /* Bitmask of operations to execute */ + struct list_head_s *list; + mat_params mat; + /* outputs */ + ee_u16 crc; + ee_u16 crclist; + ee_u16 crcmatrix; + ee_u16 crcstate; + ee_s16 err; + /* ultithread specific */ + core_portable port; +} core_results; + +/* Multicore execution handling */ +#if (MULTITHREAD > 1) +ee_u8 core_start_parallel(core_results *res); +ee_u8 core_stop_parallel(core_results *res); +#endif + +/* list benchmark functions */ +list_head *core_list_init(ee_u32 blksize, list_head *memblock, ee_s16 seed); +ee_u16 core_bench_list(core_results *res, ee_s16 finder_idx); + +/* state benchmark functions */ +void core_init_state(ee_u32 size, ee_s16 seed, ee_u8 *p); +ee_u16 core_bench_state(ee_u32 blksize, + ee_u8 *memblock, + ee_s16 seed1, + ee_s16 seed2, + ee_s16 step, + ee_u16 crc); + +/* matrix benchmark functions */ +ee_u32 core_init_matrix(ee_u32 blksize, + void * memblk, + ee_s32 seed, + mat_params *p); +ee_u16 core_bench_matrix(mat_params *p, ee_s16 seed, ee_u16 crc); diff --git a/test/apps/tests/coremark/coremark.md5 b/test/apps/tests/coremark/coremark.md5 new file mode 100644 index 0000000..400ff02 --- /dev/null +++ b/test/apps/tests/coremark/coremark.md5 @@ -0,0 +1,6 @@ +9007fe7861b60ee6f210d156b62974c8 core_list_join.c +4a9e6dadce1ac3866381021fbe843fc9 core_main.c +5fa21a0f7c3964167c9691db531ca652 core_matrix.c +fb49e7605c125306575a83f14f5798ac core_state.c +45540ba2145adea1ec7ea2c72a1fbbcb core_util.c +8ca974c013b380dc7f0d6d1afb76eb2d coremark.h diff --git a/test/priv_sec_testsuite/tests/env/pmp_service.S b/test/priv_sec_testsuite/tests/env/pmp_service.S index 7ac9a0f..e564590 100644 --- a/test/priv_sec_testsuite/tests/env/pmp_service.S +++ b/test/priv_sec_testsuite/tests/env/pmp_service.S @@ -12,6 +12,7 @@ .equ SVC_WRITE, 12 .equ SVC_EXE, 13 .equ SVC_CHECK_REGION, 14 +.equ SVC_MCOUNTEREN, 15 .EQU MPRV_ON, 0x00020000 .EQU MPRV_OFF, 0xFFFDFFFF @@ -510,6 +511,18 @@ PMP_SERVICE: j RET_ECALL +// Setup access to IR, TM, CY from U-mode +SET_MCOUNTEREN: + beq zero, a0, 2f +// Enable all counters +1: + csrw mcounteren, a0 + j RET_ECALL +// Disable all counters +2: + csrw mcounteren, 0x0 + j RET_ECALL + ///////////////////////////////////////////////////// # Entry point for user-mode system call # Redirect to the right service @@ -549,6 +562,9 @@ ECALL_USER_MODE: # Check a region matches a configuration li t4, SVC_CHECK_REGION beq a7, t4, CHECK_PMP_REGION + # Enable / disable MCOUNTER access + li t4, SVC_MCOUNTEREN + beq a7, t4, SET_MCOUNTEREN # Unrecognized service j RET_ECALL diff --git a/test/priv_sec_testsuite/tests/rv32ui-p-test2.v b/test/priv_sec_testsuite/tests/rv32ui-p-test2.v index 6760d39..7941c74 100755 --- a/test/priv_sec_testsuite/tests/rv32ui-p-test2.v +++ b/test/priv_sec_testsuite/tests/rv32ui-p-test2.v @@ -1,10 +1,10 @@ @00010000 6F 00 00 0B 73 2F 20 34 93 0E 80 00 63 14 DF 01 -6F 20 40 5D 93 0E 90 00 63 04 DF 1D 93 0E B0 00 +6F 20 80 5E 93 0E 90 00 63 04 DF 1D 93 0E B0 00 63 04 DF 1D 93 0E 20 00 63 02 DF 1D B7 0E 00 80 -93 8E BE 00 63 14 DF 01 6F 20 80 60 B7 0E 00 80 -93 8E 3E 00 63 14 DF 01 6F 20 80 5F B7 0E 00 80 -93 8E 7E 00 63 14 DF 01 6F 20 80 5E 93 0E 50 00 +93 8E BE 00 63 14 DF 01 6F 20 40 62 B7 0E 00 80 +93 8E 3E 00 63 14 DF 01 6F 20 40 61 B7 0E 00 80 +93 8E 7E 00 63 14 DF 01 6F 20 40 60 93 0E 50 00 63 0A DF 19 93 0E 70 00 63 06 DF 19 93 0E 10 00 63 02 DF 19 93 0E 40 00 63 0E DF 17 93 0E 60 00 63 0A DF 17 93 0E 00 00 63 06 DF 17 13 0F 00 00 @@ -29,7 +29,7 @@ B7 02 00 80 93 82 F2 FF 73 90 02 3B 93 02 F0 01 63 8A 02 00 73 90 52 10 B7 B2 00 00 93 82 92 10 73 90 22 30 73 50 00 30 97 02 00 00 93 82 42 01 73 90 12 34 73 25 40 F1 73 00 20 30 6F 00 00 02 -93 8F 1F 00 73 00 10 00 6F 20 80 44 93 8F 1F 00 +93 8F 1F 00 73 00 10 00 6F 20 40 46 93 8F 1F 00 73 00 10 00 13 04 14 00 73 00 20 30 93 08 00 00 73 00 00 00 93 08 10 00 73 00 00 00 93 04 00 00 13 09 00 01 33 85 04 00 B7 05 10 00 13 06 00 00 @@ -79,7 +79,7 @@ E3 9C 24 F9 13 05 00 00 93 05 00 00 37 06 04 00 73 10 40 3B 73 10 50 3B 73 10 60 3B 73 10 70 3B 73 10 80 3B 73 10 90 3B 73 10 A0 3B 73 10 B0 3B 73 10 C0 3B 73 10 D0 3B 73 10 E0 3B 73 10 F0 3B -6F 00 00 5E 93 02 00 00 B7 0E 00 00 93 8E FE FF +6F 00 C0 5F 93 02 00 00 B7 0E 00 00 93 8E FE FF 73 90 0E 3B 73 2F 00 3B 63 84 EE 01 6F E0 CF B4 73 10 00 3B B7 0E 00 00 93 8E FE FF 73 90 1E 3B 73 2F 10 3B 63 84 EE 01 6F E0 0F B3 73 10 10 3B @@ -114,15 +114,15 @@ B7 0E 00 00 93 8E FE FF 73 90 EE 3B 73 2F E0 3B B7 7E 77 77 93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 63 84 EE 01 6F E0 4F 95 73 10 20 3A B7 7E 77 77 93 8E 7E 77 73 90 3E 3A 73 2F 30 3A 63 84 EE 01 -6F E0 8F 93 73 10 30 3A 6F 00 80 3A 37 0F 00 00 +6F E0 8F 93 73 10 30 3A 6F 00 40 3C 37 0F 00 00 13 0F 0F 08 F3 2E 00 30 B3 EE EE 01 73 90 0E 30 37 1F 00 00 13 0F 0F 80 F3 2E 40 30 B3 EE EE 01 -73 90 4E 30 6F 00 C0 37 F3 22 00 3A 13 03 F0 0F +73 90 4E 30 6F 00 80 39 F3 22 00 3A 13 03 F0 0F 93 D2 82 00 B3 F2 62 00 63 96 D2 00 13 05 00 00 -6F 00 00 36 13 05 10 00 6F 00 80 35 F3 22 00 30 +6F 00 C0 37 13 05 10 00 6F 00 40 37 F3 22 00 30 63 1A 05 00 37 03 FE FF 13 03 F3 FF B3 F2 62 00 6F 00 C0 00 37 03 02 00 B3 E2 62 00 73 90 02 30 -6F 00 00 33 03 20 05 00 13 00 00 00 13 00 00 00 +6F 00 C0 34 03 20 05 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 23 20 05 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 @@ -131,7 +131,7 @@ B7 7E 77 77 93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 13 06 F6 FF 13 56 36 00 93 D5 25 00 B3 E5 C5 00 6F 00 80 00 93 D5 25 00 93 02 40 00 63 40 55 02 93 02 80 00 63 40 55 0A 93 02 C0 00 63 40 55 12 -93 02 00 01 63 40 55 1A 6F 00 80 29 73 23 00 3A +93 02 00 01 63 40 55 1A 6F 00 40 2B 73 23 00 3A 93 02 00 00 63 8E A2 00 93 02 10 00 63 82 A2 02 93 02 20 00 63 8A A2 02 93 02 30 00 63 82 A2 04 73 90 05 3B 93 02 00 F0 33 73 53 00 6F 00 C0 04 @@ -140,7 +140,7 @@ B7 7E 77 77 93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 35 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 03 3A -6F 00 00 21 73 23 10 3A 93 02 40 00 63 8E A2 00 +6F 00 C0 22 73 23 10 3A 93 02 40 00 63 8E A2 00 93 02 50 00 63 82 A2 02 93 02 60 00 63 8A A2 02 93 02 70 00 63 82 A2 04 73 90 45 3B 93 02 00 F0 33 73 53 00 6F 00 C0 04 73 90 55 3B B7 02 FF FF @@ -148,7 +148,7 @@ B7 7E 77 77 93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 73 90 65 3B B7 02 01 FF 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 75 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 -33 63 D3 00 73 10 13 3A 6F 00 80 18 73 23 20 3A +33 63 D3 00 73 10 13 3A 6F 00 40 1A 73 23 20 3A 93 02 80 00 63 8E A2 00 93 02 90 00 63 82 A2 02 93 02 A0 00 63 8A A2 02 93 02 B0 00 63 82 A2 04 73 90 85 3B 93 02 00 F0 33 73 53 00 6F 00 C0 04 @@ -157,7 +157,7 @@ B7 7E 77 77 93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 B5 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 23 3A -6F 00 00 10 73 23 30 3A 93 02 C0 00 63 8E A2 00 +6F 00 C0 11 73 23 30 3A 93 02 C0 00 63 8E A2 00 93 02 D0 00 63 82 A2 02 93 02 E0 00 63 8A A2 02 93 02 F0 00 63 82 A2 04 73 90 C5 3B 93 02 00 F0 33 73 53 00 6F 00 C0 04 73 90 D5 3B B7 02 FF FF @@ -165,13 +165,15 @@ B7 7E 77 77 93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 73 90 E5 3B B7 02 01 FF 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 F5 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 -33 63 D3 00 73 10 33 3A 6F 00 80 07 93 02 00 00 -63 08 57 06 93 02 80 00 E3 06 57 DA 93 02 00 01 +33 63 D3 00 73 10 33 3A 6F 00 40 09 93 02 00 00 +63 06 57 08 93 02 80 00 E3 06 57 DA 93 02 00 01 E3 08 57 D8 93 02 80 01 E3 04 57 D8 13 05 10 00 -6F 00 00 05 93 0E 00 00 E3 8C D8 A1 93 0E 10 00 -E3 82 D8 A7 93 0E 80 00 E3 82 D8 FD 93 0E 90 00 -E3 86 D8 C9 93 0E A0 00 E3 8A D8 CD 93 0E B0 00 -E3 8A D8 CF 93 0E C0 00 E3 88 D8 D1 93 0E D0 00 -E3 86 D8 D3 93 0E E0 00 E3 88 D8 C9 6F 00 40 00 -F3 2E 10 34 93 8E 4E 00 73 90 1E 34 73 00 20 30 -13 0A 1A 00 73 00 20 30 +6F 00 C0 06 63 06 A0 00 73 10 65 30 6F 00 00 06 +73 50 60 30 6F 00 80 05 93 0E 00 00 E3 82 D8 A1 +93 0E 10 00 E3 88 D8 A5 93 0E 80 00 E3 88 D8 FB +93 0E 90 00 E3 8C D8 C7 93 0E A0 00 E3 80 D8 CD +93 0E B0 00 E3 80 D8 CF 93 0E C0 00 E3 8E D8 CF +93 0E D0 00 E3 8C D8 D1 93 0E E0 00 E3 8E D8 C7 +93 0E F0 00 E3 80 D8 FB 6F 00 40 00 F3 2E 10 34 +93 8E 4E 00 73 90 1E 34 73 00 20 30 13 0A 1A 00 +73 00 20 30 diff --git a/test/priv_sec_testsuite/tests/rv32ui-p-test3.v b/test/priv_sec_testsuite/tests/rv32ui-p-test3.v index 06a0287..2babe9a 100755 --- a/test/priv_sec_testsuite/tests/rv32ui-p-test3.v +++ b/test/priv_sec_testsuite/tests/rv32ui-p-test3.v @@ -1,10 +1,10 @@ @00010000 6F 00 00 0B 73 2F 20 34 93 0E 80 00 63 14 DF 01 -6F 20 40 5D 93 0E 90 00 63 04 DF 1D 93 0E B0 00 +6F 20 80 5E 93 0E 90 00 63 04 DF 1D 93 0E B0 00 63 04 DF 1D 93 0E 20 00 63 02 DF 1D B7 0E 00 80 -93 8E BE 00 63 14 DF 01 6F 20 80 60 B7 0E 00 80 -93 8E 3E 00 63 14 DF 01 6F 20 80 5F B7 0E 00 80 -93 8E 7E 00 63 14 DF 01 6F 20 80 5E 93 0E 50 00 +93 8E BE 00 63 14 DF 01 6F 20 40 62 B7 0E 00 80 +93 8E 3E 00 63 14 DF 01 6F 20 40 61 B7 0E 00 80 +93 8E 7E 00 63 14 DF 01 6F 20 40 60 93 0E 50 00 63 0A DF 19 93 0E 70 00 63 06 DF 19 93 0E 10 00 63 02 DF 19 93 0E 40 00 63 0E DF 17 93 0E 60 00 63 0A DF 17 93 0E 00 00 63 06 DF 17 13 0F 00 00 @@ -29,7 +29,7 @@ B7 02 00 80 93 82 F2 FF 73 90 02 3B 93 02 F0 01 63 8A 02 00 73 90 52 10 B7 B2 00 00 93 82 92 10 73 90 22 30 73 50 00 30 97 02 00 00 93 82 42 01 73 90 12 34 73 25 40 F1 73 00 20 30 6F 00 40 05 -93 8F 1F 00 73 00 10 00 6F 20 80 44 93 8F 1F 00 +93 8F 1F 00 73 00 10 00 6F 20 40 46 93 8F 1F 00 73 00 10 00 73 24 20 34 93 02 50 00 63 0A 54 00 93 02 70 00 63 06 54 00 93 02 10 00 63 04 54 00 73 00 20 30 13 09 19 00 93 02 10 00 63 82 22 01 @@ -67,7 +67,7 @@ E3 94 62 FE 67 80 00 00 63 14 30 02 0F 00 F0 0F 73 10 40 3B 73 10 50 3B 73 10 60 3B 73 10 70 3B 73 10 80 3B 73 10 90 3B 73 10 A0 3B 73 10 B0 3B 73 10 C0 3B 73 10 D0 3B 73 10 E0 3B 73 10 F0 3B -6F 00 00 5E 93 02 00 00 B7 0E 00 00 93 8E FE FF +6F 00 C0 5F 93 02 00 00 B7 0E 00 00 93 8E FE FF 73 90 0E 3B 73 2F 00 3B 63 84 EE 01 6F E0 0F AB 73 10 00 3B B7 0E 00 00 93 8E FE FF 73 90 1E 3B 73 2F 10 3B 63 84 EE 01 6F E0 4F A9 73 10 10 3B @@ -102,15 +102,15 @@ B7 0E 00 00 93 8E FE FF 73 90 EE 3B 73 2F E0 3B B7 7E 77 77 93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 63 84 EE 01 6F E0 8F 8B 73 10 20 3A B7 7E 77 77 93 8E 7E 77 73 90 3E 3A 73 2F 30 3A 63 84 EE 01 -6F E0 CF 89 73 10 30 3A 6F 00 80 3A 37 0F 00 00 +6F E0 CF 89 73 10 30 3A 6F 00 40 3C 37 0F 00 00 13 0F 0F 08 F3 2E 00 30 B3 EE EE 01 73 90 0E 30 37 1F 00 00 13 0F 0F 80 F3 2E 40 30 B3 EE EE 01 -73 90 4E 30 6F 00 C0 37 F3 22 00 3A 13 03 F0 0F +73 90 4E 30 6F 00 80 39 F3 22 00 3A 13 03 F0 0F 93 D2 82 00 B3 F2 62 00 63 96 D2 00 13 05 00 00 -6F 00 00 36 13 05 10 00 6F 00 80 35 F3 22 00 30 +6F 00 C0 37 13 05 10 00 6F 00 40 37 F3 22 00 30 63 1A 05 00 37 03 FE FF 13 03 F3 FF B3 F2 62 00 6F 00 C0 00 37 03 02 00 B3 E2 62 00 73 90 02 30 -6F 00 00 33 03 20 05 00 13 00 00 00 13 00 00 00 +6F 00 C0 34 03 20 05 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 23 20 05 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 @@ -119,7 +119,7 @@ B7 7E 77 77 93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 13 06 F6 FF 13 56 36 00 93 D5 25 00 B3 E5 C5 00 6F 00 80 00 93 D5 25 00 93 02 40 00 63 40 55 02 93 02 80 00 63 40 55 0A 93 02 C0 00 63 40 55 12 -93 02 00 01 63 40 55 1A 6F 00 80 29 73 23 00 3A +93 02 00 01 63 40 55 1A 6F 00 40 2B 73 23 00 3A 93 02 00 00 63 8E A2 00 93 02 10 00 63 82 A2 02 93 02 20 00 63 8A A2 02 93 02 30 00 63 82 A2 04 73 90 05 3B 93 02 00 F0 33 73 53 00 6F 00 C0 04 @@ -128,7 +128,7 @@ B7 7E 77 77 93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 35 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 03 3A -6F 00 00 21 73 23 10 3A 93 02 40 00 63 8E A2 00 +6F 00 C0 22 73 23 10 3A 93 02 40 00 63 8E A2 00 93 02 50 00 63 82 A2 02 93 02 60 00 63 8A A2 02 93 02 70 00 63 82 A2 04 73 90 45 3B 93 02 00 F0 33 73 53 00 6F 00 C0 04 73 90 55 3B B7 02 FF FF @@ -136,7 +136,7 @@ B7 7E 77 77 93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 73 90 65 3B B7 02 01 FF 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 75 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 -33 63 D3 00 73 10 13 3A 6F 00 80 18 73 23 20 3A +33 63 D3 00 73 10 13 3A 6F 00 40 1A 73 23 20 3A 93 02 80 00 63 8E A2 00 93 02 90 00 63 82 A2 02 93 02 A0 00 63 8A A2 02 93 02 B0 00 63 82 A2 04 73 90 85 3B 93 02 00 F0 33 73 53 00 6F 00 C0 04 @@ -145,7 +145,7 @@ B7 7E 77 77 93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 B5 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 23 3A -6F 00 00 10 73 23 30 3A 93 02 C0 00 63 8E A2 00 +6F 00 C0 11 73 23 30 3A 93 02 C0 00 63 8E A2 00 93 02 D0 00 63 82 A2 02 93 02 E0 00 63 8A A2 02 93 02 F0 00 63 82 A2 04 73 90 C5 3B 93 02 00 F0 33 73 53 00 6F 00 C0 04 73 90 D5 3B B7 02 FF FF @@ -153,13 +153,15 @@ B7 7E 77 77 93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 73 90 E5 3B B7 02 01 FF 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 F5 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 -33 63 D3 00 73 10 33 3A 6F 00 80 07 93 02 00 00 -63 08 57 06 93 02 80 00 E3 06 57 DA 93 02 00 01 +33 63 D3 00 73 10 33 3A 6F 00 40 09 93 02 00 00 +63 06 57 08 93 02 80 00 E3 06 57 DA 93 02 00 01 E3 08 57 D8 93 02 80 01 E3 04 57 D8 13 05 10 00 -6F 00 00 05 93 0E 00 00 E3 8C D8 A1 93 0E 10 00 -E3 82 D8 A7 93 0E 80 00 E3 82 D8 FD 93 0E 90 00 -E3 86 D8 C9 93 0E A0 00 E3 8A D8 CD 93 0E B0 00 -E3 8A D8 CF 93 0E C0 00 E3 88 D8 D1 93 0E D0 00 -E3 86 D8 D3 93 0E E0 00 E3 88 D8 C9 6F 00 40 00 -F3 2E 10 34 93 8E 4E 00 73 90 1E 34 73 00 20 30 -13 0A 1A 00 73 00 20 30 +6F 00 C0 06 63 06 A0 00 73 10 65 30 6F 00 00 06 +73 50 60 30 6F 00 80 05 93 0E 00 00 E3 82 D8 A1 +93 0E 10 00 E3 88 D8 A5 93 0E 80 00 E3 88 D8 FB +93 0E 90 00 E3 8C D8 C7 93 0E A0 00 E3 80 D8 CD +93 0E B0 00 E3 80 D8 CF 93 0E C0 00 E3 8E D8 CF +93 0E D0 00 E3 8C D8 D1 93 0E E0 00 E3 8E D8 C7 +93 0E F0 00 E3 80 D8 FB 6F 00 40 00 F3 2E 10 34 +93 8E 4E 00 73 90 1E 34 73 00 20 30 13 0A 1A 00 +73 00 20 30 diff --git a/test/priv_sec_testsuite/tests/rv32ui-p-test4.v b/test/priv_sec_testsuite/tests/rv32ui-p-test4.v index 55768a1..0761f58 100755 --- a/test/priv_sec_testsuite/tests/rv32ui-p-test4.v +++ b/test/priv_sec_testsuite/tests/rv32ui-p-test4.v @@ -1,10 +1,10 @@ @00010000 6F 00 00 0B 73 2F 20 34 93 0E 80 00 63 14 DF 01 -6F 20 40 5D 93 0E 90 00 63 04 DF 1D 93 0E B0 00 +6F 20 80 5E 93 0E 90 00 63 04 DF 1D 93 0E B0 00 63 04 DF 1D 93 0E 20 00 63 02 DF 1D B7 0E 00 80 -93 8E BE 00 63 14 DF 01 6F 20 80 60 B7 0E 00 80 -93 8E 3E 00 63 14 DF 01 6F 20 80 5F B7 0E 00 80 -93 8E 7E 00 63 14 DF 01 6F 20 80 5E 93 0E 50 00 +93 8E BE 00 63 14 DF 01 6F 20 40 62 B7 0E 00 80 +93 8E 3E 00 63 14 DF 01 6F 20 40 61 B7 0E 00 80 +93 8E 7E 00 63 14 DF 01 6F 20 40 60 93 0E 50 00 63 0A DF 19 93 0E 70 00 63 06 DF 19 93 0E 10 00 63 02 DF 19 93 0E 40 00 63 0E DF 17 93 0E 60 00 63 0A DF 17 93 0E 00 00 63 06 DF 17 13 0F 00 00 @@ -29,7 +29,7 @@ B7 02 00 80 93 82 F2 FF 73 90 02 3B 93 02 F0 01 63 8A 02 00 73 90 52 10 B7 B2 00 00 93 82 92 10 73 90 22 30 73 50 00 30 97 02 00 00 93 82 42 01 73 90 12 34 73 25 40 F1 73 00 20 30 6F 00 00 08 -93 8F 1F 00 73 00 10 00 6F 20 80 44 93 8F 1F 00 +93 8F 1F 00 73 00 10 00 6F 20 40 46 93 8F 1F 00 73 00 10 00 73 24 20 34 93 02 50 00 63 0A 54 00 93 02 70 00 63 02 54 02 93 02 10 00 63 0A 54 02 13 09 19 00 13 05 50 00 97 02 00 00 93 82 82 09 @@ -75,7 +75,7 @@ B7 02 00 80 93 82 F2 FF 73 90 02 3B 93 02 F0 01 73 10 40 3B 73 10 50 3B 73 10 60 3B 73 10 70 3B 73 10 80 3B 73 10 90 3B 73 10 A0 3B 73 10 B0 3B 73 10 C0 3B 73 10 D0 3B 73 10 E0 3B 73 10 F0 3B -6F 00 00 5E 93 02 00 00 B7 0E 00 00 93 8E FE FF +6F 00 C0 5F 93 02 00 00 B7 0E 00 00 93 8E FE FF 73 90 0E 3B 73 2F 00 3B 63 84 EE 01 6F E0 4F B1 73 10 00 3B B7 0E 00 00 93 8E FE FF 73 90 1E 3B 73 2F 10 3B 63 84 EE 01 6F E0 8F AF 73 10 10 3B @@ -110,15 +110,15 @@ B7 0E 00 00 93 8E FE FF 73 90 EE 3B 73 2F E0 3B B7 7E 77 77 93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 63 84 EE 01 6F E0 CF 91 73 10 20 3A B7 7E 77 77 93 8E 7E 77 73 90 3E 3A 73 2F 30 3A 63 84 EE 01 -6F E0 0F 90 73 10 30 3A 6F 00 80 3A 37 0F 00 00 +6F E0 0F 90 73 10 30 3A 6F 00 40 3C 37 0F 00 00 13 0F 0F 08 F3 2E 00 30 B3 EE EE 01 73 90 0E 30 37 1F 00 00 13 0F 0F 80 F3 2E 40 30 B3 EE EE 01 -73 90 4E 30 6F 00 C0 37 F3 22 00 3A 13 03 F0 0F +73 90 4E 30 6F 00 80 39 F3 22 00 3A 13 03 F0 0F 93 D2 82 00 B3 F2 62 00 63 96 D2 00 13 05 00 00 -6F 00 00 36 13 05 10 00 6F 00 80 35 F3 22 00 30 +6F 00 C0 37 13 05 10 00 6F 00 40 37 F3 22 00 30 63 1A 05 00 37 03 FE FF 13 03 F3 FF B3 F2 62 00 6F 00 C0 00 37 03 02 00 B3 E2 62 00 73 90 02 30 -6F 00 00 33 03 20 05 00 13 00 00 00 13 00 00 00 +6F 00 C0 34 03 20 05 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 23 20 05 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 @@ -127,7 +127,7 @@ B7 7E 77 77 93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 13 06 F6 FF 13 56 36 00 93 D5 25 00 B3 E5 C5 00 6F 00 80 00 93 D5 25 00 93 02 40 00 63 40 55 02 93 02 80 00 63 40 55 0A 93 02 C0 00 63 40 55 12 -93 02 00 01 63 40 55 1A 6F 00 80 29 73 23 00 3A +93 02 00 01 63 40 55 1A 6F 00 40 2B 73 23 00 3A 93 02 00 00 63 8E A2 00 93 02 10 00 63 82 A2 02 93 02 20 00 63 8A A2 02 93 02 30 00 63 82 A2 04 73 90 05 3B 93 02 00 F0 33 73 53 00 6F 00 C0 04 @@ -136,7 +136,7 @@ B7 7E 77 77 93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 35 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 03 3A -6F 00 00 21 73 23 10 3A 93 02 40 00 63 8E A2 00 +6F 00 C0 22 73 23 10 3A 93 02 40 00 63 8E A2 00 93 02 50 00 63 82 A2 02 93 02 60 00 63 8A A2 02 93 02 70 00 63 82 A2 04 73 90 45 3B 93 02 00 F0 33 73 53 00 6F 00 C0 04 73 90 55 3B B7 02 FF FF @@ -144,7 +144,7 @@ B7 7E 77 77 93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 73 90 65 3B B7 02 01 FF 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 75 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 -33 63 D3 00 73 10 13 3A 6F 00 80 18 73 23 20 3A +33 63 D3 00 73 10 13 3A 6F 00 40 1A 73 23 20 3A 93 02 80 00 63 8E A2 00 93 02 90 00 63 82 A2 02 93 02 A0 00 63 8A A2 02 93 02 B0 00 63 82 A2 04 73 90 85 3B 93 02 00 F0 33 73 53 00 6F 00 C0 04 @@ -153,7 +153,7 @@ B7 7E 77 77 93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 B5 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 23 3A -6F 00 00 10 73 23 30 3A 93 02 C0 00 63 8E A2 00 +6F 00 C0 11 73 23 30 3A 93 02 C0 00 63 8E A2 00 93 02 D0 00 63 82 A2 02 93 02 E0 00 63 8A A2 02 93 02 F0 00 63 82 A2 04 73 90 C5 3B 93 02 00 F0 33 73 53 00 6F 00 C0 04 73 90 D5 3B B7 02 FF FF @@ -161,13 +161,15 @@ B7 7E 77 77 93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 73 90 E5 3B B7 02 01 FF 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 F5 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 -33 63 D3 00 73 10 33 3A 6F 00 80 07 93 02 00 00 -63 08 57 06 93 02 80 00 E3 06 57 DA 93 02 00 01 +33 63 D3 00 73 10 33 3A 6F 00 40 09 93 02 00 00 +63 06 57 08 93 02 80 00 E3 06 57 DA 93 02 00 01 E3 08 57 D8 93 02 80 01 E3 04 57 D8 13 05 10 00 -6F 00 00 05 93 0E 00 00 E3 8C D8 A1 93 0E 10 00 -E3 82 D8 A7 93 0E 80 00 E3 82 D8 FD 93 0E 90 00 -E3 86 D8 C9 93 0E A0 00 E3 8A D8 CD 93 0E B0 00 -E3 8A D8 CF 93 0E C0 00 E3 88 D8 D1 93 0E D0 00 -E3 86 D8 D3 93 0E E0 00 E3 88 D8 C9 6F 00 40 00 -F3 2E 10 34 93 8E 4E 00 73 90 1E 34 73 00 20 30 -13 0A 1A 00 73 00 20 30 +6F 00 C0 06 63 06 A0 00 73 10 65 30 6F 00 00 06 +73 50 60 30 6F 00 80 05 93 0E 00 00 E3 82 D8 A1 +93 0E 10 00 E3 88 D8 A5 93 0E 80 00 E3 88 D8 FB +93 0E 90 00 E3 8C D8 C7 93 0E A0 00 E3 80 D8 CD +93 0E B0 00 E3 80 D8 CF 93 0E C0 00 E3 8E D8 CF +93 0E D0 00 E3 8C D8 D1 93 0E E0 00 E3 8E D8 C7 +93 0E F0 00 E3 80 D8 FB 6F 00 40 00 F3 2E 10 34 +93 8E 4E 00 73 90 1E 34 73 00 20 30 13 0A 1A 00 +73 00 20 30 diff --git a/test/priv_sec_testsuite/tests/rv32ui-p-test5.v b/test/priv_sec_testsuite/tests/rv32ui-p-test5.v new file mode 100755 index 0000000..0761f58 --- /dev/null +++ b/test/priv_sec_testsuite/tests/rv32ui-p-test5.v @@ -0,0 +1,175 @@ +@00010000 +6F 00 00 0B 73 2F 20 34 93 0E 80 00 63 14 DF 01 +6F 20 80 5E 93 0E 90 00 63 04 DF 1D 93 0E B0 00 +63 04 DF 1D 93 0E 20 00 63 02 DF 1D B7 0E 00 80 +93 8E BE 00 63 14 DF 01 6F 20 40 62 B7 0E 00 80 +93 8E 3E 00 63 14 DF 01 6F 20 40 61 B7 0E 00 80 +93 8E 7E 00 63 14 DF 01 6F 20 40 60 93 0E 50 00 +63 0A DF 19 93 0E 70 00 63 06 DF 19 93 0E 10 00 +63 02 DF 19 93 0E 40 00 63 0E DF 17 93 0E 60 00 +63 0A DF 17 93 0E 00 00 63 06 DF 17 13 0F 00 00 +63 04 0F 00 67 00 0F 00 73 2F 20 34 63 54 0F 00 +6F 00 40 00 93 E1 91 53 17 1F 00 00 23 2C 3F F4 +93 00 00 00 13 01 00 00 93 01 00 00 13 02 00 00 +93 02 00 00 13 03 00 00 93 03 00 00 13 04 00 00 +93 04 00 00 13 05 00 00 93 05 00 00 13 06 00 00 +93 06 00 00 13 07 00 00 93 07 00 00 13 08 00 00 +93 08 00 00 13 09 00 00 93 09 00 00 13 0A 00 00 +93 0A 00 00 13 0B 00 00 93 0B 00 00 13 0C 00 00 +93 0C 00 00 13 0D 00 00 93 0D 00 00 13 0E 00 00 +93 0E 00 00 13 0F 00 00 93 0F 00 00 73 25 40 F1 +63 10 05 00 97 02 00 00 93 82 02 01 73 90 52 30 +73 50 00 18 97 02 00 00 93 82 02 02 73 90 52 30 +B7 02 00 80 93 82 F2 FF 73 90 02 3B 93 02 F0 01 +73 90 02 3A 73 50 40 30 97 02 00 00 93 82 42 01 +73 90 52 30 73 50 20 30 73 50 30 30 93 01 00 00 +97 02 00 00 93 82 42 E8 73 90 52 30 13 05 10 00 +13 15 F5 01 63 4C 05 00 0F 00 F0 0F 93 01 10 00 +93 08 D0 05 13 05 00 00 73 00 10 00 93 02 00 00 +63 8A 02 00 73 90 52 10 B7 B2 00 00 93 82 92 10 +73 90 22 30 73 50 00 30 97 02 00 00 93 82 42 01 +73 90 12 34 73 25 40 F1 73 00 20 30 6F 00 00 08 +93 8F 1F 00 73 00 10 00 6F 20 40 46 93 8F 1F 00 +73 00 10 00 73 24 20 34 93 02 50 00 63 0A 54 00 +93 02 70 00 63 02 54 02 93 02 10 00 63 0A 54 02 +13 09 19 00 13 05 50 00 97 02 00 00 93 82 82 09 +73 90 12 34 6F 00 40 03 13 09 19 00 13 05 70 00 +97 02 00 00 93 82 C2 0B 73 90 12 34 6F 00 C0 01 +13 09 19 00 13 05 10 00 97 02 00 00 93 82 C2 0E +73 90 12 34 6F 00 40 00 73 00 20 30 13 05 00 00 +93 05 00 00 37 06 04 00 93 06 F0 01 13 07 80 01 +93 08 80 00 73 00 00 00 13 04 00 00 13 05 10 00 +93 08 A0 00 73 00 00 00 13 05 10 00 B7 05 04 00 +37 06 04 00 93 06 C0 01 13 07 80 01 93 08 80 00 +73 00 00 00 37 05 04 00 93 08 B0 00 73 00 00 00 +93 02 50 00 63 16 A4 0C 93 02 10 00 63 12 59 0C +13 00 00 00 13 05 10 00 B7 05 04 00 37 06 04 00 +93 06 90 01 13 07 80 01 93 08 80 00 73 00 00 00 +37 05 04 00 93 08 C0 00 73 00 00 00 93 02 70 00 +63 18 A4 08 93 02 20 00 63 14 59 08 13 00 00 00 +13 05 10 00 B7 05 04 00 37 06 04 00 93 06 B0 09 +13 07 80 01 93 08 80 00 73 00 00 00 93 02 30 01 +37 03 04 00 23 20 53 00 37 05 04 00 93 08 D0 00 +73 00 00 00 93 02 10 00 63 14 A4 04 93 02 30 00 +63 10 59 04 13 00 00 00 13 05 10 00 B7 05 04 00 +13 06 00 02 93 06 F0 01 13 07 80 01 93 08 80 00 +73 00 00 00 13 05 F0 01 93 08 E0 00 73 00 00 00 +93 02 10 00 63 16 55 00 6F 00 C0 02 63 14 30 02 +0F 00 F0 0F 63 80 01 00 93 91 11 00 93 E1 11 00 +93 08 D0 05 13 85 01 00 93 8F 1F 00 73 00 10 00 +73 00 10 00 0F 00 F0 0F 93 01 10 00 93 08 D0 05 +13 05 00 00 73 00 10 00 73 00 10 00 73 10 00 C0 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 +@00011000 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 +@00012000 +73 10 00 3A 73 10 10 3A 73 10 20 3A 73 10 30 3A +73 10 00 3B 73 10 10 3B 73 10 20 3B 73 10 30 3B +73 10 40 3B 73 10 50 3B 73 10 60 3B 73 10 70 3B +73 10 80 3B 73 10 90 3B 73 10 A0 3B 73 10 B0 3B +73 10 C0 3B 73 10 D0 3B 73 10 E0 3B 73 10 F0 3B +6F 00 C0 5F 93 02 00 00 B7 0E 00 00 93 8E FE FF +73 90 0E 3B 73 2F 00 3B 63 84 EE 01 6F E0 4F B1 +73 10 00 3B B7 0E 00 00 93 8E FE FF 73 90 1E 3B +73 2F 10 3B 63 84 EE 01 6F E0 8F AF 73 10 10 3B +B7 0E 00 00 93 8E FE FF 73 90 2E 3B 73 2F 20 3B +63 84 EE 01 6F E0 CF AD 73 10 20 3B B7 0E 00 00 +93 8E FE FF 73 90 3E 3B 73 2F 30 3B 63 84 EE 01 +6F E0 0F AC 73 10 30 3B B7 0E 00 00 93 8E FE FF +73 90 4E 3B 73 2F 40 3B 63 84 EE 01 6F E0 4F AA +73 10 40 3B B7 0E 00 00 93 8E FE FF 73 90 5E 3B +73 2F 50 3B 63 84 EE 01 6F E0 8F A8 73 10 50 3B +B7 0E 00 00 93 8E FE FF 73 90 6E 3B 73 2F 60 3B +63 84 EE 01 6F E0 CF A6 73 10 60 3B B7 0E 00 00 +93 8E FE FF 73 90 7E 3B 73 2F 70 3B 63 84 EE 01 +6F E0 0F A5 73 10 70 3B B7 0E 00 00 93 8E FE FF +73 90 8E 3B 73 2F 80 3B 63 84 EE 01 6F E0 4F A3 +73 10 80 3B B7 0E 00 00 93 8E FE FF 73 90 9E 3B +73 2F 90 3B 63 84 EE 01 6F E0 8F A1 73 10 90 3B +B7 0E 00 00 93 8E FE FF 73 90 AE 3B 73 2F A0 3B +63 84 EE 01 6F E0 CF 9F 73 10 A0 3B B7 0E 00 00 +93 8E FE FF 73 90 BE 3B 73 2F B0 3B 63 84 EE 01 +6F E0 0F 9E 73 10 B0 3B B7 0E 00 00 93 8E FE FF +73 90 CE 3B 73 2F C0 3B 63 84 EE 01 6F E0 4F 9C +73 10 C0 3B B7 0E 00 00 93 8E FE FF 73 90 DE 3B +73 2F D0 3B 63 84 EE 01 6F E0 8F 9A 73 10 D0 3B +B7 0E 00 00 93 8E FE FF 73 90 EE 3B 73 2F E0 3B +63 84 EE 01 6F E0 CF 98 73 10 E0 3B B7 0E 00 00 +93 8E FE FF 73 90 FE 3B 73 2F F0 3B 63 84 EE 01 +6F E0 0F 97 73 10 F0 3B B7 7E 77 77 93 8E 7E 77 +73 90 0E 3A 73 2F 00 3A 63 84 EE 01 6F E0 4F 95 +73 10 00 3A B7 7E 77 77 93 8E 7E 77 73 90 1E 3A +73 2F 10 3A 63 84 EE 01 6F E0 8F 93 73 10 10 3A +B7 7E 77 77 93 8E 7E 77 73 90 2E 3A 73 2F 20 3A +63 84 EE 01 6F E0 CF 91 73 10 20 3A B7 7E 77 77 +93 8E 7E 77 73 90 3E 3A 73 2F 30 3A 63 84 EE 01 +6F E0 0F 90 73 10 30 3A 6F 00 40 3C 37 0F 00 00 +13 0F 0F 08 F3 2E 00 30 B3 EE EE 01 73 90 0E 30 +37 1F 00 00 13 0F 0F 80 F3 2E 40 30 B3 EE EE 01 +73 90 4E 30 6F 00 80 39 F3 22 00 3A 13 03 F0 0F +93 D2 82 00 B3 F2 62 00 63 96 D2 00 13 05 00 00 +6F 00 C0 37 13 05 10 00 6F 00 40 37 F3 22 00 30 +63 1A 05 00 37 03 FE FF 13 03 F3 FF B3 F2 62 00 +6F 00 C0 00 37 03 02 00 B3 E2 62 00 73 90 02 30 +6F 00 C0 34 03 20 05 00 13 00 00 00 13 00 00 00 +13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 +13 00 00 00 13 00 00 00 23 20 05 00 13 00 00 00 +13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 +13 00 00 00 13 00 00 00 13 00 00 00 67 00 05 00 +13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 +13 06 F6 FF 13 56 36 00 93 D5 25 00 B3 E5 C5 00 +6F 00 80 00 93 D5 25 00 93 02 40 00 63 40 55 02 +93 02 80 00 63 40 55 0A 93 02 C0 00 63 40 55 12 +93 02 00 01 63 40 55 1A 6F 00 40 2B 73 23 00 3A +93 02 00 00 63 8E A2 00 93 02 10 00 63 82 A2 02 +93 02 20 00 63 8A A2 02 93 02 30 00 63 82 A2 04 +73 90 05 3B 93 02 00 F0 33 73 53 00 6F 00 C0 04 +73 90 15 3B B7 02 FF FF 93 82 F2 0F 33 73 53 00 +93 96 86 00 6F 00 40 03 73 90 25 3B B7 02 01 FF +93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 +73 90 35 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 +93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 03 3A +6F 00 C0 22 73 23 10 3A 93 02 40 00 63 8E A2 00 +93 02 50 00 63 82 A2 02 93 02 60 00 63 8A A2 02 +93 02 70 00 63 82 A2 04 73 90 45 3B 93 02 00 F0 +33 73 53 00 6F 00 C0 04 73 90 55 3B B7 02 FF FF +93 82 F2 0F 33 73 53 00 93 96 86 00 6F 00 40 03 +73 90 65 3B B7 02 01 FF 93 82 F2 FF 33 73 53 00 +93 96 06 01 6F 00 C0 01 73 90 75 3B B7 02 00 01 +93 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 +33 63 D3 00 73 10 13 3A 6F 00 40 1A 73 23 20 3A +93 02 80 00 63 8E A2 00 93 02 90 00 63 82 A2 02 +93 02 A0 00 63 8A A2 02 93 02 B0 00 63 82 A2 04 +73 90 85 3B 93 02 00 F0 33 73 53 00 6F 00 C0 04 +73 90 95 3B B7 02 FF FF 93 82 F2 0F 33 73 53 00 +93 96 86 00 6F 00 40 03 73 90 A5 3B B7 02 01 FF +93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 +73 90 B5 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 +93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 23 3A +6F 00 C0 11 73 23 30 3A 93 02 C0 00 63 8E A2 00 +93 02 D0 00 63 82 A2 02 93 02 E0 00 63 8A A2 02 +93 02 F0 00 63 82 A2 04 73 90 C5 3B 93 02 00 F0 +33 73 53 00 6F 00 C0 04 73 90 D5 3B B7 02 FF FF +93 82 F2 0F 33 73 53 00 93 96 86 00 6F 00 40 03 +73 90 E5 3B B7 02 01 FF 93 82 F2 FF 33 73 53 00 +93 96 06 01 6F 00 C0 01 73 90 F5 3B B7 02 00 01 +93 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 +33 63 D3 00 73 10 33 3A 6F 00 40 09 93 02 00 00 +63 06 57 08 93 02 80 00 E3 06 57 DA 93 02 00 01 +E3 08 57 D8 93 02 80 01 E3 04 57 D8 13 05 10 00 +6F 00 C0 06 63 06 A0 00 73 10 65 30 6F 00 00 06 +73 50 60 30 6F 00 80 05 93 0E 00 00 E3 82 D8 A1 +93 0E 10 00 E3 88 D8 A5 93 0E 80 00 E3 88 D8 FB +93 0E 90 00 E3 8C D8 C7 93 0E A0 00 E3 80 D8 CD +93 0E B0 00 E3 80 D8 CF 93 0E C0 00 E3 8E D8 CF +93 0E D0 00 E3 8C D8 D1 93 0E E0 00 E3 8E D8 C7 +93 0E F0 00 E3 80 D8 FB 6F 00 40 00 F3 2E 10 34 +93 8E 4E 00 73 90 1E 34 73 00 20 30 13 0A 1A 00 +73 00 20 30 diff --git a/test/priv_sec_testsuite/tests/rv32ui-v-test2.v b/test/priv_sec_testsuite/tests/rv32ui-v-test2.v index ad8cdd5..dcccd4c 100755 --- a/test/priv_sec_testsuite/tests/rv32ui-v-test2.v +++ b/test/priv_sec_testsuite/tests/rv32ui-v-test2.v @@ -9,8 +9,8 @@ 13 0D 00 00 93 0D 00 00 13 0E 00 00 93 0E 00 00 13 0F 00 00 93 0F 00 00 97 02 00 00 93 82 02 F8 73 90 52 30 17 81 00 00 13 01 C1 ED F3 22 40 F1 -93 92 C2 00 33 01 51 00 73 10 01 34 EF 20 90 72 -17 35 00 00 13 05 85 F2 6F 20 00 74 83 22 45 08 +93 92 C2 00 33 01 51 00 73 10 01 34 EF 20 50 74 +17 35 00 00 13 05 45 F4 6F 20 00 74 83 22 45 08 73 90 12 14 83 20 45 00 03 21 85 00 83 21 C5 00 03 22 05 01 83 22 45 01 03 23 85 01 83 23 C5 01 03 24 05 02 83 24 45 02 83 25 C5 02 03 26 05 03 @@ -121,11 +121,11 @@ E3 9C 07 FD 73 90 08 10 93 97 26 00 B3 06 F6 00 63 94 E5 04 93 96 26 00 B3 06 D6 00 23 A0 F6 00 73 00 05 12 83 20 C1 00 13 01 01 01 67 80 00 00 93 E7 07 04 6F F0 1F FE 97 57 00 00 23 A4 07 AC -6F F0 1F F0 17 15 00 00 13 05 05 C9 EF F0 5F D0 -13 05 30 00 EF F0 5F D6 17 15 00 00 13 05 05 CC +6F F0 1F F0 17 15 00 00 13 05 C5 CA EF F0 5F D0 +13 05 30 00 EF F0 5F D6 17 15 00 00 13 05 C5 CD EF F0 1F CF 13 05 30 00 EF F0 1F D5 17 15 00 00 -13 05 45 CF EF F0 DF CD 13 05 30 00 EF F0 DF D3 -17 15 00 00 13 05 85 CF EF F0 9F CC 13 05 30 00 +13 05 05 D1 EF F0 DF CD 13 05 30 00 EF F0 DF D3 +17 15 00 00 13 05 45 D1 EF F0 9F CC 13 05 30 00 EF F0 9F D2 83 25 C5 08 13 01 01 FB 23 24 81 04 23 26 11 04 23 22 91 04 23 20 21 05 23 2E 31 03 23 2C 41 03 23 2A 51 03 23 28 61 03 23 26 71 03 @@ -139,14 +139,14 @@ EF F0 9F D2 83 25 C5 08 13 01 01 FB 23 24 81 04 03 2D 01 02 83 2D C1 01 13 01 01 05 6F D0 1F A8 03 27 45 08 93 77 37 00 63 98 07 08 EF 07 80 00 73 10 30 00 03 27 07 00 83 A7 07 00 63 0A F7 06 -13 05 10 04 97 15 00 00 93 85 05 C5 97 F6 FF FF +13 05 10 04 97 15 00 00 93 85 C5 C6 97 F6 FF FF 93 86 46 99 17 F6 FF FF 13 06 C6 9C 03 A7 06 00 83 A7 46 00 13 08 05 00 93 85 15 00 33 67 F7 00 B7 08 01 01 63 02 07 02 13 07 00 00 23 20 E6 00 93 07 00 00 23 22 F6 00 03 A7 06 00 83 A7 46 00 33 67 F7 00 E3 12 07 FE 03 C5 05 00 23 A0 06 01 23 A2 16 01 E3 1C 05 FA 13 05 30 00 EF F0 DF BE -13 05 10 00 EF F0 5F BE 17 15 00 00 13 05 05 C7 +13 05 10 00 EF F0 5F BE 17 15 00 00 13 05 C5 C8 EF F0 1F B7 13 05 30 00 EF F0 1F BD 03 29 85 02 37 1C 00 00 97 24 00 00 93 84 C4 90 97 3B 00 00 93 8B 4B 90 37 0B 04 00 B7 0A C0 FF 97 5D 00 00 @@ -160,10 +160,10 @@ EF F0 1F B7 13 05 30 00 EF F0 1F BD 03 29 85 02 93 FC 0C 08 83 25 C1 00 63 80 0C 04 37 16 00 00 13 05 0C 00 EF F0 DF 86 B3 87 84 00 73 10 0D 10 03 A7 0D 00 23 A0 07 00 E3 1E 07 F6 23 A0 FD 00 -23 20 FA 00 6F F0 9F F7 17 15 00 00 13 05 45 BB -EF F0 1F A9 6F F0 5F F0 17 15 00 00 13 05 C5 B4 +23 20 FA 00 6F F0 9F F7 17 15 00 00 13 05 05 BD +EF F0 1F A9 6F F0 5F F0 17 15 00 00 13 05 85 B6 EF F0 1F A8 13 05 30 00 EF F0 1F AE 17 15 00 00 -13 05 45 B0 EF F0 DF A6 13 05 30 00 EF F0 DF AC +13 05 05 B2 EF F0 DF A6 13 05 30 00 EF F0 DF AC 13 05 09 00 EF F0 5F AC F3 27 40 F1 63 96 07 16 17 46 00 00 13 06 06 80 93 57 C6 00 13 01 01 F6 93 97 A7 00 23 2E 11 08 23 2C 81 08 97 25 00 00 @@ -193,51 +193,51 @@ EF F0 CF F1 B7 07 00 80 33 04 F4 00 13 05 01 00 93 D6 17 00 B3 E6 D5 00 B3 C7 D7 00 93 97 E7 01 B3 75 F5 00 13 57 17 00 93 87 06 00 33 E7 E5 00 B3 F6 C7 00 93 F5 17 00 B3 86 06 01 E3 96 05 FC -03 A0 06 00 6F F0 9F FC 17 15 00 00 13 05 05 9D +03 A0 06 00 6F F0 9F FC 17 15 00 00 13 05 C5 9E EF F0 1F 88 13 05 30 00 EF F0 1F 8E 73 10 00 3A 73 10 10 3A 73 10 20 3A 73 10 30 3A 73 10 00 3B 73 10 10 3B 73 10 20 3B 73 10 30 3B 73 10 40 3B 73 10 50 3B 73 10 60 3B 73 10 70 3B 73 10 80 3B 73 10 90 3B 73 10 A0 3B 73 10 B0 3B 73 10 C0 3B -73 10 D0 3B 73 10 E0 3B 73 10 F0 3B 6F 00 00 59 +73 10 D0 3B 73 10 E0 3B 73 10 F0 3B 6F 00 C0 5A 93 02 00 00 B7 0E 00 00 93 8E FE FF 73 90 0E 3B -73 2F 00 3B 63 98 EE 77 73 10 00 3B B7 0E 00 00 -93 8E FE FF 73 90 1E 3B 73 2F 10 3B 63 9C EE 75 +73 2F 00 3B 63 96 EE 79 73 10 00 3B B7 0E 00 00 +93 8E FE FF 73 90 1E 3B 73 2F 10 3B 63 9A EE 77 73 10 10 3B B7 0E 00 00 93 8E FE FF 73 90 2E 3B -73 2F 20 3B 63 90 EE 75 73 10 20 3B B7 0E 00 00 -93 8E FE FF 73 90 3E 3B 73 2F 30 3B 63 94 EE 73 +73 2F 20 3B 63 9E EE 75 73 10 20 3B B7 0E 00 00 +93 8E FE FF 73 90 3E 3B 73 2F 30 3B 63 92 EE 75 73 10 30 3B B7 0E 00 00 93 8E FE FF 73 90 4E 3B -73 2F 40 3B 63 98 EE 71 73 10 40 3B B7 0E 00 00 -93 8E FE FF 73 90 5E 3B 73 2F 50 3B 63 9C EE 6F +73 2F 40 3B 63 96 EE 73 73 10 40 3B B7 0E 00 00 +93 8E FE FF 73 90 5E 3B 73 2F 50 3B 63 9A EE 71 73 10 50 3B B7 0E 00 00 93 8E FE FF 73 90 6E 3B -73 2F 60 3B 63 90 EE 6F 73 10 60 3B B7 0E 00 00 -93 8E FE FF 73 90 7E 3B 73 2F 70 3B 63 94 EE 6D +73 2F 60 3B 63 9E EE 6F 73 10 60 3B B7 0E 00 00 +93 8E FE FF 73 90 7E 3B 73 2F 70 3B 63 92 EE 6F 73 10 70 3B B7 0E 00 00 93 8E FE FF 73 90 8E 3B -73 2F 80 3B 63 98 EE 6B 73 10 80 3B B7 0E 00 00 -93 8E FE FF 73 90 9E 3B 73 2F 90 3B 63 9C EE 69 +73 2F 80 3B 63 96 EE 6D 73 10 80 3B B7 0E 00 00 +93 8E FE FF 73 90 9E 3B 73 2F 90 3B 63 9A EE 6B 73 10 90 3B B7 0E 00 00 93 8E FE FF 73 90 AE 3B -73 2F A0 3B 63 90 EE 69 73 10 A0 3B B7 0E 00 00 -93 8E FE FF 73 90 BE 3B 73 2F B0 3B 63 94 EE 67 +73 2F A0 3B 63 9E EE 69 73 10 A0 3B B7 0E 00 00 +93 8E FE FF 73 90 BE 3B 73 2F B0 3B 63 92 EE 69 73 10 B0 3B B7 0E 00 00 93 8E FE FF 73 90 CE 3B -73 2F C0 3B 63 98 EE 65 73 10 C0 3B B7 0E 00 00 -93 8E FE FF 73 90 DE 3B 73 2F D0 3B 63 9C EE 63 +73 2F C0 3B 63 96 EE 67 73 10 C0 3B B7 0E 00 00 +93 8E FE FF 73 90 DE 3B 73 2F D0 3B 63 9A EE 65 73 10 D0 3B B7 0E 00 00 93 8E FE FF 73 90 EE 3B -73 2F E0 3B 63 90 EE 63 73 10 E0 3B B7 0E 00 00 -93 8E FE FF 73 90 FE 3B 73 2F F0 3B 63 94 EE 61 +73 2F E0 3B 63 9E EE 63 73 10 E0 3B B7 0E 00 00 +93 8E FE FF 73 90 FE 3B 73 2F F0 3B 63 92 EE 63 73 10 F0 3B B7 7E 77 77 93 8E 7E 77 73 90 0E 3A -73 2F 00 3A 63 98 EE 5F 73 10 00 3A B7 7E 77 77 -93 8E 7E 77 73 90 1E 3A 73 2F 10 3A 63 9C EE 5D +73 2F 00 3A 63 96 EE 61 73 10 00 3A B7 7E 77 77 +93 8E 7E 77 73 90 1E 3A 73 2F 10 3A 63 9A EE 5F 73 10 10 3A B7 7E 77 77 93 8E 7E 77 73 90 2E 3A -73 2F 20 3A 63 90 EE 5D 73 10 20 3A B7 7E 77 77 -93 8E 7E 77 73 90 3E 3A 73 2F 30 3A 63 94 EE 5B -73 10 30 3A 6F 00 80 3A 37 0F 00 00 13 0F 0F 08 +73 2F 20 3A 63 9E EE 5D 73 10 20 3A B7 7E 77 77 +93 8E 7E 77 73 90 3E 3A 73 2F 30 3A 63 92 EE 5D +73 10 30 3A 6F 00 40 3C 37 0F 00 00 13 0F 0F 08 F3 2E 00 30 B3 EE EE 01 73 90 0E 30 37 1F 00 00 13 0F 0F 80 F3 2E 40 30 B3 EE EE 01 73 90 4E 30 -6F 00 C0 37 F3 22 00 3A 13 03 F0 0F 93 D2 82 00 -B3 F2 62 00 63 96 D2 00 13 05 00 00 6F 00 00 36 -13 05 10 00 6F 00 80 35 F3 22 00 30 63 1A 05 00 +6F 00 80 39 F3 22 00 3A 13 03 F0 0F 93 D2 82 00 +B3 F2 62 00 63 96 D2 00 13 05 00 00 6F 00 C0 37 +13 05 10 00 6F 00 40 37 F3 22 00 30 63 1A 05 00 37 03 FE FF 13 03 F3 FF B3 F2 62 00 6F 00 C0 00 -37 03 02 00 B3 E2 62 00 73 90 02 30 6F 00 00 33 +37 03 02 00 B3 E2 62 00 73 90 02 30 6F 00 C0 34 03 20 05 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 23 20 05 00 13 00 00 00 13 00 00 00 @@ -247,7 +247,7 @@ B3 F2 62 00 63 96 D2 00 13 05 00 00 6F 00 00 36 13 56 36 00 93 D5 25 00 B3 E5 C5 00 6F 00 80 00 93 D5 25 00 93 02 40 00 63 40 55 02 93 02 80 00 63 40 55 0A 93 02 C0 00 63 40 55 12 93 02 00 01 -63 40 55 1A 6F 00 80 29 73 23 00 3A 93 02 00 00 +63 40 55 1A 6F 00 40 2B 73 23 00 3A 93 02 00 00 63 8E A2 00 93 02 10 00 63 82 A2 02 93 02 20 00 63 8A A2 02 93 02 30 00 63 82 A2 04 73 90 05 3B 93 02 00 F0 33 73 53 00 6F 00 C0 04 73 90 15 3B @@ -255,7 +255,7 @@ B7 02 FF FF 93 82 F2 0F 33 73 53 00 93 96 86 00 6F 00 40 03 73 90 25 3B B7 02 01 FF 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 35 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 -6F 00 40 00 33 63 D3 00 73 10 03 3A 6F 00 00 21 +6F 00 40 00 33 63 D3 00 73 10 03 3A 6F 00 C0 22 73 23 10 3A 93 02 40 00 63 8E A2 00 93 02 50 00 63 82 A2 02 93 02 60 00 63 8A A2 02 93 02 70 00 63 82 A2 04 73 90 45 3B 93 02 00 F0 33 73 53 00 @@ -264,7 +264,7 @@ B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 B7 02 01 FF 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 75 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 -73 10 13 3A 6F 00 80 18 73 23 20 3A 93 02 80 00 +73 10 13 3A 6F 00 40 1A 73 23 20 3A 93 02 80 00 63 8E A2 00 93 02 90 00 63 82 A2 02 93 02 A0 00 63 8A A2 02 93 02 B0 00 63 82 A2 04 73 90 85 3B 93 02 00 F0 33 73 53 00 6F 00 C0 04 73 90 95 3B @@ -272,7 +272,7 @@ B7 02 FF FF 93 82 F2 0F 33 73 53 00 93 96 86 00 6F 00 40 03 73 90 A5 3B B7 02 01 FF 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 B5 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 -6F 00 40 00 33 63 D3 00 73 10 23 3A 6F 00 00 10 +6F 00 40 00 33 63 D3 00 73 10 23 3A 6F 00 C0 11 73 23 30 3A 93 02 C0 00 63 8E A2 00 93 02 D0 00 63 82 A2 02 93 02 E0 00 63 8A A2 02 93 02 F0 00 63 82 A2 04 73 90 C5 3B 93 02 00 F0 33 73 53 00 @@ -281,49 +281,50 @@ B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 B7 02 01 FF 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 F5 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 -73 10 33 3A 6F 00 80 07 93 02 00 00 63 08 57 06 +73 10 33 3A 6F 00 40 09 93 02 00 00 63 06 57 08 93 02 80 00 E3 06 57 DA 93 02 00 01 E3 08 57 D8 -93 02 80 01 E3 04 57 D8 13 05 10 00 6F 00 00 05 -93 0E 00 00 E3 84 D8 A7 93 0E 10 00 E3 8A D8 AB -93 0E 80 00 E3 82 D8 FD 93 0E 90 00 E3 86 D8 C9 -93 0E A0 00 E3 8A D8 CD 93 0E B0 00 E3 8A D8 CF -93 0E C0 00 E3 88 D8 D1 93 0E D0 00 E3 86 D8 D3 -93 0E E0 00 E3 88 D8 C9 6F 00 40 00 F3 2E 10 34 -93 8E 4E 00 73 90 1E 34 73 00 20 30 13 0A 1A 00 -73 00 20 30 67 80 00 00 6F 00 00 02 93 8F 1F 00 -73 00 10 00 6F F0 9F FD 93 8F 1F 00 73 00 10 00 -13 04 14 00 73 00 20 30 93 08 00 00 73 00 00 00 -93 08 10 00 73 00 00 00 93 04 00 00 13 09 00 01 -33 85 04 00 B7 05 10 00 13 06 00 00 93 06 F0 00 -13 07 80 00 93 08 80 00 73 00 00 00 EF 00 40 15 -B7 02 10 00 23 20 50 00 03 23 00 00 63 9C 62 16 -23 AE 52 FE 03 A3 C2 FF 63 96 62 16 B7 02 10 00 -23 A0 02 00 13 00 00 00 13 00 00 00 13 00 00 00 -93 02 10 00 63 18 54 14 93 08 00 00 73 00 00 00 -13 04 00 00 93 84 14 00 E3 9C 24 F9 93 04 00 00 -13 09 00 01 33 85 04 00 93 05 00 00 37 06 10 00 -93 06 F0 01 13 07 80 01 93 08 80 00 73 00 00 00 -EF 00 00 0E B7 02 10 00 23 20 50 00 03 23 00 00 -63 92 62 10 23 AE 52 FE 03 A3 C2 FF 63 9C 62 0E -B7 02 10 00 23 A0 02 00 13 00 00 00 13 00 00 00 -13 00 00 00 93 02 10 00 63 1E 54 0C 93 08 00 00 -73 00 00 00 13 04 00 00 93 84 14 00 E3 9C 24 F9 -13 05 00 00 93 05 00 00 37 06 04 00 93 06 F0 01 -13 07 80 01 93 08 80 00 73 00 00 00 13 05 10 00 -B7 05 08 00 13 06 40 00 93 06 70 01 13 07 00 01 -93 08 80 00 73 00 00 00 B7 02 08 00 23 A0 52 00 -03 A3 02 00 63 90 62 08 B7 02 08 00 23 AE 02 FE +93 02 80 01 E3 04 57 D8 13 05 10 00 6F 00 C0 06 +63 06 A0 00 73 10 65 30 6F 00 00 06 73 50 60 30 +6F 00 80 05 93 0E 00 00 E3 8A D8 A5 93 0E 10 00 +E3 80 D8 AB 93 0E 80 00 E3 88 D8 FB 93 0E 90 00 +E3 8C D8 C7 93 0E A0 00 E3 80 D8 CD 93 0E B0 00 +E3 80 D8 CF 93 0E C0 00 E3 8E D8 CF 93 0E D0 00 +E3 8C D8 D1 93 0E E0 00 E3 8E D8 C7 93 0E F0 00 +E3 80 D8 FB 6F 00 40 00 F3 2E 10 34 93 8E 4E 00 +73 90 1E 34 73 00 20 30 13 0A 1A 00 73 00 20 30 +67 80 00 00 6F 00 00 02 93 8F 1F 00 73 00 10 00 +6F F0 9F FD 93 8F 1F 00 73 00 10 00 13 04 14 00 +73 00 20 30 93 08 00 00 73 00 00 00 93 08 10 00 +73 00 00 00 93 04 00 00 13 09 00 01 33 85 04 00 +B7 05 10 00 13 06 00 00 93 06 F0 00 13 07 80 00 +93 08 80 00 73 00 00 00 EF 00 40 15 B7 02 10 00 +23 20 50 00 03 23 00 00 63 9C 62 16 23 AE 52 FE +03 A3 C2 FF 63 96 62 16 B7 02 10 00 23 A0 02 00 13 00 00 00 13 00 00 00 13 00 00 00 93 02 10 00 -63 12 54 06 B7 02 08 00 23 A2 02 00 13 00 00 00 -13 00 00 00 13 00 00 00 93 02 20 00 63 14 54 04 -93 08 00 00 73 00 00 00 13 04 00 00 6F 00 80 04 -93 02 00 00 13 03 A0 00 93 03 00 00 13 0E 00 00 -B3 83 53 00 23 20 7E 00 93 83 13 00 83 23 0E 00 -93 82 12 00 13 9E 22 00 E3 94 62 FE 67 80 00 00 -63 1A 30 00 13 95 11 00 63 00 05 00 13 65 15 00 -73 00 00 00 13 05 10 00 73 00 00 00 73 00 10 00 -73 10 00 C0 -@800031D4 +63 18 54 14 93 08 00 00 73 00 00 00 13 04 00 00 +93 84 14 00 E3 9C 24 F9 93 04 00 00 13 09 00 01 +33 85 04 00 93 05 00 00 37 06 10 00 93 06 F0 01 +13 07 80 01 93 08 80 00 73 00 00 00 EF 00 00 0E +B7 02 10 00 23 20 50 00 03 23 00 00 63 92 62 10 +23 AE 52 FE 03 A3 C2 FF 63 9C 62 0E B7 02 10 00 +23 A0 02 00 13 00 00 00 13 00 00 00 13 00 00 00 +93 02 10 00 63 1E 54 0C 93 08 00 00 73 00 00 00 +13 04 00 00 93 84 14 00 E3 9C 24 F9 13 05 00 00 +93 05 00 00 37 06 04 00 93 06 F0 01 13 07 80 01 +93 08 80 00 73 00 00 00 13 05 10 00 B7 05 08 00 +13 06 40 00 93 06 70 01 13 07 00 01 93 08 80 00 +73 00 00 00 B7 02 08 00 23 A0 52 00 03 A3 02 00 +63 90 62 08 B7 02 08 00 23 AE 02 FE 13 00 00 00 +13 00 00 00 13 00 00 00 93 02 10 00 63 12 54 06 +B7 02 08 00 23 A2 02 00 13 00 00 00 13 00 00 00 +13 00 00 00 93 02 20 00 63 14 54 04 93 08 00 00 +73 00 00 00 13 04 00 00 6F 00 80 04 93 02 00 00 +13 03 A0 00 93 03 00 00 13 0E 00 00 B3 83 53 00 +23 20 7E 00 93 83 13 00 83 23 0E 00 93 82 12 00 +13 9E 22 00 E3 94 62 FE 67 80 00 00 63 1A 30 00 +13 95 11 00 63 00 05 00 13 65 15 00 73 00 00 00 +13 05 10 00 73 00 00 00 73 00 10 00 73 10 00 C0 +@800031F0 41 73 73 65 72 74 69 6F 6E 20 66 61 69 6C 65 64 3A 20 61 64 64 72 20 3E 3D 20 28 31 55 4C 20 3C 3C 20 31 32 29 20 26 26 20 61 64 64 72 20 3C 20 diff --git a/test/priv_sec_testsuite/tests/rv32ui-v-test3.v b/test/priv_sec_testsuite/tests/rv32ui-v-test3.v index 413893c..e502c43 100755 --- a/test/priv_sec_testsuite/tests/rv32ui-v-test3.v +++ b/test/priv_sec_testsuite/tests/rv32ui-v-test3.v @@ -9,8 +9,8 @@ 13 0D 00 00 93 0D 00 00 13 0E 00 00 93 0E 00 00 13 0F 00 00 93 0F 00 00 97 02 00 00 93 82 02 F8 73 90 52 30 17 81 00 00 13 01 C1 ED F3 22 40 F1 -93 92 C2 00 33 01 51 00 73 10 01 34 EF 20 90 72 -17 35 00 00 13 05 85 F2 6F 20 00 74 83 22 45 08 +93 92 C2 00 33 01 51 00 73 10 01 34 EF 20 50 74 +17 35 00 00 13 05 45 F4 6F 20 00 74 83 22 45 08 73 90 12 14 83 20 45 00 03 21 85 00 83 21 C5 00 03 22 05 01 83 22 45 01 03 23 85 01 83 23 C5 01 03 24 05 02 83 24 45 02 83 25 C5 02 03 26 05 03 @@ -121,11 +121,11 @@ E3 9C 07 FD 73 90 08 10 93 97 26 00 B3 06 F6 00 63 94 E5 04 93 96 26 00 B3 06 D6 00 23 A0 F6 00 73 00 05 12 83 20 C1 00 13 01 01 01 67 80 00 00 93 E7 07 04 6F F0 1F FE 97 57 00 00 23 A4 07 AC -6F F0 1F F0 17 15 00 00 13 05 45 BF EF F0 5F D0 -13 05 30 00 EF F0 5F D6 17 15 00 00 13 05 45 C2 +6F F0 1F F0 17 15 00 00 13 05 05 C1 EF F0 5F D0 +13 05 30 00 EF F0 5F D6 17 15 00 00 13 05 05 C4 EF F0 1F CF 13 05 30 00 EF F0 1F D5 17 15 00 00 -13 05 85 C5 EF F0 DF CD 13 05 30 00 EF F0 DF D3 -17 15 00 00 13 05 C5 C5 EF F0 9F CC 13 05 30 00 +13 05 45 C7 EF F0 DF CD 13 05 30 00 EF F0 DF D3 +17 15 00 00 13 05 85 C7 EF F0 9F CC 13 05 30 00 EF F0 9F D2 83 25 C5 08 13 01 01 FB 23 24 81 04 23 26 11 04 23 22 91 04 23 20 21 05 23 2E 31 03 23 2C 41 03 23 2A 51 03 23 28 61 03 23 26 71 03 @@ -139,14 +139,14 @@ EF F0 9F D2 83 25 C5 08 13 01 01 FB 23 24 81 04 03 2D 01 02 83 2D C1 01 13 01 01 05 6F D0 1F A8 03 27 45 08 93 77 37 00 63 98 07 08 EF 07 80 00 73 10 30 00 03 27 07 00 83 A7 07 00 63 0A F7 06 -13 05 10 04 97 15 00 00 93 85 45 BB 97 F6 FF FF +13 05 10 04 97 15 00 00 93 85 05 BD 97 F6 FF FF 93 86 46 99 17 F6 FF FF 13 06 C6 9C 03 A7 06 00 83 A7 46 00 13 08 05 00 93 85 15 00 33 67 F7 00 B7 08 01 01 63 02 07 02 13 07 00 00 23 20 E6 00 93 07 00 00 23 22 F6 00 03 A7 06 00 83 A7 46 00 33 67 F7 00 E3 12 07 FE 03 C5 05 00 23 A0 06 01 23 A2 16 01 E3 1C 05 FA 13 05 30 00 EF F0 DF BE -13 05 10 00 EF F0 5F BE 17 15 00 00 13 05 45 BD +13 05 10 00 EF F0 5F BE 17 15 00 00 13 05 05 BF EF F0 1F B7 13 05 30 00 EF F0 1F BD 03 29 85 02 37 1C 00 00 97 24 00 00 93 84 C4 90 97 3B 00 00 93 8B 4B 90 37 0B 04 00 B7 0A C0 FF 97 5D 00 00 @@ -160,10 +160,10 @@ EF F0 1F B7 13 05 30 00 EF F0 1F BD 03 29 85 02 93 FC 0C 08 83 25 C1 00 63 80 0C 04 37 16 00 00 13 05 0C 00 EF F0 DF 86 B3 87 84 00 73 10 0D 10 03 A7 0D 00 23 A0 07 00 E3 1E 07 F6 23 A0 FD 00 -23 20 FA 00 6F F0 9F F7 17 15 00 00 13 05 85 B1 -EF F0 1F A9 6F F0 5F F0 17 15 00 00 13 05 05 AB +23 20 FA 00 6F F0 9F F7 17 15 00 00 13 05 45 B3 +EF F0 1F A9 6F F0 5F F0 17 15 00 00 13 05 C5 AC EF F0 1F A8 13 05 30 00 EF F0 1F AE 17 15 00 00 -13 05 85 A6 EF F0 DF A6 13 05 30 00 EF F0 DF AC +13 05 45 A8 EF F0 DF A6 13 05 30 00 EF F0 DF AC 13 05 09 00 EF F0 5F AC F3 27 40 F1 63 96 07 16 17 46 00 00 13 06 06 80 93 57 C6 00 13 01 01 F6 93 97 A7 00 23 2E 11 08 23 2C 81 08 97 25 00 00 @@ -193,51 +193,51 @@ EF F0 CF F1 B7 07 00 80 33 04 F4 00 13 05 01 00 93 D6 17 00 B3 E6 D5 00 B3 C7 D7 00 93 97 E7 01 B3 75 F5 00 13 57 17 00 93 87 06 00 33 E7 E5 00 B3 F6 C7 00 93 F5 17 00 B3 86 06 01 E3 96 05 FC -03 A0 06 00 6F F0 9F FC 17 15 00 00 13 05 45 93 +03 A0 06 00 6F F0 9F FC 17 15 00 00 13 05 05 95 EF F0 1F 88 13 05 30 00 EF F0 1F 8E 73 10 00 3A 73 10 10 3A 73 10 20 3A 73 10 30 3A 73 10 00 3B 73 10 10 3B 73 10 20 3B 73 10 30 3B 73 10 40 3B 73 10 50 3B 73 10 60 3B 73 10 70 3B 73 10 80 3B 73 10 90 3B 73 10 A0 3B 73 10 B0 3B 73 10 C0 3B -73 10 D0 3B 73 10 E0 3B 73 10 F0 3B 6F 00 00 59 +73 10 D0 3B 73 10 E0 3B 73 10 F0 3B 6F 00 C0 5A 93 02 00 00 B7 0E 00 00 93 8E FE FF 73 90 0E 3B -73 2F 00 3B 63 9A EE 6D 73 10 00 3B B7 0E 00 00 -93 8E FE FF 73 90 1E 3B 73 2F 10 3B 63 9E EE 6B +73 2F 00 3B 63 98 EE 6F 73 10 00 3B B7 0E 00 00 +93 8E FE FF 73 90 1E 3B 73 2F 10 3B 63 9C EE 6D 73 10 10 3B B7 0E 00 00 93 8E FE FF 73 90 2E 3B -73 2F 20 3B 63 92 EE 6B 73 10 20 3B B7 0E 00 00 -93 8E FE FF 73 90 3E 3B 73 2F 30 3B 63 96 EE 69 +73 2F 20 3B 63 90 EE 6D 73 10 20 3B B7 0E 00 00 +93 8E FE FF 73 90 3E 3B 73 2F 30 3B 63 94 EE 6B 73 10 30 3B B7 0E 00 00 93 8E FE FF 73 90 4E 3B -73 2F 40 3B 63 9A EE 67 73 10 40 3B B7 0E 00 00 -93 8E FE FF 73 90 5E 3B 73 2F 50 3B 63 9E EE 65 +73 2F 40 3B 63 98 EE 69 73 10 40 3B B7 0E 00 00 +93 8E FE FF 73 90 5E 3B 73 2F 50 3B 63 9C EE 67 73 10 50 3B B7 0E 00 00 93 8E FE FF 73 90 6E 3B -73 2F 60 3B 63 92 EE 65 73 10 60 3B B7 0E 00 00 -93 8E FE FF 73 90 7E 3B 73 2F 70 3B 63 96 EE 63 +73 2F 60 3B 63 90 EE 67 73 10 60 3B B7 0E 00 00 +93 8E FE FF 73 90 7E 3B 73 2F 70 3B 63 94 EE 65 73 10 70 3B B7 0E 00 00 93 8E FE FF 73 90 8E 3B -73 2F 80 3B 63 9A EE 61 73 10 80 3B B7 0E 00 00 -93 8E FE FF 73 90 9E 3B 73 2F 90 3B 63 9E EE 5F +73 2F 80 3B 63 98 EE 63 73 10 80 3B B7 0E 00 00 +93 8E FE FF 73 90 9E 3B 73 2F 90 3B 63 9C EE 61 73 10 90 3B B7 0E 00 00 93 8E FE FF 73 90 AE 3B -73 2F A0 3B 63 92 EE 5F 73 10 A0 3B B7 0E 00 00 -93 8E FE FF 73 90 BE 3B 73 2F B0 3B 63 96 EE 5D +73 2F A0 3B 63 90 EE 61 73 10 A0 3B B7 0E 00 00 +93 8E FE FF 73 90 BE 3B 73 2F B0 3B 63 94 EE 5F 73 10 B0 3B B7 0E 00 00 93 8E FE FF 73 90 CE 3B -73 2F C0 3B 63 9A EE 5B 73 10 C0 3B B7 0E 00 00 -93 8E FE FF 73 90 DE 3B 73 2F D0 3B 63 9E EE 59 +73 2F C0 3B 63 98 EE 5D 73 10 C0 3B B7 0E 00 00 +93 8E FE FF 73 90 DE 3B 73 2F D0 3B 63 9C EE 5B 73 10 D0 3B B7 0E 00 00 93 8E FE FF 73 90 EE 3B -73 2F E0 3B 63 92 EE 59 73 10 E0 3B B7 0E 00 00 -93 8E FE FF 73 90 FE 3B 73 2F F0 3B 63 96 EE 57 +73 2F E0 3B 63 90 EE 5B 73 10 E0 3B B7 0E 00 00 +93 8E FE FF 73 90 FE 3B 73 2F F0 3B 63 94 EE 59 73 10 F0 3B B7 7E 77 77 93 8E 7E 77 73 90 0E 3A -73 2F 00 3A 63 9A EE 55 73 10 00 3A B7 7E 77 77 -93 8E 7E 77 73 90 1E 3A 73 2F 10 3A 63 9E EE 53 +73 2F 00 3A 63 98 EE 57 73 10 00 3A B7 7E 77 77 +93 8E 7E 77 73 90 1E 3A 73 2F 10 3A 63 9C EE 55 73 10 10 3A B7 7E 77 77 93 8E 7E 77 73 90 2E 3A -73 2F 20 3A 63 92 EE 53 73 10 20 3A B7 7E 77 77 -93 8E 7E 77 73 90 3E 3A 73 2F 30 3A 63 96 EE 51 -73 10 30 3A 6F 00 80 3A 37 0F 00 00 13 0F 0F 08 +73 2F 20 3A 63 90 EE 55 73 10 20 3A B7 7E 77 77 +93 8E 7E 77 73 90 3E 3A 73 2F 30 3A 63 94 EE 53 +73 10 30 3A 6F 00 40 3C 37 0F 00 00 13 0F 0F 08 F3 2E 00 30 B3 EE EE 01 73 90 0E 30 37 1F 00 00 13 0F 0F 80 F3 2E 40 30 B3 EE EE 01 73 90 4E 30 -6F 00 C0 37 F3 22 00 3A 13 03 F0 0F 93 D2 82 00 -B3 F2 62 00 63 96 D2 00 13 05 00 00 6F 00 00 36 -13 05 10 00 6F 00 80 35 F3 22 00 30 63 1A 05 00 +6F 00 80 39 F3 22 00 3A 13 03 F0 0F 93 D2 82 00 +B3 F2 62 00 63 96 D2 00 13 05 00 00 6F 00 C0 37 +13 05 10 00 6F 00 40 37 F3 22 00 30 63 1A 05 00 37 03 FE FF 13 03 F3 FF B3 F2 62 00 6F 00 C0 00 -37 03 02 00 B3 E2 62 00 73 90 02 30 6F 00 00 33 +37 03 02 00 B3 E2 62 00 73 90 02 30 6F 00 C0 34 03 20 05 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 23 20 05 00 13 00 00 00 13 00 00 00 @@ -247,7 +247,7 @@ B3 F2 62 00 63 96 D2 00 13 05 00 00 6F 00 00 36 13 56 36 00 93 D5 25 00 B3 E5 C5 00 6F 00 80 00 93 D5 25 00 93 02 40 00 63 40 55 02 93 02 80 00 63 40 55 0A 93 02 C0 00 63 40 55 12 93 02 00 01 -63 40 55 1A 6F 00 80 29 73 23 00 3A 93 02 00 00 +63 40 55 1A 6F 00 40 2B 73 23 00 3A 93 02 00 00 63 8E A2 00 93 02 10 00 63 82 A2 02 93 02 20 00 63 8A A2 02 93 02 30 00 63 82 A2 04 73 90 05 3B 93 02 00 F0 33 73 53 00 6F 00 C0 04 73 90 15 3B @@ -255,7 +255,7 @@ B7 02 FF FF 93 82 F2 0F 33 73 53 00 93 96 86 00 6F 00 40 03 73 90 25 3B B7 02 01 FF 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 35 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 -6F 00 40 00 33 63 D3 00 73 10 03 3A 6F 00 00 21 +6F 00 40 00 33 63 D3 00 73 10 03 3A 6F 00 C0 22 73 23 10 3A 93 02 40 00 63 8E A2 00 93 02 50 00 63 82 A2 02 93 02 60 00 63 8A A2 02 93 02 70 00 63 82 A2 04 73 90 45 3B 93 02 00 F0 33 73 53 00 @@ -264,7 +264,7 @@ B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 B7 02 01 FF 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 75 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 -73 10 13 3A 6F 00 80 18 73 23 20 3A 93 02 80 00 +73 10 13 3A 6F 00 40 1A 73 23 20 3A 93 02 80 00 63 8E A2 00 93 02 90 00 63 82 A2 02 93 02 A0 00 63 8A A2 02 93 02 B0 00 63 82 A2 04 73 90 85 3B 93 02 00 F0 33 73 53 00 6F 00 C0 04 73 90 95 3B @@ -272,7 +272,7 @@ B7 02 FF FF 93 82 F2 0F 33 73 53 00 93 96 86 00 6F 00 40 03 73 90 A5 3B B7 02 01 FF 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 B5 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 -6F 00 40 00 33 63 D3 00 73 10 23 3A 6F 00 00 10 +6F 00 40 00 33 63 D3 00 73 10 23 3A 6F 00 C0 11 73 23 30 3A 93 02 C0 00 63 8E A2 00 93 02 D0 00 63 82 A2 02 93 02 E0 00 63 8A A2 02 93 02 F0 00 63 82 A2 04 73 90 C5 3B 93 02 00 F0 33 73 53 00 @@ -281,39 +281,41 @@ B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 B7 02 01 FF 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 F5 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 -73 10 33 3A 6F 00 80 07 93 02 00 00 63 08 57 06 +73 10 33 3A 6F 00 40 09 93 02 00 00 63 06 57 08 93 02 80 00 E3 06 57 DA 93 02 00 01 E3 08 57 D8 -93 02 80 01 E3 04 57 D8 13 05 10 00 6F 00 00 05 -93 0E 00 00 E3 84 D8 A7 93 0E 10 00 E3 8A D8 AB -93 0E 80 00 E3 82 D8 FD 93 0E 90 00 E3 86 D8 C9 -93 0E A0 00 E3 8A D8 CD 93 0E B0 00 E3 8A D8 CF -93 0E C0 00 E3 88 D8 D1 93 0E D0 00 E3 86 D8 D3 -93 0E E0 00 E3 88 D8 C9 6F 00 40 00 F3 2E 10 34 -93 8E 4E 00 73 90 1E 34 73 00 20 30 13 0A 1A 00 -73 00 20 30 67 80 00 00 6F 00 40 05 93 8F 1F 00 -73 00 10 00 6F F0 9F FD 93 8F 1F 00 73 00 10 00 -73 24 20 34 93 02 50 00 63 0A 54 00 93 02 70 00 -63 06 54 00 93 02 10 00 63 04 54 00 73 00 20 30 -13 09 19 00 93 02 10 00 63 82 22 01 97 02 00 00 -93 82 42 0B 73 90 12 34 6F F0 5F FE 13 05 00 00 -93 05 00 00 37 06 04 00 93 06 F0 01 13 07 80 01 -93 08 80 00 73 00 00 00 13 04 00 00 13 05 10 00 -B7 05 04 00 37 06 04 00 93 06 90 01 13 07 80 01 -93 08 80 00 73 00 00 00 B7 02 04 00 23 A0 02 00 -93 02 70 00 63 12 54 0A 13 04 00 00 13 05 10 00 -B7 05 04 00 37 06 04 00 93 06 C0 01 13 07 80 01 -93 08 80 00 73 00 00 00 B7 02 04 00 03 A0 02 00 -93 02 50 00 63 1A 54 06 13 04 00 00 13 05 10 00 -B7 05 04 00 37 06 04 00 93 06 B0 01 13 07 80 01 -93 08 80 00 73 00 00 00 B7 02 04 00 67 80 02 00 -93 02 10 00 63 12 54 04 13 04 10 00 63 1E 54 02 -6F 00 80 04 93 02 00 00 13 03 A0 00 93 03 00 00 -13 0E 00 00 B3 83 53 00 23 20 7E 00 93 83 13 00 -83 23 0E 00 93 82 12 00 13 9E 22 00 E3 94 62 FE -67 80 00 00 63 1A 30 00 13 95 11 00 63 00 05 00 -13 65 15 00 73 00 00 00 13 05 10 00 73 00 00 00 -73 00 10 00 73 10 00 C0 -@80003138 +93 02 80 01 E3 04 57 D8 13 05 10 00 6F 00 C0 06 +63 06 A0 00 73 10 65 30 6F 00 00 06 73 50 60 30 +6F 00 80 05 93 0E 00 00 E3 8A D8 A5 93 0E 10 00 +E3 80 D8 AB 93 0E 80 00 E3 88 D8 FB 93 0E 90 00 +E3 8C D8 C7 93 0E A0 00 E3 80 D8 CD 93 0E B0 00 +E3 80 D8 CF 93 0E C0 00 E3 8E D8 CF 93 0E D0 00 +E3 8C D8 D1 93 0E E0 00 E3 8E D8 C7 93 0E F0 00 +E3 80 D8 FB 6F 00 40 00 F3 2E 10 34 93 8E 4E 00 +73 90 1E 34 73 00 20 30 13 0A 1A 00 73 00 20 30 +67 80 00 00 6F 00 40 05 93 8F 1F 00 73 00 10 00 +6F F0 9F FD 93 8F 1F 00 73 00 10 00 73 24 20 34 +93 02 50 00 63 0A 54 00 93 02 70 00 63 06 54 00 +93 02 10 00 63 04 54 00 73 00 20 30 13 09 19 00 +93 02 10 00 63 82 22 01 97 02 00 00 93 82 42 0B +73 90 12 34 6F F0 5F FE 13 05 00 00 93 05 00 00 +37 06 04 00 93 06 F0 01 13 07 80 01 93 08 80 00 +73 00 00 00 13 04 00 00 13 05 10 00 B7 05 04 00 +37 06 04 00 93 06 90 01 13 07 80 01 93 08 80 00 +73 00 00 00 B7 02 04 00 23 A0 02 00 93 02 70 00 +63 12 54 0A 13 04 00 00 13 05 10 00 B7 05 04 00 +37 06 04 00 93 06 C0 01 13 07 80 01 93 08 80 00 +73 00 00 00 B7 02 04 00 03 A0 02 00 93 02 50 00 +63 1A 54 06 13 04 00 00 13 05 10 00 B7 05 04 00 +37 06 04 00 93 06 B0 01 13 07 80 01 93 08 80 00 +73 00 00 00 B7 02 04 00 67 80 02 00 93 02 10 00 +63 12 54 04 13 04 10 00 63 1E 54 02 6F 00 80 04 +93 02 00 00 13 03 A0 00 93 03 00 00 13 0E 00 00 +B3 83 53 00 23 20 7E 00 93 83 13 00 83 23 0E 00 +93 82 12 00 13 9E 22 00 E3 94 62 FE 67 80 00 00 +63 1A 30 00 13 95 11 00 63 00 05 00 13 65 15 00 +73 00 00 00 13 05 10 00 73 00 00 00 73 00 10 00 +73 10 00 C0 +@80003154 41 73 73 65 72 74 69 6F 6E 20 66 61 69 6C 65 64 3A 20 61 64 64 72 20 3E 3D 20 28 31 55 4C 20 3C 3C 20 31 32 29 20 26 26 20 61 64 64 72 20 3C 20 diff --git a/test/priv_sec_testsuite/tests/rv32ui-v-test4.v b/test/priv_sec_testsuite/tests/rv32ui-v-test4.v index c2ea694..ed06f1b 100755 --- a/test/priv_sec_testsuite/tests/rv32ui-v-test4.v +++ b/test/priv_sec_testsuite/tests/rv32ui-v-test4.v @@ -9,8 +9,8 @@ 13 0D 00 00 93 0D 00 00 13 0E 00 00 93 0E 00 00 13 0F 00 00 93 0F 00 00 97 02 00 00 93 82 02 F8 73 90 52 30 17 81 00 00 13 01 C1 ED F3 22 40 F1 -93 92 C2 00 33 01 51 00 73 10 01 34 EF 20 90 72 -17 35 00 00 13 05 85 F2 6F 20 00 74 83 22 45 08 +93 92 C2 00 33 01 51 00 73 10 01 34 EF 20 50 74 +17 35 00 00 13 05 45 F4 6F 20 00 74 83 22 45 08 73 90 12 14 83 20 45 00 03 21 85 00 83 21 C5 00 03 22 05 01 83 22 45 01 03 23 85 01 83 23 C5 01 03 24 05 02 83 24 45 02 83 25 C5 02 03 26 05 03 @@ -121,11 +121,11 @@ E3 9C 07 FD 73 90 08 10 93 97 26 00 B3 06 F6 00 63 94 E5 04 93 96 26 00 B3 06 D6 00 23 A0 F6 00 73 00 05 12 83 20 C1 00 13 01 01 01 67 80 00 00 93 E7 07 04 6F F0 1F FE 97 57 00 00 23 A4 07 AC -6F F0 1F F0 17 15 00 00 13 05 85 C5 EF F0 5F D0 -13 05 30 00 EF F0 5F D6 17 15 00 00 13 05 85 C8 +6F F0 1F F0 17 15 00 00 13 05 45 C7 EF F0 5F D0 +13 05 30 00 EF F0 5F D6 17 15 00 00 13 05 45 CA EF F0 1F CF 13 05 30 00 EF F0 1F D5 17 15 00 00 -13 05 C5 CB EF F0 DF CD 13 05 30 00 EF F0 DF D3 -17 15 00 00 13 05 05 CC EF F0 9F CC 13 05 30 00 +13 05 85 CD EF F0 DF CD 13 05 30 00 EF F0 DF D3 +17 15 00 00 13 05 C5 CD EF F0 9F CC 13 05 30 00 EF F0 9F D2 83 25 C5 08 13 01 01 FB 23 24 81 04 23 26 11 04 23 22 91 04 23 20 21 05 23 2E 31 03 23 2C 41 03 23 2A 51 03 23 28 61 03 23 26 71 03 @@ -139,14 +139,14 @@ EF F0 9F D2 83 25 C5 08 13 01 01 FB 23 24 81 04 03 2D 01 02 83 2D C1 01 13 01 01 05 6F D0 1F A8 03 27 45 08 93 77 37 00 63 98 07 08 EF 07 80 00 73 10 30 00 03 27 07 00 83 A7 07 00 63 0A F7 06 -13 05 10 04 97 15 00 00 93 85 85 C1 97 F6 FF FF +13 05 10 04 97 15 00 00 93 85 45 C3 97 F6 FF FF 93 86 46 99 17 F6 FF FF 13 06 C6 9C 03 A7 06 00 83 A7 46 00 13 08 05 00 93 85 15 00 33 67 F7 00 B7 08 01 01 63 02 07 02 13 07 00 00 23 20 E6 00 93 07 00 00 23 22 F6 00 03 A7 06 00 83 A7 46 00 33 67 F7 00 E3 12 07 FE 03 C5 05 00 23 A0 06 01 23 A2 16 01 E3 1C 05 FA 13 05 30 00 EF F0 DF BE -13 05 10 00 EF F0 5F BE 17 15 00 00 13 05 85 C3 +13 05 10 00 EF F0 5F BE 17 15 00 00 13 05 45 C5 EF F0 1F B7 13 05 30 00 EF F0 1F BD 03 29 85 02 37 1C 00 00 97 24 00 00 93 84 C4 90 97 3B 00 00 93 8B 4B 90 37 0B 04 00 B7 0A C0 FF 97 5D 00 00 @@ -160,10 +160,10 @@ EF F0 1F B7 13 05 30 00 EF F0 1F BD 03 29 85 02 93 FC 0C 08 83 25 C1 00 63 80 0C 04 37 16 00 00 13 05 0C 00 EF F0 DF 86 B3 87 84 00 73 10 0D 10 03 A7 0D 00 23 A0 07 00 E3 1E 07 F6 23 A0 FD 00 -23 20 FA 00 6F F0 9F F7 17 15 00 00 13 05 C5 B7 -EF F0 1F A9 6F F0 5F F0 17 15 00 00 13 05 45 B1 +23 20 FA 00 6F F0 9F F7 17 15 00 00 13 05 85 B9 +EF F0 1F A9 6F F0 5F F0 17 15 00 00 13 05 05 B3 EF F0 1F A8 13 05 30 00 EF F0 1F AE 17 15 00 00 -13 05 C5 AC EF F0 DF A6 13 05 30 00 EF F0 DF AC +13 05 85 AE EF F0 DF A6 13 05 30 00 EF F0 DF AC 13 05 09 00 EF F0 5F AC F3 27 40 F1 63 96 07 16 17 46 00 00 13 06 06 80 93 57 C6 00 13 01 01 F6 93 97 A7 00 23 2E 11 08 23 2C 81 08 97 25 00 00 @@ -193,51 +193,51 @@ EF F0 CF F1 B7 07 00 80 33 04 F4 00 13 05 01 00 93 D6 17 00 B3 E6 D5 00 B3 C7 D7 00 93 97 E7 01 B3 75 F5 00 13 57 17 00 93 87 06 00 33 E7 E5 00 B3 F6 C7 00 93 F5 17 00 B3 86 06 01 E3 96 05 FC -03 A0 06 00 6F F0 9F FC 17 15 00 00 13 05 85 99 +03 A0 06 00 6F F0 9F FC 17 15 00 00 13 05 45 9B EF F0 1F 88 13 05 30 00 EF F0 1F 8E 73 10 00 3A 73 10 10 3A 73 10 20 3A 73 10 30 3A 73 10 00 3B 73 10 10 3B 73 10 20 3B 73 10 30 3B 73 10 40 3B 73 10 50 3B 73 10 60 3B 73 10 70 3B 73 10 80 3B 73 10 90 3B 73 10 A0 3B 73 10 B0 3B 73 10 C0 3B -73 10 D0 3B 73 10 E0 3B 73 10 F0 3B 6F 00 00 59 +73 10 D0 3B 73 10 E0 3B 73 10 F0 3B 6F 00 C0 5A 93 02 00 00 B7 0E 00 00 93 8E FE FF 73 90 0E 3B -73 2F 00 3B 63 9C EE 73 73 10 00 3B B7 0E 00 00 -93 8E FE FF 73 90 1E 3B 73 2F 10 3B 63 90 EE 73 +73 2F 00 3B 63 9A EE 75 73 10 00 3B B7 0E 00 00 +93 8E FE FF 73 90 1E 3B 73 2F 10 3B 63 9E EE 73 73 10 10 3B B7 0E 00 00 93 8E FE FF 73 90 2E 3B -73 2F 20 3B 63 94 EE 71 73 10 20 3B B7 0E 00 00 -93 8E FE FF 73 90 3E 3B 73 2F 30 3B 63 98 EE 6F +73 2F 20 3B 63 92 EE 73 73 10 20 3B B7 0E 00 00 +93 8E FE FF 73 90 3E 3B 73 2F 30 3B 63 96 EE 71 73 10 30 3B B7 0E 00 00 93 8E FE FF 73 90 4E 3B -73 2F 40 3B 63 9C EE 6D 73 10 40 3B B7 0E 00 00 -93 8E FE FF 73 90 5E 3B 73 2F 50 3B 63 90 EE 6D +73 2F 40 3B 63 9A EE 6F 73 10 40 3B B7 0E 00 00 +93 8E FE FF 73 90 5E 3B 73 2F 50 3B 63 9E EE 6D 73 10 50 3B B7 0E 00 00 93 8E FE FF 73 90 6E 3B -73 2F 60 3B 63 94 EE 6B 73 10 60 3B B7 0E 00 00 -93 8E FE FF 73 90 7E 3B 73 2F 70 3B 63 98 EE 69 +73 2F 60 3B 63 92 EE 6D 73 10 60 3B B7 0E 00 00 +93 8E FE FF 73 90 7E 3B 73 2F 70 3B 63 96 EE 6B 73 10 70 3B B7 0E 00 00 93 8E FE FF 73 90 8E 3B -73 2F 80 3B 63 9C EE 67 73 10 80 3B B7 0E 00 00 -93 8E FE FF 73 90 9E 3B 73 2F 90 3B 63 90 EE 67 +73 2F 80 3B 63 9A EE 69 73 10 80 3B B7 0E 00 00 +93 8E FE FF 73 90 9E 3B 73 2F 90 3B 63 9E EE 67 73 10 90 3B B7 0E 00 00 93 8E FE FF 73 90 AE 3B -73 2F A0 3B 63 94 EE 65 73 10 A0 3B B7 0E 00 00 -93 8E FE FF 73 90 BE 3B 73 2F B0 3B 63 98 EE 63 +73 2F A0 3B 63 92 EE 67 73 10 A0 3B B7 0E 00 00 +93 8E FE FF 73 90 BE 3B 73 2F B0 3B 63 96 EE 65 73 10 B0 3B B7 0E 00 00 93 8E FE FF 73 90 CE 3B -73 2F C0 3B 63 9C EE 61 73 10 C0 3B B7 0E 00 00 -93 8E FE FF 73 90 DE 3B 73 2F D0 3B 63 90 EE 61 +73 2F C0 3B 63 9A EE 63 73 10 C0 3B B7 0E 00 00 +93 8E FE FF 73 90 DE 3B 73 2F D0 3B 63 9E EE 61 73 10 D0 3B B7 0E 00 00 93 8E FE FF 73 90 EE 3B -73 2F E0 3B 63 94 EE 5F 73 10 E0 3B B7 0E 00 00 -93 8E FE FF 73 90 FE 3B 73 2F F0 3B 63 98 EE 5D +73 2F E0 3B 63 92 EE 61 73 10 E0 3B B7 0E 00 00 +93 8E FE FF 73 90 FE 3B 73 2F F0 3B 63 96 EE 5F 73 10 F0 3B B7 7E 77 77 93 8E 7E 77 73 90 0E 3A -73 2F 00 3A 63 9C EE 5B 73 10 00 3A B7 7E 77 77 -93 8E 7E 77 73 90 1E 3A 73 2F 10 3A 63 90 EE 5B +73 2F 00 3A 63 9A EE 5D 73 10 00 3A B7 7E 77 77 +93 8E 7E 77 73 90 1E 3A 73 2F 10 3A 63 9E EE 5B 73 10 10 3A B7 7E 77 77 93 8E 7E 77 73 90 2E 3A -73 2F 20 3A 63 94 EE 59 73 10 20 3A B7 7E 77 77 -93 8E 7E 77 73 90 3E 3A 73 2F 30 3A 63 98 EE 57 -73 10 30 3A 6F 00 80 3A 37 0F 00 00 13 0F 0F 08 +73 2F 20 3A 63 92 EE 5B 73 10 20 3A B7 7E 77 77 +93 8E 7E 77 73 90 3E 3A 73 2F 30 3A 63 96 EE 59 +73 10 30 3A 6F 00 40 3C 37 0F 00 00 13 0F 0F 08 F3 2E 00 30 B3 EE EE 01 73 90 0E 30 37 1F 00 00 13 0F 0F 80 F3 2E 40 30 B3 EE EE 01 73 90 4E 30 -6F 00 C0 37 F3 22 00 3A 13 03 F0 0F 93 D2 82 00 -B3 F2 62 00 63 96 D2 00 13 05 00 00 6F 00 00 36 -13 05 10 00 6F 00 80 35 F3 22 00 30 63 1A 05 00 +6F 00 80 39 F3 22 00 3A 13 03 F0 0F 93 D2 82 00 +B3 F2 62 00 63 96 D2 00 13 05 00 00 6F 00 C0 37 +13 05 10 00 6F 00 40 37 F3 22 00 30 63 1A 05 00 37 03 FE FF 13 03 F3 FF B3 F2 62 00 6F 00 C0 00 -37 03 02 00 B3 E2 62 00 73 90 02 30 6F 00 00 33 +37 03 02 00 B3 E2 62 00 73 90 02 30 6F 00 C0 34 03 20 05 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 23 20 05 00 13 00 00 00 13 00 00 00 @@ -247,7 +247,7 @@ B3 F2 62 00 63 96 D2 00 13 05 00 00 6F 00 00 36 13 56 36 00 93 D5 25 00 B3 E5 C5 00 6F 00 80 00 93 D5 25 00 93 02 40 00 63 40 55 02 93 02 80 00 63 40 55 0A 93 02 C0 00 63 40 55 12 93 02 00 01 -63 40 55 1A 6F 00 80 29 73 23 00 3A 93 02 00 00 +63 40 55 1A 6F 00 40 2B 73 23 00 3A 93 02 00 00 63 8E A2 00 93 02 10 00 63 82 A2 02 93 02 20 00 63 8A A2 02 93 02 30 00 63 82 A2 04 73 90 05 3B 93 02 00 F0 33 73 53 00 6F 00 C0 04 73 90 15 3B @@ -255,7 +255,7 @@ B7 02 FF FF 93 82 F2 0F 33 73 53 00 93 96 86 00 6F 00 40 03 73 90 25 3B B7 02 01 FF 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 35 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 -6F 00 40 00 33 63 D3 00 73 10 03 3A 6F 00 00 21 +6F 00 40 00 33 63 D3 00 73 10 03 3A 6F 00 C0 22 73 23 10 3A 93 02 40 00 63 8E A2 00 93 02 50 00 63 82 A2 02 93 02 60 00 63 8A A2 02 93 02 70 00 63 82 A2 04 73 90 45 3B 93 02 00 F0 33 73 53 00 @@ -264,7 +264,7 @@ B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 B7 02 01 FF 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 75 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 -73 10 13 3A 6F 00 80 18 73 23 20 3A 93 02 80 00 +73 10 13 3A 6F 00 40 1A 73 23 20 3A 93 02 80 00 63 8E A2 00 93 02 90 00 63 82 A2 02 93 02 A0 00 63 8A A2 02 93 02 B0 00 63 82 A2 04 73 90 85 3B 93 02 00 F0 33 73 53 00 6F 00 C0 04 73 90 95 3B @@ -272,7 +272,7 @@ B7 02 FF FF 93 82 F2 0F 33 73 53 00 93 96 86 00 6F 00 40 03 73 90 A5 3B B7 02 01 FF 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 B5 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 -6F 00 40 00 33 63 D3 00 73 10 23 3A 6F 00 00 10 +6F 00 40 00 33 63 D3 00 73 10 23 3A 6F 00 C0 11 73 23 30 3A 93 02 C0 00 63 8E A2 00 93 02 D0 00 63 82 A2 02 93 02 E0 00 63 8A A2 02 93 02 F0 00 63 82 A2 04 73 90 C5 3B 93 02 00 F0 33 73 53 00 @@ -281,45 +281,47 @@ B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 B7 02 01 FF 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 F5 3B B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 -73 10 33 3A 6F 00 80 07 93 02 00 00 63 08 57 06 +73 10 33 3A 6F 00 40 09 93 02 00 00 63 06 57 08 93 02 80 00 E3 06 57 DA 93 02 00 01 E3 08 57 D8 -93 02 80 01 E3 04 57 D8 13 05 10 00 6F 00 00 05 -93 0E 00 00 E3 84 D8 A7 93 0E 10 00 E3 8A D8 AB -93 0E 80 00 E3 82 D8 FD 93 0E 90 00 E3 86 D8 C9 -93 0E A0 00 E3 8A D8 CD 93 0E B0 00 E3 8A D8 CF -93 0E C0 00 E3 88 D8 D1 93 0E D0 00 E3 86 D8 D3 -93 0E E0 00 E3 88 D8 C9 6F 00 40 00 F3 2E 10 34 -93 8E 4E 00 73 90 1E 34 73 00 20 30 13 0A 1A 00 -73 00 20 30 67 80 00 00 6F 00 00 08 93 8F 1F 00 -73 00 10 00 6F F0 9F FD 93 8F 1F 00 73 00 10 00 -73 24 20 34 93 02 50 00 63 0A 54 00 93 02 70 00 -63 02 54 02 93 02 10 00 63 0A 54 02 13 09 19 00 -13 05 50 00 97 02 00 00 93 82 82 09 73 90 12 34 -6F 00 40 03 13 09 19 00 13 05 70 00 97 02 00 00 -93 82 C2 0B 73 90 12 34 6F 00 C0 01 13 09 19 00 -13 05 10 00 97 02 00 00 93 82 C2 0E 73 90 12 34 -6F 00 40 00 73 00 20 30 13 05 00 00 93 05 00 00 -37 06 04 00 93 06 F0 01 13 07 80 01 93 08 80 00 -73 00 00 00 13 04 00 00 13 05 10 00 93 08 A0 00 -73 00 00 00 13 05 10 00 B7 05 04 00 37 06 04 00 -93 06 C0 01 13 07 80 01 93 08 80 00 73 00 00 00 -37 05 04 00 93 08 B0 00 73 00 00 00 93 02 50 00 -63 16 A4 0C 93 02 10 00 63 12 59 0C 13 00 00 00 -13 05 10 00 B7 05 04 00 37 06 04 00 93 06 90 01 -13 07 80 01 93 08 80 00 73 00 00 00 37 05 04 00 -93 08 C0 00 73 00 00 00 93 02 70 00 63 18 A4 08 -93 02 20 00 63 14 59 08 13 00 00 00 13 05 10 00 -B7 05 04 00 37 06 04 00 93 06 B0 09 13 07 80 01 -93 08 80 00 73 00 00 00 93 02 30 01 37 03 04 00 -23 20 53 00 37 05 04 00 93 08 D0 00 73 00 00 00 -93 02 10 00 63 14 A4 04 93 02 30 00 63 10 59 04 -13 00 00 00 13 05 10 00 B7 05 04 00 13 06 00 02 +93 02 80 01 E3 04 57 D8 13 05 10 00 6F 00 C0 06 +63 06 A0 00 73 10 65 30 6F 00 00 06 73 50 60 30 +6F 00 80 05 93 0E 00 00 E3 8A D8 A5 93 0E 10 00 +E3 80 D8 AB 93 0E 80 00 E3 88 D8 FB 93 0E 90 00 +E3 8C D8 C7 93 0E A0 00 E3 80 D8 CD 93 0E B0 00 +E3 80 D8 CF 93 0E C0 00 E3 8E D8 CF 93 0E D0 00 +E3 8C D8 D1 93 0E E0 00 E3 8E D8 C7 93 0E F0 00 +E3 80 D8 FB 6F 00 40 00 F3 2E 10 34 93 8E 4E 00 +73 90 1E 34 73 00 20 30 13 0A 1A 00 73 00 20 30 +67 80 00 00 6F 00 00 08 93 8F 1F 00 73 00 10 00 +6F F0 9F FD 93 8F 1F 00 73 00 10 00 73 24 20 34 +93 02 50 00 63 0A 54 00 93 02 70 00 63 02 54 02 +93 02 10 00 63 0A 54 02 13 09 19 00 13 05 50 00 +97 02 00 00 93 82 82 09 73 90 12 34 6F 00 40 03 +13 09 19 00 13 05 70 00 97 02 00 00 93 82 C2 0B +73 90 12 34 6F 00 C0 01 13 09 19 00 13 05 10 00 +97 02 00 00 93 82 C2 0E 73 90 12 34 6F 00 40 00 +73 00 20 30 13 05 00 00 93 05 00 00 37 06 04 00 93 06 F0 01 13 07 80 01 93 08 80 00 73 00 00 00 -13 05 F0 01 93 08 E0 00 73 00 00 00 93 02 10 00 -63 16 55 00 6F 00 80 01 63 1A 30 00 13 95 11 00 -63 00 05 00 13 65 15 00 73 00 00 00 13 05 10 00 -73 00 00 00 73 00 10 00 73 10 00 C0 -@8000319C +13 04 00 00 13 05 10 00 93 08 A0 00 73 00 00 00 +13 05 10 00 B7 05 04 00 37 06 04 00 93 06 C0 01 +13 07 80 01 93 08 80 00 73 00 00 00 37 05 04 00 +93 08 B0 00 73 00 00 00 93 02 50 00 63 16 A4 0C +93 02 10 00 63 12 59 0C 13 00 00 00 13 05 10 00 +B7 05 04 00 37 06 04 00 93 06 90 01 13 07 80 01 +93 08 80 00 73 00 00 00 37 05 04 00 93 08 C0 00 +73 00 00 00 93 02 70 00 63 18 A4 08 93 02 20 00 +63 14 59 08 13 00 00 00 13 05 10 00 B7 05 04 00 +37 06 04 00 93 06 B0 09 13 07 80 01 93 08 80 00 +73 00 00 00 93 02 30 01 37 03 04 00 23 20 53 00 +37 05 04 00 93 08 D0 00 73 00 00 00 93 02 10 00 +63 14 A4 04 93 02 30 00 63 10 59 04 13 00 00 00 +13 05 10 00 B7 05 04 00 13 06 00 02 93 06 F0 01 +13 07 80 01 93 08 80 00 73 00 00 00 13 05 F0 01 +93 08 E0 00 73 00 00 00 93 02 10 00 63 16 55 00 +6F 00 80 01 63 1A 30 00 13 95 11 00 63 00 05 00 +13 65 15 00 73 00 00 00 13 05 10 00 73 00 00 00 +73 00 10 00 73 10 00 C0 +@800031B8 41 73 73 65 72 74 69 6F 6E 20 66 61 69 6C 65 64 3A 20 61 64 64 72 20 3E 3D 20 28 31 55 4C 20 3C 3C 20 31 32 29 20 26 26 20 61 64 64 72 20 3C 20 diff --git a/test/priv_sec_testsuite/tests/rv32ui-v-test5.v b/test/priv_sec_testsuite/tests/rv32ui-v-test5.v new file mode 100755 index 0000000..28860d2 --- /dev/null +++ b/test/priv_sec_testsuite/tests/rv32ui-v-test5.v @@ -0,0 +1,355 @@ +@80000000 +6F 00 C0 00 6F 20 80 30 6F 20 40 30 93 00 00 00 +13 01 00 00 93 01 00 00 13 02 00 00 93 02 00 00 +13 03 00 00 93 03 00 00 13 04 00 00 93 04 00 00 +13 05 00 00 93 05 00 00 13 06 00 00 93 06 00 00 +13 07 00 00 93 07 00 00 13 08 00 00 93 08 00 00 +13 09 00 00 93 09 00 00 13 0A 00 00 93 0A 00 00 +13 0B 00 00 93 0B 00 00 13 0C 00 00 93 0C 00 00 +13 0D 00 00 93 0D 00 00 13 0E 00 00 93 0E 00 00 +13 0F 00 00 93 0F 00 00 97 02 00 00 93 82 02 F8 +73 90 52 30 17 81 00 00 13 01 C1 ED F3 22 40 F1 +93 92 C2 00 33 01 51 00 73 10 01 34 EF 20 50 74 +17 35 00 00 13 05 45 F4 6F 20 00 74 83 22 45 08 +73 90 12 14 83 20 45 00 03 21 85 00 83 21 C5 00 +03 22 05 01 83 22 45 01 03 23 85 01 83 23 C5 01 +03 24 05 02 83 24 45 02 83 25 C5 02 03 26 05 03 +83 26 45 03 03 27 85 03 83 27 C5 03 03 28 05 04 +83 28 45 04 03 29 85 04 83 29 C5 04 03 2A 05 05 +83 2A 45 05 03 2B 85 05 83 2B C5 05 03 2C 05 06 +83 2C 45 06 03 2D 85 06 83 2D C5 06 03 2E 05 07 +83 2E 45 07 03 2F 85 07 83 2F C5 07 03 25 85 02 +73 00 20 10 73 11 01 14 23 22 11 00 23 26 31 00 +23 28 41 00 23 2A 51 00 23 2C 61 00 23 2E 71 00 +23 20 81 02 23 22 91 02 23 24 A1 02 23 26 B1 02 +23 28 C1 02 23 2A D1 02 23 2C E1 02 23 2E F1 02 +23 20 01 05 23 22 11 05 23 24 21 05 23 26 31 05 +23 28 41 05 23 2A 51 05 23 2C 61 05 23 2E 71 05 +23 20 81 07 23 22 91 07 23 24 A1 07 23 26 B1 07 +23 28 C1 07 23 2A D1 07 23 2C E1 07 23 2E F1 07 +F3 12 01 14 23 24 51 00 F3 22 00 10 23 20 51 08 +F3 22 10 14 23 22 51 08 F3 22 30 14 23 24 51 08 +F3 22 20 14 23 26 51 08 13 05 01 00 6F 20 80 3A +@80001000 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 +@80002000 +B3 67 B5 00 B3 E7 C7 00 93 F7 37 00 B3 06 C5 00 +63 84 07 02 33 86 C5 00 93 07 05 00 63 7E D5 02 +03 C7 05 00 93 85 15 00 93 87 17 00 A3 8F E7 FE +E3 98 C5 FE 67 80 00 00 E3 7E D5 FE 93 07 05 00 +03 A7 05 00 93 87 47 00 93 85 45 00 23 AE E7 FE +E3 E8 D7 FE 67 80 00 00 67 80 00 00 13 01 01 FF +B3 67 C5 00 23 24 81 00 23 26 11 00 93 F7 37 00 +13 04 05 00 33 07 C5 00 63 82 07 02 63 76 E5 00 +93 F5 F5 0F EF F0 9F FD 83 20 C1 00 13 05 04 00 +03 24 81 00 13 01 01 01 67 80 00 00 93 F5 F5 0F +93 97 85 00 B3 E7 B7 00 93 96 07 01 B3 E6 F6 00 +E3 7C E5 FC 93 07 05 00 93 87 47 00 23 AE D7 FE +E3 EC E7 FE 83 20 C1 00 13 05 04 00 03 24 81 00 +13 01 01 01 67 80 00 00 83 47 05 00 63 8E 07 00 +93 07 05 00 03 C7 17 00 93 87 17 00 E3 1C 07 FE +33 85 A7 40 67 80 00 00 13 05 00 00 67 80 00 00 +83 47 05 00 93 85 15 00 13 05 15 00 03 C7 F5 FF +63 88 07 00 E3 86 E7 FE 33 85 E7 40 67 80 00 00 +93 07 00 00 6F F0 5F FF B3 67 B5 00 93 F7 37 00 +63 9E 07 02 13 78 C6 FF 33 08 05 01 63 78 05 03 +93 07 05 00 6F 00 00 01 93 87 47 00 93 85 45 00 +63 F8 07 01 83 A6 07 00 03 A7 05 00 E3 86 E6 FE +33 85 A7 40 33 06 A6 40 13 85 07 00 33 86 C5 00 +6F 00 40 01 03 C7 05 00 83 47 F5 FF 93 85 15 00 +63 9A E7 00 13 05 15 00 E3 96 C5 FE 13 05 00 00 +67 80 00 00 33 85 E7 40 67 80 00 00 93 07 05 00 +03 C7 05 00 93 87 17 00 93 85 15 00 A3 8F E7 FE +E3 18 07 FE 67 80 00 00 03 47 05 00 93 06 00 02 +93 07 05 00 63 18 D7 00 03 C7 17 00 93 87 17 00 +E3 0C D7 FE 93 06 D0 02 63 00 D7 06 93 06 B0 02 +63 00 D7 04 83 C6 07 00 93 05 00 00 63 82 06 04 +13 05 00 00 93 87 17 00 13 17 25 00 13 86 06 FD +83 C6 07 00 33 07 A7 00 13 17 17 00 33 05 E6 00 +E3 92 06 FE 63 80 05 02 33 05 A0 40 67 80 00 00 +83 C6 17 00 93 05 00 00 93 87 17 00 E3 92 06 FC +13 05 00 00 67 80 00 00 83 C6 17 00 93 05 10 00 +93 87 17 00 E3 96 06 FA 13 05 00 00 6F F0 9F FE +83 45 05 00 63 80 05 06 97 F6 FF FF 93 86 86 DA +17 F6 FF FF 13 06 06 DE 03 A7 06 00 83 A7 46 00 +13 88 05 00 13 05 15 00 33 67 F7 00 B7 08 01 01 +63 02 07 02 13 07 00 00 23 20 E6 00 93 07 00 00 +23 22 F6 00 03 A7 06 00 83 A7 46 00 33 67 F7 00 +E3 12 07 FE 23 A0 06 01 23 A2 16 01 83 45 05 00 +E3 9C 05 FA 67 80 00 00 97 F6 FF FF 93 86 86 D4 +03 A7 06 00 83 A7 46 00 13 08 05 00 93 58 F5 41 +33 67 F7 00 63 06 07 02 17 F6 FF FF 13 06 86 D6 +13 07 00 00 23 20 E6 00 93 07 00 00 23 22 F6 00 +03 A7 06 00 83 A7 46 00 33 67 F7 00 E3 12 07 FE +23 A0 06 01 23 A2 16 01 6F 00 00 00 13 01 01 FF +13 05 90 34 23 26 11 00 EF F0 1F FA 13 01 01 FE +13 06 C1 00 13 07 B1 01 13 03 90 00 6F 00 80 00 +13 87 07 00 93 77 F5 00 B3 37 F3 00 B3 07 F0 40 +93 F7 77 02 93 76 F5 00 93 87 07 03 B3 87 F6 00 +23 00 F7 00 93 96 C5 01 13 55 45 00 93 07 F7 FF +33 E5 A6 00 93 D5 45 00 E3 14 E6 FC 03 45 C1 00 +23 0E 01 00 63 02 05 06 93 05 06 00 97 F6 FF FF +93 86 46 C8 17 F6 FF FF 13 06 C6 CB 03 A7 06 00 +83 A7 46 00 13 08 05 00 93 85 15 00 33 67 F7 00 +B7 08 01 01 63 02 07 02 13 07 00 00 23 20 E6 00 +93 07 00 00 23 22 F6 00 03 A7 06 00 83 A7 46 00 +33 67 F7 00 E3 12 07 FE 03 C5 05 00 23 A0 06 01 +23 A2 16 01 E3 1C 05 FA 13 01 01 02 67 80 00 00 +13 01 01 FF 37 F8 FF FF 23 26 11 00 33 07 05 01 +B7 E7 03 00 63 78 F7 14 13 57 C5 00 93 06 07 40 +17 36 00 00 13 06 06 C0 93 97 26 00 B3 07 F6 00 +83 A7 07 00 33 75 05 01 63 90 07 0E 97 55 00 00 +93 85 85 BE 03 A8 05 00 63 02 08 14 83 27 48 00 +97 58 00 00 83 A8 08 BD 23 A0 F5 00 63 8E 17 0F +83 27 08 00 93 98 26 00 B3 08 16 01 93 D7 C7 00 +93 97 A7 00 13 E3 F7 0D 93 E5 F7 01 23 A0 68 00 +73 00 05 12 97 27 00 00 93 87 C7 B9 13 17 37 00 +B3 87 E7 00 03 A7 07 00 63 14 07 10 03 27 08 00 +B7 08 04 00 23 A0 E7 00 03 27 48 00 23 A2 E7 00 +F3 A8 08 10 B7 07 C0 FF B3 07 F5 00 37 18 00 00 +13 07 05 00 33 88 07 01 03 AF 07 00 83 AE 47 00 +03 AE 87 00 03 A3 C7 00 23 20 E7 01 23 22 D7 01 +23 24 C7 01 23 26 67 00 93 87 07 01 13 07 07 01 +E3 9C 07 FD 73 90 08 10 93 97 26 00 B3 06 F6 00 +23 A0 B6 00 73 00 05 12 0F 10 00 00 83 20 C1 00 +13 01 01 01 67 80 00 00 13 F7 07 04 63 0A 07 02 +13 F7 07 08 63 1A 07 04 13 07 F0 00 93 E7 07 08 +63 94 E5 04 93 96 26 00 B3 06 D6 00 23 A0 F6 00 +73 00 05 12 83 20 C1 00 13 01 01 01 67 80 00 00 +93 E7 07 04 6F F0 1F FE 97 57 00 00 23 A4 07 AC +6F F0 1F F0 17 15 00 00 13 05 45 C7 EF F0 5F D0 +13 05 30 00 EF F0 5F D6 17 15 00 00 13 05 45 CA +EF F0 1F CF 13 05 30 00 EF F0 1F D5 17 15 00 00 +13 05 85 CD EF F0 DF CD 13 05 30 00 EF F0 DF D3 +17 15 00 00 13 05 C5 CD EF F0 9F CC 13 05 30 00 +EF F0 9F D2 83 25 C5 08 13 01 01 FB 23 24 81 04 +23 26 11 04 23 22 91 04 23 20 21 05 23 2E 31 03 +23 2C 41 03 23 2A 51 03 23 28 61 03 23 26 71 03 +23 24 81 03 23 22 91 03 23 20 A1 03 23 2E B1 01 +93 07 80 00 13 04 05 00 63 8A F5 10 93 07 20 00 +63 80 F5 06 93 87 45 FF 13 07 10 00 63 76 F7 00 +93 07 F0 00 63 92 F5 1C 03 25 84 08 EF F0 5F DE +13 05 04 00 03 24 81 04 83 20 C1 04 83 24 41 04 +03 29 01 04 83 29 C1 03 03 2A 81 03 83 2A 41 03 +03 2B 01 03 83 2B C1 02 03 2C 81 02 83 2C 41 02 +03 2D 01 02 83 2D C1 01 13 01 01 05 6F D0 1F A8 +03 27 45 08 93 77 37 00 63 98 07 08 EF 07 80 00 +73 10 30 00 03 27 07 00 83 A7 07 00 63 0A F7 06 +13 05 10 04 97 15 00 00 93 85 45 C3 97 F6 FF FF +93 86 46 99 17 F6 FF FF 13 06 C6 9C 03 A7 06 00 +83 A7 46 00 13 08 05 00 93 85 15 00 33 67 F7 00 +B7 08 01 01 63 02 07 02 13 07 00 00 23 20 E6 00 +93 07 00 00 23 22 F6 00 03 A7 06 00 83 A7 46 00 +33 67 F7 00 E3 12 07 FE 03 C5 05 00 23 A0 06 01 +23 A2 16 01 E3 1C 05 FA 13 05 30 00 EF F0 DF BE +13 05 10 00 EF F0 5F BE 17 15 00 00 13 05 45 C5 +EF F0 1F B7 13 05 30 00 EF F0 1F BD 03 29 85 02 +37 1C 00 00 97 24 00 00 93 84 C4 90 97 3B 00 00 +93 8B 4B 90 37 0B 04 00 B7 0A C0 FF 97 5D 00 00 +93 8D 4D 8F 17 5A 00 00 13 0A 0A 8F B7 F9 03 00 +6F 00 80 01 23 22 F7 00 23 A0 FD 00 B7 17 00 00 +33 0C FC 00 63 0E 3C 0B 93 57 CC 00 13 94 37 00 +33 87 84 00 03 27 07 00 E3 02 07 FE 93 87 07 40 +93 97 27 00 B3 87 FB 00 83 AC 07 00 93 F7 0C 04 +63 8E 07 06 73 2D 0B 10 37 16 00 00 B3 05 5C 01 +13 05 0C 00 23 26 B1 00 EF F0 1F 9B 63 0E 05 00 +93 FC 0C 08 83 25 C1 00 63 80 0C 04 37 16 00 00 +13 05 0C 00 EF F0 DF 86 B3 87 84 00 73 10 0D 10 +03 A7 0D 00 23 A0 07 00 E3 1E 07 F6 23 A0 FD 00 +23 20 FA 00 6F F0 9F F7 17 15 00 00 13 05 85 B9 +EF F0 1F A9 6F F0 5F F0 17 15 00 00 13 05 05 B3 +EF F0 1F A8 13 05 30 00 EF F0 1F AE 17 15 00 00 +13 05 85 AE EF F0 DF A6 13 05 30 00 EF F0 DF AC +13 05 09 00 EF F0 5F AC F3 27 40 F1 63 96 07 16 +17 46 00 00 13 06 06 80 93 57 C6 00 13 01 01 F6 +93 97 A7 00 23 2E 11 08 23 2C 81 08 97 25 00 00 +93 85 45 7E 93 E7 17 00 23 A0 F5 00 B7 07 00 20 +93 D6 C5 00 37 07 00 80 93 87 F7 0C 23 2E F6 FE +B3 E7 E6 00 73 90 07 18 F3 26 00 18 63 9E D7 16 +13 04 05 00 13 47 F7 FF 93 07 F0 01 97 02 00 00 +93 82 42 01 F3 92 52 30 73 10 07 3B 73 90 07 3A +73 90 52 30 97 E7 BF 7F 93 87 07 8D 73 90 57 10 +F3 27 00 34 B7 08 C0 7F B3 87 17 01 73 90 07 14 +B7 B7 00 00 93 87 07 10 73 90 27 30 B7 E7 01 00 +93 87 07 60 73 90 07 30 73 50 40 30 97 27 C0 7F +93 87 C7 94 17 47 00 00 23 28 F7 74 97 27 C0 7F +93 87 C7 B2 17 47 00 00 23 2E F7 72 37 03 08 00 +17 27 00 00 13 07 87 92 17 2E 00 00 13 0E 8E B1 +93 07 30 02 93 05 00 00 13 03 F3 03 93 88 88 00 +13 96 F5 01 93 D6 17 00 B3 66 D6 00 33 86 67 00 +B3 C7 F6 00 33 08 17 01 13 16 C6 00 93 97 57 00 +23 20 C7 00 23 22 07 01 93 F7 07 02 13 07 87 00 +B3 E7 F6 00 93 D5 15 00 E3 14 EE FC 13 06 00 09 +93 05 00 00 13 05 01 00 97 27 00 00 23 AA 07 AA +EF F0 CF F1 B7 07 00 80 33 04 F4 00 13 05 01 00 +23 22 81 08 EF D0 8F F6 83 20 C1 09 03 24 81 09 +13 01 01 0A 67 80 00 00 B7 37 01 01 37 06 08 00 +93 87 07 77 13 07 00 00 13 06 C6 FF 37 08 00 80 +37 05 00 40 6F 00 C0 02 2F A0 06 00 93 15 F7 01 +93 D6 17 00 B3 E6 D5 00 B3 C7 D7 00 93 97 E7 01 +B3 75 F5 00 13 57 17 00 93 87 06 00 33 E7 E5 00 +B3 F6 C7 00 93 F5 17 00 B3 86 06 01 E3 96 05 FC +03 A0 06 00 6F F0 9F FC 17 15 00 00 13 05 45 9B +EF F0 1F 88 13 05 30 00 EF F0 1F 8E 73 10 00 3A +73 10 10 3A 73 10 20 3A 73 10 30 3A 73 10 00 3B +73 10 10 3B 73 10 20 3B 73 10 30 3B 73 10 40 3B +73 10 50 3B 73 10 60 3B 73 10 70 3B 73 10 80 3B +73 10 90 3B 73 10 A0 3B 73 10 B0 3B 73 10 C0 3B +73 10 D0 3B 73 10 E0 3B 73 10 F0 3B 6F 00 C0 5A +93 02 00 00 B7 0E 00 00 93 8E FE FF 73 90 0E 3B +73 2F 00 3B 63 9A EE 75 73 10 00 3B B7 0E 00 00 +93 8E FE FF 73 90 1E 3B 73 2F 10 3B 63 9E EE 73 +73 10 10 3B B7 0E 00 00 93 8E FE FF 73 90 2E 3B +73 2F 20 3B 63 92 EE 73 73 10 20 3B B7 0E 00 00 +93 8E FE FF 73 90 3E 3B 73 2F 30 3B 63 96 EE 71 +73 10 30 3B B7 0E 00 00 93 8E FE FF 73 90 4E 3B +73 2F 40 3B 63 9A EE 6F 73 10 40 3B B7 0E 00 00 +93 8E FE FF 73 90 5E 3B 73 2F 50 3B 63 9E EE 6D +73 10 50 3B B7 0E 00 00 93 8E FE FF 73 90 6E 3B +73 2F 60 3B 63 92 EE 6D 73 10 60 3B B7 0E 00 00 +93 8E FE FF 73 90 7E 3B 73 2F 70 3B 63 96 EE 6B +73 10 70 3B B7 0E 00 00 93 8E FE FF 73 90 8E 3B +73 2F 80 3B 63 9A EE 69 73 10 80 3B B7 0E 00 00 +93 8E FE FF 73 90 9E 3B 73 2F 90 3B 63 9E EE 67 +73 10 90 3B B7 0E 00 00 93 8E FE FF 73 90 AE 3B +73 2F A0 3B 63 92 EE 67 73 10 A0 3B B7 0E 00 00 +93 8E FE FF 73 90 BE 3B 73 2F B0 3B 63 96 EE 65 +73 10 B0 3B B7 0E 00 00 93 8E FE FF 73 90 CE 3B +73 2F C0 3B 63 9A EE 63 73 10 C0 3B B7 0E 00 00 +93 8E FE FF 73 90 DE 3B 73 2F D0 3B 63 9E EE 61 +73 10 D0 3B B7 0E 00 00 93 8E FE FF 73 90 EE 3B +73 2F E0 3B 63 92 EE 61 73 10 E0 3B B7 0E 00 00 +93 8E FE FF 73 90 FE 3B 73 2F F0 3B 63 96 EE 5F +73 10 F0 3B B7 7E 77 77 93 8E 7E 77 73 90 0E 3A +73 2F 00 3A 63 9A EE 5D 73 10 00 3A B7 7E 77 77 +93 8E 7E 77 73 90 1E 3A 73 2F 10 3A 63 9E EE 5B +73 10 10 3A B7 7E 77 77 93 8E 7E 77 73 90 2E 3A +73 2F 20 3A 63 92 EE 5B 73 10 20 3A B7 7E 77 77 +93 8E 7E 77 73 90 3E 3A 73 2F 30 3A 63 96 EE 59 +73 10 30 3A 6F 00 40 3C 37 0F 00 00 13 0F 0F 08 +F3 2E 00 30 B3 EE EE 01 73 90 0E 30 37 1F 00 00 +13 0F 0F 80 F3 2E 40 30 B3 EE EE 01 73 90 4E 30 +6F 00 80 39 F3 22 00 3A 13 03 F0 0F 93 D2 82 00 +B3 F2 62 00 63 96 D2 00 13 05 00 00 6F 00 C0 37 +13 05 10 00 6F 00 40 37 F3 22 00 30 63 1A 05 00 +37 03 FE FF 13 03 F3 FF B3 F2 62 00 6F 00 C0 00 +37 03 02 00 B3 E2 62 00 73 90 02 30 6F 00 C0 34 +03 20 05 00 13 00 00 00 13 00 00 00 13 00 00 00 +13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 +13 00 00 00 23 20 05 00 13 00 00 00 13 00 00 00 +13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 +13 00 00 00 13 00 00 00 67 00 05 00 13 00 00 00 +13 00 00 00 13 00 00 00 13 00 00 00 13 06 F6 FF +13 56 36 00 93 D5 25 00 B3 E5 C5 00 6F 00 80 00 +93 D5 25 00 93 02 40 00 63 40 55 02 93 02 80 00 +63 40 55 0A 93 02 C0 00 63 40 55 12 93 02 00 01 +63 40 55 1A 6F 00 40 2B 73 23 00 3A 93 02 00 00 +63 8E A2 00 93 02 10 00 63 82 A2 02 93 02 20 00 +63 8A A2 02 93 02 30 00 63 82 A2 04 73 90 05 3B +93 02 00 F0 33 73 53 00 6F 00 C0 04 73 90 15 3B +B7 02 FF FF 93 82 F2 0F 33 73 53 00 93 96 86 00 +6F 00 40 03 73 90 25 3B B7 02 01 FF 93 82 F2 FF +33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 35 3B +B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 +6F 00 40 00 33 63 D3 00 73 10 03 3A 6F 00 C0 22 +73 23 10 3A 93 02 40 00 63 8E A2 00 93 02 50 00 +63 82 A2 02 93 02 60 00 63 8A A2 02 93 02 70 00 +63 82 A2 04 73 90 45 3B 93 02 00 F0 33 73 53 00 +6F 00 C0 04 73 90 55 3B B7 02 FF FF 93 82 F2 0F +33 73 53 00 93 96 86 00 6F 00 40 03 73 90 65 3B +B7 02 01 FF 93 82 F2 FF 33 73 53 00 93 96 06 01 +6F 00 C0 01 73 90 75 3B B7 02 00 01 93 82 F2 FF +33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 +73 10 13 3A 6F 00 40 1A 73 23 20 3A 93 02 80 00 +63 8E A2 00 93 02 90 00 63 82 A2 02 93 02 A0 00 +63 8A A2 02 93 02 B0 00 63 82 A2 04 73 90 85 3B +93 02 00 F0 33 73 53 00 6F 00 C0 04 73 90 95 3B +B7 02 FF FF 93 82 F2 0F 33 73 53 00 93 96 86 00 +6F 00 40 03 73 90 A5 3B B7 02 01 FF 93 82 F2 FF +33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 B5 3B +B7 02 00 01 93 82 F2 FF 33 73 53 00 93 96 86 01 +6F 00 40 00 33 63 D3 00 73 10 23 3A 6F 00 C0 11 +73 23 30 3A 93 02 C0 00 63 8E A2 00 93 02 D0 00 +63 82 A2 02 93 02 E0 00 63 8A A2 02 93 02 F0 00 +63 82 A2 04 73 90 C5 3B 93 02 00 F0 33 73 53 00 +6F 00 C0 04 73 90 D5 3B B7 02 FF FF 93 82 F2 0F +33 73 53 00 93 96 86 00 6F 00 40 03 73 90 E5 3B +B7 02 01 FF 93 82 F2 FF 33 73 53 00 93 96 06 01 +6F 00 C0 01 73 90 F5 3B B7 02 00 01 93 82 F2 FF +33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 +73 10 33 3A 6F 00 40 09 93 02 00 00 63 06 57 08 +93 02 80 00 E3 06 57 DA 93 02 00 01 E3 08 57 D8 +93 02 80 01 E3 04 57 D8 13 05 10 00 6F 00 C0 06 +63 06 A0 00 73 10 65 30 6F 00 00 06 73 50 60 30 +6F 00 80 05 93 0E 00 00 E3 8A D8 A5 93 0E 10 00 +E3 80 D8 AB 93 0E 80 00 E3 88 D8 FB 93 0E 90 00 +E3 8C D8 C7 93 0E A0 00 E3 80 D8 CD 93 0E B0 00 +E3 80 D8 CF 93 0E C0 00 E3 8E D8 CF 93 0E D0 00 +E3 8C D8 D1 93 0E E0 00 E3 8E D8 C7 93 0E F0 00 +E3 80 D8 FB 6F 00 40 00 F3 2E 10 34 93 8E 4E 00 +73 90 1E 34 73 00 20 30 13 0A 1A 00 73 00 20 30 +67 80 00 00 6F 00 00 08 93 8F 1F 00 73 00 10 00 +6F F0 9F FD 93 8F 1F 00 73 00 10 00 73 24 20 34 +93 02 50 00 63 0A 54 00 93 02 70 00 63 02 54 02 +93 02 10 00 63 0A 54 02 13 09 19 00 13 05 50 00 +97 02 00 00 93 82 82 09 73 90 12 34 6F 00 40 03 +13 09 19 00 13 05 70 00 97 02 00 00 93 82 C2 0B +73 90 12 34 6F 00 C0 01 13 09 19 00 13 05 10 00 +97 02 00 00 93 82 C2 0E 73 90 12 34 6F 00 40 00 +73 00 20 30 13 05 00 00 93 05 00 00 37 06 04 00 +93 06 F0 01 13 07 80 01 93 08 80 00 73 00 00 00 +13 04 00 00 13 05 10 00 93 08 A0 00 73 00 00 00 +13 05 10 00 B7 05 04 00 37 06 04 00 93 06 C0 01 +13 07 80 01 93 08 80 00 73 00 00 00 37 05 04 00 +93 08 B0 00 73 00 00 00 93 02 50 00 63 16 A4 0C +93 02 10 00 63 12 59 0C 13 00 00 00 13 05 10 00 +B7 05 04 00 37 06 04 00 93 06 90 01 13 07 80 01 +93 08 80 00 73 00 00 00 37 05 04 00 93 08 C0 00 +73 00 00 00 93 02 70 00 63 18 A4 08 93 02 20 00 +63 14 59 08 13 00 00 00 13 05 10 00 B7 05 04 00 +37 06 04 00 93 06 B0 09 13 07 80 01 93 08 80 00 +73 00 00 00 93 02 30 01 37 03 04 00 23 20 53 00 +37 05 04 00 93 08 D0 00 73 00 00 00 93 02 10 00 +63 14 A4 04 93 02 30 00 63 10 59 04 13 00 00 00 +13 05 10 00 B7 05 04 00 13 06 00 02 93 06 F0 01 +13 07 80 01 93 08 80 00 73 00 00 00 13 05 F0 01 +93 08 E0 00 73 00 00 00 93 02 10 00 63 16 55 00 +6F 00 80 01 63 1A 30 00 13 95 11 00 63 00 05 00 +13 65 15 00 73 00 00 00 13 05 10 00 73 00 00 00 +73 00 10 00 73 10 00 C0 +@800031B8 +41 73 73 65 72 74 69 6F 6E 20 66 61 69 6C 65 64 +3A 20 61 64 64 72 20 3E 3D 20 28 31 55 4C 20 3C +3C 20 31 32 29 20 26 26 20 61 64 64 72 20 3C 20 +36 33 20 2A 20 28 31 55 4C 20 3C 3C 20 31 32 29 +0A 00 00 00 41 73 73 65 72 74 69 6F 6E 20 66 61 +69 6C 65 64 3A 20 21 28 70 74 5B 31 5D 5B 61 64 +64 72 2F 28 31 55 4C 20 3C 3C 20 31 32 29 5D 20 +26 20 30 78 30 38 30 29 20 26 26 20 63 61 75 73 +65 20 3D 3D 20 30 78 66 0A 00 00 00 41 73 73 65 +72 74 69 6F 6E 20 66 61 69 6C 65 64 3A 20 6E 6F +64 65 0A 00 41 73 73 65 72 74 69 6F 6E 20 66 61 +69 6C 65 64 3A 20 75 73 65 72 5F 6D 61 70 70 69 +6E 67 5B 61 64 64 72 2F 28 31 55 4C 20 3C 3C 20 +31 32 29 5D 2E 61 64 64 72 20 3D 3D 20 30 0A 00 +41 73 73 65 72 74 69 6F 6E 20 66 61 69 6C 65 64 +3A 20 21 22 69 6C 6C 65 67 61 6C 20 69 6E 73 74 +72 75 63 74 69 6F 6E 22 0A 00 00 00 41 73 73 65 +72 74 69 6F 6E 20 66 61 69 6C 65 64 3A 20 70 74 +5B 31 5D 5B 61 64 64 72 2F 28 31 55 4C 20 3C 3C +20 31 32 29 5D 20 26 20 30 78 30 34 30 0A 00 00 +41 73 73 65 72 74 69 6F 6E 20 66 61 69 6C 65 64 +3A 20 70 74 5B 31 5D 5B 61 64 64 72 2F 28 31 55 +4C 20 3C 3C 20 31 32 29 5D 20 26 20 30 78 30 38 +30 0A 00 00 41 73 73 65 72 74 69 6F 6E 20 66 61 +69 6C 65 64 3A 20 74 66 2D 3E 65 70 63 20 25 20 +34 20 3D 3D 20 30 0A 00 41 73 73 65 72 74 69 6F +6E 20 66 61 69 6C 65 64 3A 20 21 22 75 6E 65 78 +70 65 63 74 65 64 20 65 78 63 65 70 74 69 6F 6E +22 0A 00 00 41 73 73 65 72 74 69 6F 6E 20 66 61 +69 6C 65 64 3A 20 21 22 75 6E 73 75 70 70 6F 72 +74 65 64 20 73 61 74 70 20 6D 6F 64 65 22 0A 00 diff --git a/test/priv_sec_testsuite/tests/rv32ui/Makefrag b/test/priv_sec_testsuite/tests/rv32ui/Makefrag index 2867a69..3f694ad 100644 --- a/test/priv_sec_testsuite/tests/rv32ui/Makefrag +++ b/test/priv_sec_testsuite/tests/rv32ui/Makefrag @@ -8,6 +8,7 @@ rv32ui_sc_tests = \ test2 \ test3 \ test4 \ + test5 \ rv32ui_p_tests = $(addprefix rv32ui-p-, $(rv32ui_sc_tests)) rv32ui_v_tests = $(addprefix rv32ui-v-, $(rv32ui_sc_tests)) diff --git a/test/priv_sec_testsuite/tests/rv32ui/test5.S b/test/priv_sec_testsuite/tests/rv32ui/test5.S new file mode 100644 index 0000000..e8bf0d9 --- /dev/null +++ b/test/priv_sec_testsuite/tests/rv32ui/test5.S @@ -0,0 +1,8 @@ +# distributed under the mit license +# https://opensource.org/licenses/mit-license.php + +#include "riscv_test.h" +#undef RVTEST_RV64U +#define RVTEST_RV64U RVTEST_RV32U + +#include "../rv64ui/test4.S" diff --git a/test/priv_sec_testsuite/tests/rv64ui-p-test2.v b/test/priv_sec_testsuite/tests/rv64ui-p-test2.v index 1750093..291fb82 100755 --- a/test/priv_sec_testsuite/tests/rv64ui-p-test2.v +++ b/test/priv_sec_testsuite/tests/rv64ui-p-test2.v @@ -1,10 +1,10 @@ @00010000 6F 00 00 0B 73 2F 20 34 93 0E 80 00 63 14 DF 01 -6F 20 C0 63 93 0E 90 00 63 06 DF 1D 93 0E B0 00 +6F 20 00 65 93 0E 90 00 63 06 DF 1D 93 0E B0 00 63 06 DF 1D 93 0E 20 00 63 04 DF 1D B7 0E 00 80 -93 8E BE 00 63 14 DF 01 6F 20 00 67 B7 0E 00 80 -93 8E 3E 00 63 14 DF 01 6F 20 00 66 B7 0E 00 80 -93 8E 7E 00 63 14 DF 01 6F 20 00 65 93 0E 50 00 +93 8E BE 00 63 14 DF 01 6F 20 C0 68 B7 0E 00 80 +93 8E 3E 00 63 14 DF 01 6F 20 C0 67 B7 0E 00 80 +93 8E 7E 00 63 14 DF 01 6F 20 C0 66 93 0E 50 00 63 0C DF 19 93 0E 70 00 63 08 DF 19 93 0E 10 00 63 04 DF 19 93 0E 40 00 63 00 DF 19 93 0E 60 00 63 0C DF 17 93 0E 00 00 63 08 DF 17 13 0F 00 00 @@ -29,7 +29,7 @@ 93 02 00 00 63 8A 02 00 73 90 52 10 B7 B2 00 00 9B 82 92 10 73 90 22 30 73 50 00 30 97 02 00 00 93 82 42 01 73 90 12 34 73 25 40 F1 73 00 20 30 -6F 00 00 02 93 8F 1F 00 73 00 10 00 6F 20 C0 4A +6F 00 00 02 93 8F 1F 00 73 00 10 00 6F 20 80 4C 93 8F 1F 00 73 00 10 00 13 04 14 00 73 00 20 30 93 08 00 00 73 00 00 00 93 08 10 00 73 00 00 00 93 04 00 00 13 09 00 01 33 85 04 00 B7 05 10 00 @@ -79,7 +79,7 @@ E3 94 62 FE 67 80 00 00 63 14 30 02 0F 00 F0 0F 73 10 40 3B 73 10 50 3B 73 10 60 3B 73 10 70 3B 73 10 80 3B 73 10 90 3B 73 10 A0 3B 73 10 B0 3B 73 10 C0 3B 73 10 D0 3B 73 10 E0 3B 73 10 F0 3B -6F 00 80 64 93 02 00 00 B7 0E 00 00 93 8E FE FF +6F 00 40 66 93 02 00 00 B7 0E 00 00 93 8E FE FF 73 90 0E 3B 73 2F 00 3B 63 84 EE 01 6F E0 0F B5 73 10 00 3B B7 0E 00 00 93 8E FE FF 73 90 1E 3B 73 2F 10 3B 63 84 EE 01 6F E0 4F B3 73 10 10 3B @@ -114,15 +114,15 @@ B7 0E 00 00 93 8E FE FF 73 90 EE 3B 73 2F E0 3B B7 7E 77 77 93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 63 84 EE 01 6F E0 8F 95 73 10 20 3A B7 7E 77 77 93 8E 7E 77 73 90 3E 3A 73 2F 30 3A 63 84 EE 01 -6F E0 CF 93 73 10 30 3A 6F 00 00 41 37 0F 00 00 +6F E0 CF 93 73 10 30 3A 6F 00 C0 42 37 0F 00 00 13 0F 0F 08 F3 2E 00 30 B3 EE EE 01 73 90 0E 30 37 1F 00 00 13 0F 0F 80 F3 2E 40 30 B3 EE EE 01 -73 90 4E 30 6F 00 40 3E F3 22 00 3A 13 03 F0 0F +73 90 4E 30 6F 00 00 40 F3 22 00 3A 13 03 F0 0F 93 D2 82 00 B3 F2 62 00 63 96 D2 00 13 05 00 00 -6F 00 80 3C 13 05 10 00 6F 00 00 3C F3 22 00 30 +6F 00 40 3E 13 05 10 00 6F 00 C0 3D F3 22 00 30 63 1E 05 00 37 83 00 00 1B 03 F3 FF 13 13 13 01 13 03 F3 FF B3 F2 62 00 6F 00 C0 00 37 03 02 00 -B3 E2 62 00 73 90 02 30 6F 00 00 39 03 20 05 00 +B3 E2 62 00 73 90 02 30 6F 00 C0 3A 03 20 05 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 23 20 05 00 13 00 00 00 13 00 00 00 13 00 00 00 @@ -132,7 +132,7 @@ B3 E2 62 00 73 90 02 30 6F 00 00 39 03 20 05 00 93 D5 25 00 B3 E5 C5 00 6F 00 80 00 93 D5 25 00 93 02 40 00 63 40 55 02 93 02 80 00 63 4C 55 0A 93 02 C0 00 63 48 55 14 93 02 00 01 63 44 55 1E -6F 00 80 2F 73 23 00 3A 93 02 00 00 63 8E A2 00 +6F 00 40 31 73 23 00 3A 93 02 00 00 63 8E A2 00 93 02 10 00 63 86 A2 02 93 02 20 00 63 82 A2 04 93 02 30 00 63 8E A2 04 73 90 05 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 6F 00 C0 05 @@ -142,7 +142,7 @@ B3 E2 62 00 73 90 02 30 6F 00 00 39 03 20 05 00 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 35 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 03 3A -6F 00 80 25 73 23 10 3A 93 02 40 00 63 8E A2 00 +6F 00 40 27 73 23 10 3A 93 02 40 00 63 8E A2 00 93 02 50 00 63 86 A2 02 93 02 60 00 63 82 A2 04 93 02 70 00 63 8E A2 04 73 90 45 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 6F 00 C0 05 @@ -152,7 +152,7 @@ B3 E2 62 00 73 90 02 30 6F 00 00 39 03 20 05 00 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 75 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 13 3A -6F 00 80 1B 73 23 20 3A 93 02 80 00 63 8E A2 00 +6F 00 40 1D 73 23 20 3A 93 02 80 00 63 8E A2 00 93 02 90 00 63 86 A2 02 93 02 A0 00 63 82 A2 04 93 02 B0 00 63 8E A2 04 73 90 85 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 6F 00 C0 05 @@ -162,7 +162,7 @@ B3 E2 62 00 73 90 02 30 6F 00 00 39 03 20 05 00 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 B5 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 23 3A -6F 00 80 11 73 23 30 3A 93 02 C0 00 63 8E A2 00 +6F 00 40 13 73 23 30 3A 93 02 C0 00 63 8E A2 00 93 02 D0 00 63 86 A2 02 93 02 E0 00 63 82 A2 04 93 02 F0 00 63 8E A2 04 73 90 C5 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 6F 00 C0 05 @@ -172,12 +172,14 @@ B3 E2 62 00 73 90 02 30 6F 00 00 39 03 20 05 00 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 F5 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 33 3A -6F 00 80 07 93 02 00 00 63 08 57 06 93 02 80 00 +6F 00 40 09 93 02 00 00 63 06 57 08 93 02 80 00 E3 06 57 D4 93 02 00 01 E3 08 57 D2 93 02 80 01 -E3 04 57 D2 13 05 10 00 6F 00 00 05 93 0E 00 00 -E3 88 D8 9B 93 0E 10 00 E3 8E D8 9F 93 0E 80 00 -E3 82 D8 FD 93 0E 90 00 E3 82 D8 C3 93 0E A0 00 -E3 86 D8 C7 93 0E B0 00 E3 8A D8 C9 93 0E C0 00 -E3 88 D8 CB 93 0E D0 00 E3 86 D8 CD 93 0E E0 00 -E3 84 D8 C3 6F 00 40 00 F3 2E 10 34 93 8E 4E 00 -73 90 1E 34 73 00 20 30 13 0A 1A 00 73 00 20 30 +E3 04 57 D2 13 05 10 00 6F 00 C0 06 63 06 A0 00 +73 10 65 30 6F 00 00 06 73 50 60 30 6F 00 80 05 +93 0E 00 00 E3 8E D8 99 93 0E 10 00 E3 84 D8 9F +93 0E 80 00 E3 88 D8 FB 93 0E 90 00 E3 88 D8 C1 +93 0E A0 00 E3 8C D8 C5 93 0E B0 00 E3 80 D8 C9 +93 0E C0 00 E3 8E D8 C9 93 0E D0 00 E3 8C D8 CB +93 0E E0 00 E3 8A D8 C1 93 0E F0 00 E3 80 D8 FB +6F 00 40 00 F3 2E 10 34 93 8E 4E 00 73 90 1E 34 +73 00 20 30 13 0A 1A 00 73 00 20 30 diff --git a/test/priv_sec_testsuite/tests/rv64ui-p-test3.v b/test/priv_sec_testsuite/tests/rv64ui-p-test3.v index 803e097..607d62e 100755 --- a/test/priv_sec_testsuite/tests/rv64ui-p-test3.v +++ b/test/priv_sec_testsuite/tests/rv64ui-p-test3.v @@ -1,10 +1,10 @@ @00010000 6F 00 00 0B 73 2F 20 34 93 0E 80 00 63 14 DF 01 -6F 20 C0 63 93 0E 90 00 63 06 DF 1D 93 0E B0 00 +6F 20 00 65 93 0E 90 00 63 06 DF 1D 93 0E B0 00 63 06 DF 1D 93 0E 20 00 63 04 DF 1D B7 0E 00 80 -93 8E BE 00 63 14 DF 01 6F 20 00 67 B7 0E 00 80 -93 8E 3E 00 63 14 DF 01 6F 20 00 66 B7 0E 00 80 -93 8E 7E 00 63 14 DF 01 6F 20 00 65 93 0E 50 00 +93 8E BE 00 63 14 DF 01 6F 20 C0 68 B7 0E 00 80 +93 8E 3E 00 63 14 DF 01 6F 20 C0 67 B7 0E 00 80 +93 8E 7E 00 63 14 DF 01 6F 20 C0 66 93 0E 50 00 63 0C DF 19 93 0E 70 00 63 08 DF 19 93 0E 10 00 63 04 DF 19 93 0E 40 00 63 00 DF 19 93 0E 60 00 63 0C DF 17 93 0E 00 00 63 08 DF 17 13 0F 00 00 @@ -29,7 +29,7 @@ 93 02 00 00 63 8A 02 00 73 90 52 10 B7 B2 00 00 9B 82 92 10 73 90 22 30 73 50 00 30 97 02 00 00 93 82 42 01 73 90 12 34 73 25 40 F1 73 00 20 30 -6F 00 40 05 93 8F 1F 00 73 00 10 00 6F 20 C0 4A +6F 00 40 05 93 8F 1F 00 73 00 10 00 6F 20 80 4C 93 8F 1F 00 73 00 10 00 73 24 20 34 93 02 50 00 63 0A 54 00 93 02 70 00 63 06 54 00 93 02 10 00 63 04 54 00 73 00 20 30 13 09 19 00 93 02 10 00 @@ -67,7 +67,7 @@ B7 02 04 00 67 80 02 00 93 02 10 00 63 12 54 04 73 10 40 3B 73 10 50 3B 73 10 60 3B 73 10 70 3B 73 10 80 3B 73 10 90 3B 73 10 A0 3B 73 10 B0 3B 73 10 C0 3B 73 10 D0 3B 73 10 E0 3B 73 10 F0 3B -6F 00 80 64 93 02 00 00 B7 0E 00 00 93 8E FE FF +6F 00 40 66 93 02 00 00 B7 0E 00 00 93 8E FE FF 73 90 0E 3B 73 2F 00 3B 63 84 EE 01 6F E0 4F AB 73 10 00 3B B7 0E 00 00 93 8E FE FF 73 90 1E 3B 73 2F 10 3B 63 84 EE 01 6F E0 8F A9 73 10 10 3B @@ -102,15 +102,15 @@ B7 0E 00 00 93 8E FE FF 73 90 EE 3B 73 2F E0 3B B7 7E 77 77 93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 63 84 EE 01 6F E0 CF 8B 73 10 20 3A B7 7E 77 77 93 8E 7E 77 73 90 3E 3A 73 2F 30 3A 63 84 EE 01 -6F E0 0F 8A 73 10 30 3A 6F 00 00 41 37 0F 00 00 +6F E0 0F 8A 73 10 30 3A 6F 00 C0 42 37 0F 00 00 13 0F 0F 08 F3 2E 00 30 B3 EE EE 01 73 90 0E 30 37 1F 00 00 13 0F 0F 80 F3 2E 40 30 B3 EE EE 01 -73 90 4E 30 6F 00 40 3E F3 22 00 3A 13 03 F0 0F +73 90 4E 30 6F 00 00 40 F3 22 00 3A 13 03 F0 0F 93 D2 82 00 B3 F2 62 00 63 96 D2 00 13 05 00 00 -6F 00 80 3C 13 05 10 00 6F 00 00 3C F3 22 00 30 +6F 00 40 3E 13 05 10 00 6F 00 C0 3D F3 22 00 30 63 1E 05 00 37 83 00 00 1B 03 F3 FF 13 13 13 01 13 03 F3 FF B3 F2 62 00 6F 00 C0 00 37 03 02 00 -B3 E2 62 00 73 90 02 30 6F 00 00 39 03 20 05 00 +B3 E2 62 00 73 90 02 30 6F 00 C0 3A 03 20 05 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 23 20 05 00 13 00 00 00 13 00 00 00 13 00 00 00 @@ -120,7 +120,7 @@ B3 E2 62 00 73 90 02 30 6F 00 00 39 03 20 05 00 93 D5 25 00 B3 E5 C5 00 6F 00 80 00 93 D5 25 00 93 02 40 00 63 40 55 02 93 02 80 00 63 4C 55 0A 93 02 C0 00 63 48 55 14 93 02 00 01 63 44 55 1E -6F 00 80 2F 73 23 00 3A 93 02 00 00 63 8E A2 00 +6F 00 40 31 73 23 00 3A 93 02 00 00 63 8E A2 00 93 02 10 00 63 86 A2 02 93 02 20 00 63 82 A2 04 93 02 30 00 63 8E A2 04 73 90 05 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 6F 00 C0 05 @@ -130,7 +130,7 @@ B3 E2 62 00 73 90 02 30 6F 00 00 39 03 20 05 00 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 35 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 03 3A -6F 00 80 25 73 23 10 3A 93 02 40 00 63 8E A2 00 +6F 00 40 27 73 23 10 3A 93 02 40 00 63 8E A2 00 93 02 50 00 63 86 A2 02 93 02 60 00 63 82 A2 04 93 02 70 00 63 8E A2 04 73 90 45 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 6F 00 C0 05 @@ -140,7 +140,7 @@ B3 E2 62 00 73 90 02 30 6F 00 00 39 03 20 05 00 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 75 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 13 3A -6F 00 80 1B 73 23 20 3A 93 02 80 00 63 8E A2 00 +6F 00 40 1D 73 23 20 3A 93 02 80 00 63 8E A2 00 93 02 90 00 63 86 A2 02 93 02 A0 00 63 82 A2 04 93 02 B0 00 63 8E A2 04 73 90 85 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 6F 00 C0 05 @@ -150,7 +150,7 @@ B3 E2 62 00 73 90 02 30 6F 00 00 39 03 20 05 00 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 B5 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 23 3A -6F 00 80 11 73 23 30 3A 93 02 C0 00 63 8E A2 00 +6F 00 40 13 73 23 30 3A 93 02 C0 00 63 8E A2 00 93 02 D0 00 63 86 A2 02 93 02 E0 00 63 82 A2 04 93 02 F0 00 63 8E A2 04 73 90 C5 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 6F 00 C0 05 @@ -160,12 +160,14 @@ B3 E2 62 00 73 90 02 30 6F 00 00 39 03 20 05 00 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 F5 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 33 3A -6F 00 80 07 93 02 00 00 63 08 57 06 93 02 80 00 +6F 00 40 09 93 02 00 00 63 06 57 08 93 02 80 00 E3 06 57 D4 93 02 00 01 E3 08 57 D2 93 02 80 01 -E3 04 57 D2 13 05 10 00 6F 00 00 05 93 0E 00 00 -E3 88 D8 9B 93 0E 10 00 E3 8E D8 9F 93 0E 80 00 -E3 82 D8 FD 93 0E 90 00 E3 82 D8 C3 93 0E A0 00 -E3 86 D8 C7 93 0E B0 00 E3 8A D8 C9 93 0E C0 00 -E3 88 D8 CB 93 0E D0 00 E3 86 D8 CD 93 0E E0 00 -E3 84 D8 C3 6F 00 40 00 F3 2E 10 34 93 8E 4E 00 -73 90 1E 34 73 00 20 30 13 0A 1A 00 73 00 20 30 +E3 04 57 D2 13 05 10 00 6F 00 C0 06 63 06 A0 00 +73 10 65 30 6F 00 00 06 73 50 60 30 6F 00 80 05 +93 0E 00 00 E3 8E D8 99 93 0E 10 00 E3 84 D8 9F +93 0E 80 00 E3 88 D8 FB 93 0E 90 00 E3 88 D8 C1 +93 0E A0 00 E3 8C D8 C5 93 0E B0 00 E3 80 D8 C9 +93 0E C0 00 E3 8E D8 C9 93 0E D0 00 E3 8C D8 CB +93 0E E0 00 E3 8A D8 C1 93 0E F0 00 E3 80 D8 FB +6F 00 40 00 F3 2E 10 34 93 8E 4E 00 73 90 1E 34 +73 00 20 30 13 0A 1A 00 73 00 20 30 diff --git a/test/priv_sec_testsuite/tests/rv64ui-p-test4.v b/test/priv_sec_testsuite/tests/rv64ui-p-test4.v index 0d45095..62f1fc6 100755 --- a/test/priv_sec_testsuite/tests/rv64ui-p-test4.v +++ b/test/priv_sec_testsuite/tests/rv64ui-p-test4.v @@ -1,10 +1,10 @@ @00010000 6F 00 00 0B 73 2F 20 34 93 0E 80 00 63 14 DF 01 -6F 20 C0 63 93 0E 90 00 63 06 DF 1D 93 0E B0 00 +6F 20 00 65 93 0E 90 00 63 06 DF 1D 93 0E B0 00 63 06 DF 1D 93 0E 20 00 63 04 DF 1D B7 0E 00 80 -93 8E BE 00 63 14 DF 01 6F 20 00 67 B7 0E 00 80 -93 8E 3E 00 63 14 DF 01 6F 20 00 66 B7 0E 00 80 -93 8E 7E 00 63 14 DF 01 6F 20 00 65 93 0E 50 00 +93 8E BE 00 63 14 DF 01 6F 20 C0 68 B7 0E 00 80 +93 8E 3E 00 63 14 DF 01 6F 20 C0 67 B7 0E 00 80 +93 8E 7E 00 63 14 DF 01 6F 20 C0 66 93 0E 50 00 63 0C DF 19 93 0E 70 00 63 08 DF 19 93 0E 10 00 63 04 DF 19 93 0E 40 00 63 00 DF 19 93 0E 60 00 63 0C DF 17 93 0E 00 00 63 08 DF 17 13 0F 00 00 @@ -29,7 +29,7 @@ 93 02 00 00 63 8A 02 00 73 90 52 10 B7 B2 00 00 9B 82 92 10 73 90 22 30 73 50 00 30 97 02 00 00 93 82 42 01 73 90 12 34 73 25 40 F1 73 00 20 30 -6F 00 00 08 93 8F 1F 00 73 00 10 00 6F 20 C0 4A +6F 00 00 08 93 8F 1F 00 73 00 10 00 6F 20 80 4C 93 8F 1F 00 73 00 10 00 73 24 20 34 93 02 50 00 63 0A 54 00 93 02 70 00 63 02 54 02 93 02 10 00 63 0A 54 02 13 09 19 00 13 05 50 00 97 02 00 00 @@ -75,7 +75,7 @@ B7 05 04 00 13 06 00 02 93 06 F0 01 13 07 80 01 73 10 40 3B 73 10 50 3B 73 10 60 3B 73 10 70 3B 73 10 80 3B 73 10 90 3B 73 10 A0 3B 73 10 B0 3B 73 10 C0 3B 73 10 D0 3B 73 10 E0 3B 73 10 F0 3B -6F 00 80 64 93 02 00 00 B7 0E 00 00 93 8E FE FF +6F 00 40 66 93 02 00 00 B7 0E 00 00 93 8E FE FF 73 90 0E 3B 73 2F 00 3B 63 84 EE 01 6F E0 8F B1 73 10 00 3B B7 0E 00 00 93 8E FE FF 73 90 1E 3B 73 2F 10 3B 63 84 EE 01 6F E0 CF AF 73 10 10 3B @@ -110,15 +110,15 @@ B7 0E 00 00 93 8E FE FF 73 90 EE 3B 73 2F E0 3B B7 7E 77 77 93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 63 84 EE 01 6F E0 0F 92 73 10 20 3A B7 7E 77 77 93 8E 7E 77 73 90 3E 3A 73 2F 30 3A 63 84 EE 01 -6F E0 4F 90 73 10 30 3A 6F 00 00 41 37 0F 00 00 +6F E0 4F 90 73 10 30 3A 6F 00 C0 42 37 0F 00 00 13 0F 0F 08 F3 2E 00 30 B3 EE EE 01 73 90 0E 30 37 1F 00 00 13 0F 0F 80 F3 2E 40 30 B3 EE EE 01 -73 90 4E 30 6F 00 40 3E F3 22 00 3A 13 03 F0 0F +73 90 4E 30 6F 00 00 40 F3 22 00 3A 13 03 F0 0F 93 D2 82 00 B3 F2 62 00 63 96 D2 00 13 05 00 00 -6F 00 80 3C 13 05 10 00 6F 00 00 3C F3 22 00 30 +6F 00 40 3E 13 05 10 00 6F 00 C0 3D F3 22 00 30 63 1E 05 00 37 83 00 00 1B 03 F3 FF 13 13 13 01 13 03 F3 FF B3 F2 62 00 6F 00 C0 00 37 03 02 00 -B3 E2 62 00 73 90 02 30 6F 00 00 39 03 20 05 00 +B3 E2 62 00 73 90 02 30 6F 00 C0 3A 03 20 05 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 23 20 05 00 13 00 00 00 13 00 00 00 13 00 00 00 @@ -128,7 +128,7 @@ B3 E2 62 00 73 90 02 30 6F 00 00 39 03 20 05 00 93 D5 25 00 B3 E5 C5 00 6F 00 80 00 93 D5 25 00 93 02 40 00 63 40 55 02 93 02 80 00 63 4C 55 0A 93 02 C0 00 63 48 55 14 93 02 00 01 63 44 55 1E -6F 00 80 2F 73 23 00 3A 93 02 00 00 63 8E A2 00 +6F 00 40 31 73 23 00 3A 93 02 00 00 63 8E A2 00 93 02 10 00 63 86 A2 02 93 02 20 00 63 82 A2 04 93 02 30 00 63 8E A2 04 73 90 05 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 6F 00 C0 05 @@ -138,7 +138,7 @@ B3 E2 62 00 73 90 02 30 6F 00 00 39 03 20 05 00 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 35 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 03 3A -6F 00 80 25 73 23 10 3A 93 02 40 00 63 8E A2 00 +6F 00 40 27 73 23 10 3A 93 02 40 00 63 8E A2 00 93 02 50 00 63 86 A2 02 93 02 60 00 63 82 A2 04 93 02 70 00 63 8E A2 04 73 90 45 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 6F 00 C0 05 @@ -148,7 +148,7 @@ B3 E2 62 00 73 90 02 30 6F 00 00 39 03 20 05 00 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 75 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 13 3A -6F 00 80 1B 73 23 20 3A 93 02 80 00 63 8E A2 00 +6F 00 40 1D 73 23 20 3A 93 02 80 00 63 8E A2 00 93 02 90 00 63 86 A2 02 93 02 A0 00 63 82 A2 04 93 02 B0 00 63 8E A2 04 73 90 85 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 6F 00 C0 05 @@ -158,7 +158,7 @@ B3 E2 62 00 73 90 02 30 6F 00 00 39 03 20 05 00 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 B5 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 23 3A -6F 00 80 11 73 23 30 3A 93 02 C0 00 63 8E A2 00 +6F 00 40 13 73 23 30 3A 93 02 C0 00 63 8E A2 00 93 02 D0 00 63 86 A2 02 93 02 E0 00 63 82 A2 04 93 02 F0 00 63 8E A2 04 73 90 C5 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 6F 00 C0 05 @@ -168,12 +168,14 @@ B3 E2 62 00 73 90 02 30 6F 00 00 39 03 20 05 00 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 F5 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 33 3A -6F 00 80 07 93 02 00 00 63 08 57 06 93 02 80 00 +6F 00 40 09 93 02 00 00 63 06 57 08 93 02 80 00 E3 06 57 D4 93 02 00 01 E3 08 57 D2 93 02 80 01 -E3 04 57 D2 13 05 10 00 6F 00 00 05 93 0E 00 00 -E3 88 D8 9B 93 0E 10 00 E3 8E D8 9F 93 0E 80 00 -E3 82 D8 FD 93 0E 90 00 E3 82 D8 C3 93 0E A0 00 -E3 86 D8 C7 93 0E B0 00 E3 8A D8 C9 93 0E C0 00 -E3 88 D8 CB 93 0E D0 00 E3 86 D8 CD 93 0E E0 00 -E3 84 D8 C3 6F 00 40 00 F3 2E 10 34 93 8E 4E 00 -73 90 1E 34 73 00 20 30 13 0A 1A 00 73 00 20 30 +E3 04 57 D2 13 05 10 00 6F 00 C0 06 63 06 A0 00 +73 10 65 30 6F 00 00 06 73 50 60 30 6F 00 80 05 +93 0E 00 00 E3 8E D8 99 93 0E 10 00 E3 84 D8 9F +93 0E 80 00 E3 88 D8 FB 93 0E 90 00 E3 88 D8 C1 +93 0E A0 00 E3 8C D8 C5 93 0E B0 00 E3 80 D8 C9 +93 0E C0 00 E3 8E D8 C9 93 0E D0 00 E3 8C D8 CB +93 0E E0 00 E3 8A D8 C1 93 0E F0 00 E3 80 D8 FB +6F 00 40 00 F3 2E 10 34 93 8E 4E 00 73 90 1E 34 +73 00 20 30 13 0A 1A 00 73 00 20 30 diff --git a/test/priv_sec_testsuite/tests/rv64ui-p-test5.v b/test/priv_sec_testsuite/tests/rv64ui-p-test5.v new file mode 100755 index 0000000..2940e44 --- /dev/null +++ b/test/priv_sec_testsuite/tests/rv64ui-p-test5.v @@ -0,0 +1,165 @@ +@00010000 +6F 00 00 0B 73 2F 20 34 93 0E 80 00 63 14 DF 01 +6F 20 00 65 93 0E 90 00 63 06 DF 1D 93 0E B0 00 +63 06 DF 1D 93 0E 20 00 63 04 DF 1D B7 0E 00 80 +93 8E BE 00 63 14 DF 01 6F 20 C0 68 B7 0E 00 80 +93 8E 3E 00 63 14 DF 01 6F 20 C0 67 B7 0E 00 80 +93 8E 7E 00 63 14 DF 01 6F 20 C0 66 93 0E 50 00 +63 02 DF 1B 93 0E 70 00 63 0E DF 19 93 0E 10 00 +63 0A DF 19 93 0E 40 00 63 06 DF 19 93 0E 60 00 +63 02 DF 19 93 0E 00 00 63 0E DF 17 13 0F 00 00 +63 04 0F 00 67 00 0F 00 73 2F 20 34 63 54 0F 00 +6F 00 40 00 93 E1 91 53 17 1F 00 00 23 2C 3F F4 +93 00 00 00 13 01 00 00 93 01 00 00 13 02 00 00 +93 02 00 00 13 03 00 00 93 03 00 00 13 04 00 00 +93 04 00 00 13 05 00 00 93 05 00 00 13 06 00 00 +93 06 00 00 13 07 00 00 93 07 00 00 13 08 00 00 +93 08 00 00 13 09 00 00 93 09 00 00 13 0A 00 00 +93 0A 00 00 13 0B 00 00 93 0B 00 00 13 0C 00 00 +93 0C 00 00 13 0D 00 00 93 0D 00 00 13 0E 00 00 +93 0E 00 00 13 0F 00 00 93 0F 00 00 73 25 40 F1 +63 10 05 00 97 02 00 00 93 82 02 01 73 90 52 30 +73 50 00 18 97 02 00 00 93 82 42 02 73 90 52 30 +9B 02 10 00 93 92 52 03 93 82 F2 FF 73 90 02 3B +93 02 F0 01 73 90 02 3A 73 50 40 30 97 02 00 00 +93 82 42 01 73 90 52 30 73 50 20 30 73 50 30 30 +93 01 00 00 97 02 00 00 93 82 02 E8 73 90 52 30 +13 05 10 00 13 15 F5 01 63 5C 05 00 0F 00 F0 0F +93 01 10 00 93 08 D0 05 13 05 00 00 73 00 10 00 +93 02 00 00 63 8A 02 00 73 90 52 10 B7 B2 00 00 +9B 82 92 10 73 90 22 30 73 50 00 30 97 02 00 00 +93 82 42 01 73 90 12 34 73 25 40 F1 73 00 20 30 +6F 00 00 05 93 8F 1F 00 73 00 10 00 6F 20 80 4C +13 04 14 00 F3 2E 10 34 93 8E 4E 00 73 90 1E 34 +73 00 20 30 73 24 20 34 93 02 20 00 63 04 54 00 +6F 00 40 0A 13 09 19 00 13 05 20 00 97 02 00 00 +93 82 42 08 73 90 12 34 6F 00 40 00 73 00 20 30 +13 05 00 00 93 05 00 00 37 06 04 00 93 06 F0 01 +13 07 80 01 93 08 80 00 73 00 00 00 13 04 00 00 +13 05 10 00 93 08 F0 00 73 00 00 00 B7 52 55 55 +9B 82 52 55 37 53 55 55 1B 03 53 55 F3 22 00 B0 +63 82 62 04 63 10 04 04 13 00 00 00 6F 00 C0 05 +13 05 00 00 93 08 F0 00 73 00 00 00 B7 52 55 55 +9B 82 52 55 37 53 55 55 1B 03 53 55 F3 22 00 B0 +63 9A 62 00 63 18 04 00 13 00 00 00 6F 00 C0 02 +63 14 30 02 0F 00 F0 0F 63 80 01 00 93 91 11 00 +93 E1 11 00 93 08 D0 05 13 85 01 00 93 8F 1F 00 +73 00 10 00 73 00 10 00 0F 00 F0 0F 93 01 10 00 +93 08 D0 05 13 05 00 00 73 00 10 00 73 00 10 00 +73 10 00 C0 00 00 00 00 00 00 00 00 +@00011000 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 +@00012000 +73 10 00 3A 73 10 10 3A 73 10 20 3A 73 10 30 3A +73 10 00 3B 73 10 10 3B 73 10 20 3B 73 10 30 3B +73 10 40 3B 73 10 50 3B 73 10 60 3B 73 10 70 3B +73 10 80 3B 73 10 90 3B 73 10 A0 3B 73 10 B0 3B +73 10 C0 3B 73 10 D0 3B 73 10 E0 3B 73 10 F0 3B +6F 00 40 66 93 02 00 00 B7 0E 00 00 93 8E FE FF +73 90 0E 3B 73 2F 00 3B 63 84 EE 01 6F E0 8F A4 +73 10 00 3B B7 0E 00 00 93 8E FE FF 73 90 1E 3B +73 2F 10 3B 63 84 EE 01 6F E0 CF A2 73 10 10 3B +B7 0E 00 00 93 8E FE FF 73 90 2E 3B 73 2F 20 3B +63 84 EE 01 6F E0 0F A1 73 10 20 3B B7 0E 00 00 +93 8E FE FF 73 90 3E 3B 73 2F 30 3B 63 84 EE 01 +6F E0 4F 9F 73 10 30 3B B7 0E 00 00 93 8E FE FF +73 90 4E 3B 73 2F 40 3B 63 84 EE 01 6F E0 8F 9D +73 10 40 3B B7 0E 00 00 93 8E FE FF 73 90 5E 3B +73 2F 50 3B 63 84 EE 01 6F E0 CF 9B 73 10 50 3B +B7 0E 00 00 93 8E FE FF 73 90 6E 3B 73 2F 60 3B +63 84 EE 01 6F E0 0F 9A 73 10 60 3B B7 0E 00 00 +93 8E FE FF 73 90 7E 3B 73 2F 70 3B 63 84 EE 01 +6F E0 4F 98 73 10 70 3B B7 0E 00 00 93 8E FE FF +73 90 8E 3B 73 2F 80 3B 63 84 EE 01 6F E0 8F 96 +73 10 80 3B B7 0E 00 00 93 8E FE FF 73 90 9E 3B +73 2F 90 3B 63 84 EE 01 6F E0 CF 94 73 10 90 3B +B7 0E 00 00 93 8E FE FF 73 90 AE 3B 73 2F A0 3B +63 84 EE 01 6F E0 0F 93 73 10 A0 3B B7 0E 00 00 +93 8E FE FF 73 90 BE 3B 73 2F B0 3B 63 84 EE 01 +6F E0 4F 91 73 10 B0 3B B7 0E 00 00 93 8E FE FF +73 90 CE 3B 73 2F C0 3B 63 84 EE 01 6F E0 8F 8F +73 10 C0 3B B7 0E 00 00 93 8E FE FF 73 90 DE 3B +73 2F D0 3B 63 84 EE 01 6F E0 CF 8D 73 10 D0 3B +B7 0E 00 00 93 8E FE FF 73 90 EE 3B 73 2F E0 3B +63 84 EE 01 6F E0 0F 8C 73 10 E0 3B B7 0E 00 00 +93 8E FE FF 73 90 FE 3B 73 2F F0 3B 63 84 EE 01 +6F E0 4F 8A 73 10 F0 3B B7 7E 77 77 93 8E 7E 77 +73 90 0E 3A 73 2F 00 3A 63 84 EE 01 6F E0 8F 88 +73 10 00 3A B7 7E 77 77 93 8E 7E 77 73 90 1E 3A +73 2F 10 3A 63 84 EE 01 6F E0 CF 86 73 10 10 3A +B7 7E 77 77 93 8E 7E 77 73 90 2E 3A 73 2F 20 3A +63 84 EE 01 6F E0 0F 85 73 10 20 3A B7 7E 77 77 +93 8E 7E 77 73 90 3E 3A 73 2F 30 3A 63 84 EE 01 +6F E0 4F 83 73 10 30 3A 6F 00 C0 42 37 0F 00 00 +13 0F 0F 08 F3 2E 00 30 B3 EE EE 01 73 90 0E 30 +37 1F 00 00 13 0F 0F 80 F3 2E 40 30 B3 EE EE 01 +73 90 4E 30 6F 00 00 40 F3 22 00 3A 13 03 F0 0F +93 D2 82 00 B3 F2 62 00 63 96 D2 00 13 05 00 00 +6F 00 40 3E 13 05 10 00 6F 00 C0 3D F3 22 00 30 +63 1E 05 00 37 83 00 00 1B 03 F3 FF 13 13 13 01 +13 03 F3 FF B3 F2 62 00 6F 00 C0 00 37 03 02 00 +B3 E2 62 00 73 90 02 30 6F 00 C0 3A 03 20 05 00 +13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 +13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 +23 20 05 00 13 00 00 00 13 00 00 00 13 00 00 00 +13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 +13 00 00 00 67 00 05 00 13 00 00 00 13 00 00 00 +13 00 00 00 13 00 00 00 13 06 F6 FF 13 56 36 00 +93 D5 25 00 B3 E5 C5 00 6F 00 80 00 93 D5 25 00 +93 02 40 00 63 40 55 02 93 02 80 00 63 4C 55 0A +93 02 C0 00 63 48 55 14 93 02 00 01 63 44 55 1E +6F 00 40 31 73 23 00 3A 93 02 00 00 63 8E A2 00 +93 02 10 00 63 86 A2 02 93 02 20 00 63 82 A2 04 +93 02 30 00 63 8E A2 04 73 90 05 3B 9B 02 10 00 +93 92 02 02 93 82 02 F0 33 73 53 00 6F 00 C0 05 +73 90 15 3B B7 02 01 00 9B 82 F2 FF 93 92 02 01 +93 82 F2 0F 33 73 53 00 93 96 86 00 6F 00 C0 03 +73 90 25 3B B7 02 01 00 9B 82 12 F0 93 92 02 01 +93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 +73 90 35 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 +93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 03 3A +6F 00 40 27 73 23 10 3A 93 02 40 00 63 8E A2 00 +93 02 50 00 63 86 A2 02 93 02 60 00 63 82 A2 04 +93 02 70 00 63 8E A2 04 73 90 45 3B 9B 02 10 00 +93 92 02 02 93 82 02 F0 33 73 53 00 6F 00 C0 05 +73 90 55 3B B7 02 01 00 9B 82 F2 FF 93 92 02 01 +93 82 F2 0F 33 73 53 00 93 96 86 00 6F 00 C0 03 +73 90 65 3B B7 02 01 00 9B 82 12 F0 93 92 02 01 +93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 +73 90 75 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 +93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 13 3A +6F 00 40 1D 73 23 20 3A 93 02 80 00 63 8E A2 00 +93 02 90 00 63 86 A2 02 93 02 A0 00 63 82 A2 04 +93 02 B0 00 63 8E A2 04 73 90 85 3B 9B 02 10 00 +93 92 02 02 93 82 02 F0 33 73 53 00 6F 00 C0 05 +73 90 95 3B B7 02 01 00 9B 82 F2 FF 93 92 02 01 +93 82 F2 0F 33 73 53 00 93 96 86 00 6F 00 C0 03 +73 90 A5 3B B7 02 01 00 9B 82 12 F0 93 92 02 01 +93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 +73 90 B5 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 +93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 23 3A +6F 00 40 13 73 23 30 3A 93 02 C0 00 63 8E A2 00 +93 02 D0 00 63 86 A2 02 93 02 E0 00 63 82 A2 04 +93 02 F0 00 63 8E A2 04 73 90 C5 3B 9B 02 10 00 +93 92 02 02 93 82 02 F0 33 73 53 00 6F 00 C0 05 +73 90 D5 3B B7 02 01 00 9B 82 F2 FF 93 92 02 01 +93 82 F2 0F 33 73 53 00 93 96 86 00 6F 00 C0 03 +73 90 E5 3B B7 02 01 00 9B 82 12 F0 93 92 02 01 +93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 +73 90 F5 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 +93 96 86 01 6F 00 40 00 33 63 D3 00 73 10 33 3A +6F 00 40 09 93 02 00 00 63 06 57 08 93 02 80 00 +E3 06 57 D4 93 02 00 01 E3 08 57 D2 93 02 80 01 +E3 04 57 D2 13 05 10 00 6F 00 C0 06 63 06 A0 00 +73 10 65 30 6F 00 00 06 73 50 60 30 6F 00 80 05 +93 0E 00 00 E3 8E D8 99 93 0E 10 00 E3 84 D8 9F +93 0E 80 00 E3 88 D8 FB 93 0E 90 00 E3 88 D8 C1 +93 0E A0 00 E3 8C D8 C5 93 0E B0 00 E3 80 D8 C9 +93 0E C0 00 E3 8E D8 C9 93 0E D0 00 E3 8C D8 CB +93 0E E0 00 E3 8A D8 C1 93 0E F0 00 E3 80 D8 FB +6F 00 40 00 F3 2E 10 34 93 8E 4E 00 73 90 1E 34 +73 00 20 30 13 0A 1A 00 73 00 20 30 diff --git a/test/priv_sec_testsuite/tests/rv64ui-v-test2.v b/test/priv_sec_testsuite/tests/rv64ui-v-test2.v index 8cb986f..b85d30c 100755 --- a/test/priv_sec_testsuite/tests/rv64ui-v-test2.v +++ b/test/priv_sec_testsuite/tests/rv64ui-v-test2.v @@ -9,8 +9,8 @@ 13 0D 00 00 93 0D 00 00 13 0E 00 00 93 0E 00 00 13 0F 00 00 93 0F 00 00 97 02 00 00 93 82 02 F8 73 90 52 30 17 A1 00 00 13 01 C1 E4 F3 22 40 F1 -93 92 C2 00 33 01 51 00 73 10 01 34 EF 20 90 71 -17 35 00 00 13 05 85 F1 6F 20 00 6B 83 32 85 10 +93 92 C2 00 33 01 51 00 73 10 01 34 EF 20 50 73 +17 35 00 00 13 05 45 F3 6F 20 00 6B 83 32 85 10 73 90 12 14 83 30 85 00 03 31 05 01 83 31 85 01 03 32 05 02 83 32 85 02 03 33 05 03 83 33 85 03 03 34 05 04 83 34 85 04 83 35 85 05 03 36 05 06 @@ -114,11 +114,11 @@ E3 9C 07 FD 73 90 08 10 93 97 36 00 B3 06 F6 00 63 94 E5 04 93 96 36 00 B3 06 D6 00 23 B0 F6 00 73 00 05 12 83 30 81 00 13 01 01 01 67 80 00 00 93 E7 07 04 6F F0 1F FE 97 77 00 00 23 BC 07 B2 -6F F0 1F F0 17 15 00 00 13 05 45 CF EF F0 1F D8 -13 05 30 00 EF F0 1F DC 17 15 00 00 13 05 85 D2 +6F F0 1F F0 17 15 00 00 13 05 C5 D0 EF F0 1F D8 +13 05 30 00 EF F0 1F DC 17 15 00 00 13 05 05 D4 EF F0 DF D6 13 05 30 00 EF F0 DF DA 17 15 00 00 -13 05 C5 D5 EF F0 9F D5 13 05 30 00 EF F0 9F D9 -17 15 00 00 13 05 05 D6 EF F0 5F D4 13 05 30 00 +13 05 45 D7 EF F0 9F D5 13 05 30 00 EF F0 9F D9 +17 15 00 00 13 05 85 D7 EF F0 5F D4 13 05 30 00 EF F0 5F D8 83 35 85 11 13 01 01 F8 23 38 81 06 23 3C 11 06 23 34 91 06 23 30 21 07 23 3C 31 05 23 38 41 05 23 34 51 05 23 30 61 05 23 3C 71 03 @@ -132,12 +132,12 @@ EF F0 5F D8 83 35 85 11 13 01 01 F8 23 38 81 06 03 3D 01 02 83 3D 81 01 13 01 01 08 6F D0 1F AF 03 37 85 10 93 77 37 00 63 98 07 06 EF 07 80 00 73 10 30 00 03 27 07 00 83 A7 07 00 63 0A F7 04 -13 05 10 10 93 07 10 04 97 16 00 00 93 86 86 CB +13 05 10 10 93 07 10 04 97 16 00 00 93 86 06 CD 17 F7 FF FF 13 07 07 A0 13 15 05 03 83 35 07 00 93 86 16 00 33 E6 A7 00 63 8A 05 00 97 F7 FF FF 23 B2 07 A2 83 37 07 00 E3 9A 07 FE 83 C7 06 00 23 30 C7 00 E3 9C 07 FC 13 05 30 00 EF F0 9F C6 -13 05 10 00 EF F0 1F C6 17 15 00 00 13 05 85 D0 +13 05 10 00 EF F0 1F C6 17 15 00 00 13 05 05 D2 EF F0 DF C0 13 05 30 00 EF F0 DF C4 03 29 05 05 37 1C 00 00 97 24 00 00 93 84 C4 99 97 3B 00 00 93 8B 4B 99 37 0B 04 00 B7 0A E0 FF 97 7D 00 00 @@ -151,10 +151,10 @@ EF F0 DF C0 13 05 30 00 EF F0 DF C4 03 29 05 05 93 FC 0C 08 83 35 81 00 63 80 0C 04 37 16 00 00 13 05 0C 00 EF F0 DF 8F B3 87 84 00 73 10 0D 10 03 B7 0D 00 23 B0 07 00 E3 1E 07 F6 23 B0 FD 00 -23 30 FA 00 6F F0 9F F7 17 15 00 00 13 05 05 C5 -EF F0 DF B2 6F F0 5F F0 17 15 00 00 13 05 05 BE +23 30 FA 00 6F F0 9F F7 17 15 00 00 13 05 85 C6 +EF F0 DF B2 6F F0 5F F0 17 15 00 00 13 05 85 BF EF F0 DF B1 13 05 30 00 EF F0 DF B5 17 15 00 00 -13 05 45 B9 EF F0 9F B0 13 05 30 00 EF F0 9F B4 +13 05 C5 BA EF F0 9F B0 13 05 30 00 EF F0 9F B4 13 05 09 00 EF F0 1F B4 F3 27 40 F1 63 9A 07 18 97 57 00 00 93 87 07 89 13 01 01 ED 93 D7 C7 00 23 30 81 12 17 68 00 00 13 08 C8 87 13 04 05 00 @@ -186,51 +186,51 @@ E3 1A E3 FC 13 06 00 12 93 05 00 00 13 05 01 00 2F 20 07 00 13 D7 17 00 B3 C7 E7 00 93 97 E7 03 B3 F7 D7 00 B3 E7 E7 00 33 F7 C7 00 93 F5 17 00 33 07 A7 00 E3 9E 05 FC 03 20 07 00 6F F0 9F FD -17 15 00 00 13 05 85 A5 EF F0 5F 90 13 05 30 00 +17 15 00 00 13 05 05 A7 EF F0 5F 90 13 05 30 00 EF F0 5F 94 73 10 00 3A 73 10 10 3A 73 10 20 3A 73 10 30 3A 73 10 00 3B 73 10 10 3B 73 10 20 3B 73 10 30 3B 73 10 40 3B 73 10 50 3B 73 10 60 3B 73 10 70 3B 73 10 80 3B 73 10 90 3B 73 10 A0 3B 73 10 B0 3B 73 10 C0 3B 73 10 D0 3B 73 10 E0 3B -73 10 F0 3B 6F 00 80 5F 93 02 00 00 B7 0E 00 00 -93 8E FE FF 73 90 0E 3B 73 2F 00 3B 63 9C EE 7D +73 10 F0 3B 6F 00 40 61 93 02 00 00 B7 0E 00 00 +93 8E FE FF 73 90 0E 3B 73 2F 00 3B 63 9A EE 7F 73 10 00 3B B7 0E 00 00 93 8E FE FF 73 90 1E 3B -73 2F 10 3B 63 90 EE 7D 73 10 10 3B B7 0E 00 00 -93 8E FE FF 73 90 2E 3B 73 2F 20 3B 63 94 EE 7B +73 2F 10 3B 63 9E EE 7D 73 10 10 3B B7 0E 00 00 +93 8E FE FF 73 90 2E 3B 73 2F 20 3B 63 92 EE 7D 73 10 20 3B B7 0E 00 00 93 8E FE FF 73 90 3E 3B -73 2F 30 3B 63 98 EE 79 73 10 30 3B B7 0E 00 00 -93 8E FE FF 73 90 4E 3B 73 2F 40 3B 63 9C EE 77 +73 2F 30 3B 63 96 EE 7B 73 10 30 3B B7 0E 00 00 +93 8E FE FF 73 90 4E 3B 73 2F 40 3B 63 9A EE 79 73 10 40 3B B7 0E 00 00 93 8E FE FF 73 90 5E 3B -73 2F 50 3B 63 90 EE 77 73 10 50 3B B7 0E 00 00 -93 8E FE FF 73 90 6E 3B 73 2F 60 3B 63 94 EE 75 +73 2F 50 3B 63 9E EE 77 73 10 50 3B B7 0E 00 00 +93 8E FE FF 73 90 6E 3B 73 2F 60 3B 63 92 EE 77 73 10 60 3B B7 0E 00 00 93 8E FE FF 73 90 7E 3B -73 2F 70 3B 63 98 EE 73 73 10 70 3B B7 0E 00 00 -93 8E FE FF 73 90 8E 3B 73 2F 80 3B 63 9C EE 71 +73 2F 70 3B 63 96 EE 75 73 10 70 3B B7 0E 00 00 +93 8E FE FF 73 90 8E 3B 73 2F 80 3B 63 9A EE 73 73 10 80 3B B7 0E 00 00 93 8E FE FF 73 90 9E 3B -73 2F 90 3B 63 90 EE 71 73 10 90 3B B7 0E 00 00 -93 8E FE FF 73 90 AE 3B 73 2F A0 3B 63 94 EE 6F +73 2F 90 3B 63 9E EE 71 73 10 90 3B B7 0E 00 00 +93 8E FE FF 73 90 AE 3B 73 2F A0 3B 63 92 EE 71 73 10 A0 3B B7 0E 00 00 93 8E FE FF 73 90 BE 3B -73 2F B0 3B 63 98 EE 6D 73 10 B0 3B B7 0E 00 00 -93 8E FE FF 73 90 CE 3B 73 2F C0 3B 63 9C EE 6B +73 2F B0 3B 63 96 EE 6F 73 10 B0 3B B7 0E 00 00 +93 8E FE FF 73 90 CE 3B 73 2F C0 3B 63 9A EE 6D 73 10 C0 3B B7 0E 00 00 93 8E FE FF 73 90 DE 3B -73 2F D0 3B 63 90 EE 6B 73 10 D0 3B B7 0E 00 00 -93 8E FE FF 73 90 EE 3B 73 2F E0 3B 63 94 EE 69 +73 2F D0 3B 63 9E EE 6B 73 10 D0 3B B7 0E 00 00 +93 8E FE FF 73 90 EE 3B 73 2F E0 3B 63 92 EE 6B 73 10 E0 3B B7 0E 00 00 93 8E FE FF 73 90 FE 3B -73 2F F0 3B 63 98 EE 67 73 10 F0 3B B7 7E 77 77 -93 8E 7E 77 73 90 0E 3A 73 2F 00 3A 63 9C EE 65 +73 2F F0 3B 63 96 EE 69 73 10 F0 3B B7 7E 77 77 +93 8E 7E 77 73 90 0E 3A 73 2F 00 3A 63 9A EE 67 73 10 00 3A B7 7E 77 77 93 8E 7E 77 73 90 1E 3A -73 2F 10 3A 63 90 EE 65 73 10 10 3A B7 7E 77 77 -93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 63 94 EE 63 +73 2F 10 3A 63 9E EE 65 73 10 10 3A B7 7E 77 77 +93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 63 92 EE 65 73 10 20 3A B7 7E 77 77 93 8E 7E 77 73 90 3E 3A -73 2F 30 3A 63 98 EE 61 73 10 30 3A 6F 00 00 41 +73 2F 30 3A 63 96 EE 63 73 10 30 3A 6F 00 C0 42 37 0F 00 00 13 0F 0F 08 F3 2E 00 30 B3 EE EE 01 73 90 0E 30 37 1F 00 00 13 0F 0F 80 F3 2E 40 30 -B3 EE EE 01 73 90 4E 30 6F 00 40 3E F3 22 00 3A +B3 EE EE 01 73 90 4E 30 6F 00 00 40 F3 22 00 3A 13 03 F0 0F 93 D2 82 00 B3 F2 62 00 63 96 D2 00 -13 05 00 00 6F 00 80 3C 13 05 10 00 6F 00 00 3C +13 05 00 00 6F 00 40 3E 13 05 10 00 6F 00 C0 3D F3 22 00 30 63 1E 05 00 37 83 00 00 1B 03 F3 FF 13 13 13 01 13 03 F3 FF B3 F2 62 00 6F 00 C0 00 -37 03 02 00 B3 E2 62 00 73 90 02 30 6F 00 00 39 +37 03 02 00 B3 E2 62 00 73 90 02 30 6F 00 C0 3A 03 20 05 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 23 20 05 00 13 00 00 00 13 00 00 00 @@ -240,7 +240,7 @@ F3 22 00 30 63 1E 05 00 37 83 00 00 1B 03 F3 FF 13 56 36 00 93 D5 25 00 B3 E5 C5 00 6F 00 80 00 93 D5 25 00 93 02 40 00 63 40 55 02 93 02 80 00 63 4C 55 0A 93 02 C0 00 63 48 55 14 93 02 00 01 -63 44 55 1E 6F 00 80 2F 73 23 00 3A 93 02 00 00 +63 44 55 1E 6F 00 40 31 73 23 00 3A 93 02 00 00 63 8E A2 00 93 02 10 00 63 86 A2 02 93 02 20 00 63 82 A2 04 93 02 30 00 63 8E A2 04 73 90 05 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 @@ -250,7 +250,7 @@ F3 22 00 30 63 1E 05 00 37 83 00 00 1B 03 F3 FF 93 92 02 01 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 35 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 -73 10 03 3A 6F 00 80 25 73 23 10 3A 93 02 40 00 +73 10 03 3A 6F 00 40 27 73 23 10 3A 93 02 40 00 63 8E A2 00 93 02 50 00 63 86 A2 02 93 02 60 00 63 82 A2 04 93 02 70 00 63 8E A2 04 73 90 45 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 @@ -260,7 +260,7 @@ F3 22 00 30 63 1E 05 00 37 83 00 00 1B 03 F3 FF 93 92 02 01 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 75 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 -73 10 13 3A 6F 00 80 1B 73 23 20 3A 93 02 80 00 +73 10 13 3A 6F 00 40 1D 73 23 20 3A 93 02 80 00 63 8E A2 00 93 02 90 00 63 86 A2 02 93 02 A0 00 63 82 A2 04 93 02 B0 00 63 8E A2 04 73 90 85 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 @@ -270,7 +270,7 @@ F3 22 00 30 63 1E 05 00 37 83 00 00 1B 03 F3 FF 93 92 02 01 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 B5 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 -73 10 23 3A 6F 00 80 11 73 23 30 3A 93 02 C0 00 +73 10 23 3A 6F 00 40 13 73 23 30 3A 93 02 C0 00 63 8E A2 00 93 02 D0 00 63 86 A2 02 93 02 E0 00 63 82 A2 04 93 02 F0 00 63 8E A2 04 73 90 C5 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 @@ -280,49 +280,50 @@ F3 22 00 30 63 1E 05 00 37 83 00 00 1B 03 F3 FF 93 92 02 01 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 F5 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 -73 10 33 3A 6F 00 80 07 93 02 00 00 63 08 57 06 +73 10 33 3A 6F 00 40 09 93 02 00 00 63 06 57 08 93 02 80 00 E3 06 57 D4 93 02 00 01 E3 08 57 D2 -93 02 80 01 E3 04 57 D2 13 05 10 00 6F 00 00 05 -93 0E 00 00 E3 80 D8 A1 93 0E 10 00 E3 86 D8 A5 -93 0E 80 00 E3 82 D8 FD 93 0E 90 00 E3 82 D8 C3 -93 0E A0 00 E3 86 D8 C7 93 0E B0 00 E3 8A D8 C9 -93 0E C0 00 E3 88 D8 CB 93 0E D0 00 E3 86 D8 CD -93 0E E0 00 E3 84 D8 C3 6F 00 40 00 F3 2E 10 34 -93 8E 4E 00 73 90 1E 34 73 00 20 30 13 0A 1A 00 -73 00 20 30 67 80 00 00 6F 00 00 02 93 8F 1F 00 -73 00 10 00 6F F0 9F FD 93 8F 1F 00 73 00 10 00 -13 04 14 00 73 00 20 30 93 08 00 00 73 00 00 00 -93 08 10 00 73 00 00 00 93 04 00 00 13 09 00 01 -33 85 04 00 B7 05 10 00 13 06 00 00 93 06 F0 00 -13 07 80 00 93 08 80 00 73 00 00 00 EF 00 40 15 -B7 02 10 00 23 20 50 00 03 23 00 00 63 9C 62 16 -23 AE 52 FE 03 A3 C2 FF 63 96 62 16 B7 02 10 00 -23 A0 02 00 13 00 00 00 13 00 00 00 13 00 00 00 -93 02 10 00 63 18 54 14 93 08 00 00 73 00 00 00 -13 04 00 00 93 84 14 00 E3 9C 24 F9 93 04 00 00 -13 09 00 01 33 85 04 00 93 05 00 00 37 06 10 00 -93 06 F0 01 13 07 80 01 93 08 80 00 73 00 00 00 -EF 00 00 0E B7 02 10 00 23 20 50 00 03 23 00 00 -63 92 62 10 23 AE 52 FE 03 A3 C2 FF 63 9C 62 0E -B7 02 10 00 23 A0 02 00 13 00 00 00 13 00 00 00 -13 00 00 00 93 02 10 00 63 1E 54 0C 93 08 00 00 -73 00 00 00 13 04 00 00 93 84 14 00 E3 9C 24 F9 -13 05 00 00 93 05 00 00 37 06 04 00 93 06 F0 01 -13 07 80 01 93 08 80 00 73 00 00 00 13 05 10 00 -B7 05 08 00 13 06 40 00 93 06 70 01 13 07 00 01 -93 08 80 00 73 00 00 00 B7 02 08 00 23 A0 52 00 -03 A3 02 00 63 90 62 08 B7 02 08 00 23 AE 02 FE +93 02 80 01 E3 04 57 D2 13 05 10 00 6F 00 C0 06 +63 06 A0 00 73 10 65 30 6F 00 00 06 73 50 60 30 +6F 00 80 05 93 0E 00 00 E3 86 D8 9F 93 0E 10 00 +E3 8C D8 A3 93 0E 80 00 E3 88 D8 FB 93 0E 90 00 +E3 88 D8 C1 93 0E A0 00 E3 8C D8 C5 93 0E B0 00 +E3 80 D8 C9 93 0E C0 00 E3 8E D8 C9 93 0E D0 00 +E3 8C D8 CB 93 0E E0 00 E3 8A D8 C1 93 0E F0 00 +E3 80 D8 FB 6F 00 40 00 F3 2E 10 34 93 8E 4E 00 +73 90 1E 34 73 00 20 30 13 0A 1A 00 73 00 20 30 +67 80 00 00 6F 00 00 02 93 8F 1F 00 73 00 10 00 +6F F0 9F FD 93 8F 1F 00 73 00 10 00 13 04 14 00 +73 00 20 30 93 08 00 00 73 00 00 00 93 08 10 00 +73 00 00 00 93 04 00 00 13 09 00 01 33 85 04 00 +B7 05 10 00 13 06 00 00 93 06 F0 00 13 07 80 00 +93 08 80 00 73 00 00 00 EF 00 40 15 B7 02 10 00 +23 20 50 00 03 23 00 00 63 9C 62 16 23 AE 52 FE +03 A3 C2 FF 63 96 62 16 B7 02 10 00 23 A0 02 00 13 00 00 00 13 00 00 00 13 00 00 00 93 02 10 00 -63 12 54 06 B7 02 08 00 23 A2 02 00 13 00 00 00 -13 00 00 00 13 00 00 00 93 02 20 00 63 14 54 04 -93 08 00 00 73 00 00 00 13 04 00 00 6F 00 80 04 -93 02 00 00 13 03 A0 00 93 03 00 00 13 0E 00 00 -B3 83 53 00 23 20 7E 00 93 83 13 00 83 23 0E 00 -93 82 12 00 13 9E 22 00 E3 94 62 FE 67 80 00 00 -63 1A 30 00 13 95 11 00 63 00 05 00 13 65 15 00 -73 00 00 00 13 05 10 00 73 00 00 00 73 00 10 00 -73 10 00 C0 -@800031C8 +63 18 54 14 93 08 00 00 73 00 00 00 13 04 00 00 +93 84 14 00 E3 9C 24 F9 93 04 00 00 13 09 00 01 +33 85 04 00 93 05 00 00 37 06 10 00 93 06 F0 01 +13 07 80 01 93 08 80 00 73 00 00 00 EF 00 00 0E +B7 02 10 00 23 20 50 00 03 23 00 00 63 92 62 10 +23 AE 52 FE 03 A3 C2 FF 63 9C 62 0E B7 02 10 00 +23 A0 02 00 13 00 00 00 13 00 00 00 13 00 00 00 +93 02 10 00 63 1E 54 0C 93 08 00 00 73 00 00 00 +13 04 00 00 93 84 14 00 E3 9C 24 F9 13 05 00 00 +93 05 00 00 37 06 04 00 93 06 F0 01 13 07 80 01 +93 08 80 00 73 00 00 00 13 05 10 00 B7 05 08 00 +13 06 40 00 93 06 70 01 13 07 00 01 93 08 80 00 +73 00 00 00 B7 02 08 00 23 A0 52 00 03 A3 02 00 +63 90 62 08 B7 02 08 00 23 AE 02 FE 13 00 00 00 +13 00 00 00 13 00 00 00 93 02 10 00 63 12 54 06 +B7 02 08 00 23 A2 02 00 13 00 00 00 13 00 00 00 +13 00 00 00 93 02 20 00 63 14 54 04 93 08 00 00 +73 00 00 00 13 04 00 00 6F 00 80 04 93 02 00 00 +13 03 A0 00 93 03 00 00 13 0E 00 00 B3 83 53 00 +23 20 7E 00 93 83 13 00 83 23 0E 00 93 82 12 00 +13 9E 22 00 E3 94 62 FE 67 80 00 00 63 1A 30 00 +13 95 11 00 63 00 05 00 13 65 15 00 73 00 00 00 +13 05 10 00 73 00 00 00 73 00 10 00 73 10 00 C0 +@800031E0 41 73 73 65 72 74 69 6F 6E 20 66 61 69 6C 65 64 3A 20 61 64 64 72 20 3E 3D 20 28 31 55 4C 20 3C 3C 20 31 32 29 20 26 26 20 61 64 64 72 20 3C 20 diff --git a/test/priv_sec_testsuite/tests/rv64ui-v-test3.v b/test/priv_sec_testsuite/tests/rv64ui-v-test3.v index 5af3e81..420547f 100755 --- a/test/priv_sec_testsuite/tests/rv64ui-v-test3.v +++ b/test/priv_sec_testsuite/tests/rv64ui-v-test3.v @@ -9,8 +9,8 @@ 13 0D 00 00 93 0D 00 00 13 0E 00 00 93 0E 00 00 13 0F 00 00 93 0F 00 00 97 02 00 00 93 82 02 F8 73 90 52 30 17 A1 00 00 13 01 C1 E4 F3 22 40 F1 -93 92 C2 00 33 01 51 00 73 10 01 34 EF 20 90 71 -17 35 00 00 13 05 85 F1 6F 20 00 6B 83 32 85 10 +93 92 C2 00 33 01 51 00 73 10 01 34 EF 20 50 73 +17 35 00 00 13 05 45 F3 6F 20 00 6B 83 32 85 10 73 90 12 14 83 30 85 00 03 31 05 01 83 31 85 01 03 32 05 02 83 32 85 02 03 33 05 03 83 33 85 03 03 34 05 04 83 34 85 04 83 35 85 05 03 36 05 06 @@ -114,11 +114,11 @@ E3 9C 07 FD 73 90 08 10 93 97 36 00 B3 06 F6 00 63 94 E5 04 93 96 36 00 B3 06 D6 00 23 B0 F6 00 73 00 05 12 83 30 81 00 13 01 01 01 67 80 00 00 93 E7 07 04 6F F0 1F FE 97 77 00 00 23 BC 07 B2 -6F F0 1F F0 17 15 00 00 13 05 45 C5 EF F0 1F D8 -13 05 30 00 EF F0 1F DC 17 15 00 00 13 05 85 C8 +6F F0 1F F0 17 15 00 00 13 05 45 C7 EF F0 1F D8 +13 05 30 00 EF F0 1F DC 17 15 00 00 13 05 85 CA EF F0 DF D6 13 05 30 00 EF F0 DF DA 17 15 00 00 -13 05 C5 CB EF F0 9F D5 13 05 30 00 EF F0 9F D9 -17 15 00 00 13 05 05 CC EF F0 5F D4 13 05 30 00 +13 05 C5 CD EF F0 9F D5 13 05 30 00 EF F0 9F D9 +17 15 00 00 13 05 05 CE EF F0 5F D4 13 05 30 00 EF F0 5F D8 83 35 85 11 13 01 01 F8 23 38 81 06 23 3C 11 06 23 34 91 06 23 30 21 07 23 3C 31 05 23 38 41 05 23 34 51 05 23 30 61 05 23 3C 71 03 @@ -132,12 +132,12 @@ EF F0 5F D8 83 35 85 11 13 01 01 F8 23 38 81 06 03 3D 01 02 83 3D 81 01 13 01 01 08 6F D0 1F AF 03 37 85 10 93 77 37 00 63 98 07 06 EF 07 80 00 73 10 30 00 03 27 07 00 83 A7 07 00 63 0A F7 04 -13 05 10 10 93 07 10 04 97 16 00 00 93 86 86 C1 +13 05 10 10 93 07 10 04 97 16 00 00 93 86 86 C3 17 F7 FF FF 13 07 07 A0 13 15 05 03 83 35 07 00 93 86 16 00 33 E6 A7 00 63 8A 05 00 97 F7 FF FF 23 B2 07 A2 83 37 07 00 E3 9A 07 FE 83 C7 06 00 23 30 C7 00 E3 9C 07 FC 13 05 30 00 EF F0 9F C6 -13 05 10 00 EF F0 1F C6 17 15 00 00 13 05 85 C6 +13 05 10 00 EF F0 1F C6 17 15 00 00 13 05 85 C8 EF F0 DF C0 13 05 30 00 EF F0 DF C4 03 29 05 05 37 1C 00 00 97 24 00 00 93 84 C4 99 97 3B 00 00 93 8B 4B 99 37 0B 04 00 B7 0A E0 FF 97 7D 00 00 @@ -151,10 +151,10 @@ EF F0 DF C0 13 05 30 00 EF F0 DF C4 03 29 05 05 93 FC 0C 08 83 35 81 00 63 80 0C 04 37 16 00 00 13 05 0C 00 EF F0 DF 8F B3 87 84 00 73 10 0D 10 03 B7 0D 00 23 B0 07 00 E3 1E 07 F6 23 B0 FD 00 -23 30 FA 00 6F F0 9F F7 17 15 00 00 13 05 05 BB -EF F0 DF B2 6F F0 5F F0 17 15 00 00 13 05 05 B4 +23 30 FA 00 6F F0 9F F7 17 15 00 00 13 05 05 BD +EF F0 DF B2 6F F0 5F F0 17 15 00 00 13 05 05 B6 EF F0 DF B1 13 05 30 00 EF F0 DF B5 17 15 00 00 -13 05 45 AF EF F0 9F B0 13 05 30 00 EF F0 9F B4 +13 05 45 B1 EF F0 9F B0 13 05 30 00 EF F0 9F B4 13 05 09 00 EF F0 1F B4 F3 27 40 F1 63 9A 07 18 97 57 00 00 93 87 07 89 13 01 01 ED 93 D7 C7 00 23 30 81 12 17 68 00 00 13 08 C8 87 13 04 05 00 @@ -186,51 +186,51 @@ E3 1A E3 FC 13 06 00 12 93 05 00 00 13 05 01 00 2F 20 07 00 13 D7 17 00 B3 C7 E7 00 93 97 E7 03 B3 F7 D7 00 B3 E7 E7 00 33 F7 C7 00 93 F5 17 00 33 07 A7 00 E3 9E 05 FC 03 20 07 00 6F F0 9F FD -17 15 00 00 13 05 85 9B EF F0 5F 90 13 05 30 00 +17 15 00 00 13 05 85 9D EF F0 5F 90 13 05 30 00 EF F0 5F 94 73 10 00 3A 73 10 10 3A 73 10 20 3A 73 10 30 3A 73 10 00 3B 73 10 10 3B 73 10 20 3B 73 10 30 3B 73 10 40 3B 73 10 50 3B 73 10 60 3B 73 10 70 3B 73 10 80 3B 73 10 90 3B 73 10 A0 3B 73 10 B0 3B 73 10 C0 3B 73 10 D0 3B 73 10 E0 3B -73 10 F0 3B 6F 00 80 5F 93 02 00 00 B7 0E 00 00 -93 8E FE FF 73 90 0E 3B 73 2F 00 3B 63 9E EE 73 +73 10 F0 3B 6F 00 40 61 93 02 00 00 B7 0E 00 00 +93 8E FE FF 73 90 0E 3B 73 2F 00 3B 63 9C EE 75 73 10 00 3B B7 0E 00 00 93 8E FE FF 73 90 1E 3B -73 2F 10 3B 63 92 EE 73 73 10 10 3B B7 0E 00 00 -93 8E FE FF 73 90 2E 3B 73 2F 20 3B 63 96 EE 71 +73 2F 10 3B 63 90 EE 75 73 10 10 3B B7 0E 00 00 +93 8E FE FF 73 90 2E 3B 73 2F 20 3B 63 94 EE 73 73 10 20 3B B7 0E 00 00 93 8E FE FF 73 90 3E 3B -73 2F 30 3B 63 9A EE 6F 73 10 30 3B B7 0E 00 00 -93 8E FE FF 73 90 4E 3B 73 2F 40 3B 63 9E EE 6D +73 2F 30 3B 63 98 EE 71 73 10 30 3B B7 0E 00 00 +93 8E FE FF 73 90 4E 3B 73 2F 40 3B 63 9C EE 6F 73 10 40 3B B7 0E 00 00 93 8E FE FF 73 90 5E 3B -73 2F 50 3B 63 92 EE 6D 73 10 50 3B B7 0E 00 00 -93 8E FE FF 73 90 6E 3B 73 2F 60 3B 63 96 EE 6B +73 2F 50 3B 63 90 EE 6F 73 10 50 3B B7 0E 00 00 +93 8E FE FF 73 90 6E 3B 73 2F 60 3B 63 94 EE 6D 73 10 60 3B B7 0E 00 00 93 8E FE FF 73 90 7E 3B -73 2F 70 3B 63 9A EE 69 73 10 70 3B B7 0E 00 00 -93 8E FE FF 73 90 8E 3B 73 2F 80 3B 63 9E EE 67 +73 2F 70 3B 63 98 EE 6B 73 10 70 3B B7 0E 00 00 +93 8E FE FF 73 90 8E 3B 73 2F 80 3B 63 9C EE 69 73 10 80 3B B7 0E 00 00 93 8E FE FF 73 90 9E 3B -73 2F 90 3B 63 92 EE 67 73 10 90 3B B7 0E 00 00 -93 8E FE FF 73 90 AE 3B 73 2F A0 3B 63 96 EE 65 +73 2F 90 3B 63 90 EE 69 73 10 90 3B B7 0E 00 00 +93 8E FE FF 73 90 AE 3B 73 2F A0 3B 63 94 EE 67 73 10 A0 3B B7 0E 00 00 93 8E FE FF 73 90 BE 3B -73 2F B0 3B 63 9A EE 63 73 10 B0 3B B7 0E 00 00 -93 8E FE FF 73 90 CE 3B 73 2F C0 3B 63 9E EE 61 +73 2F B0 3B 63 98 EE 65 73 10 B0 3B B7 0E 00 00 +93 8E FE FF 73 90 CE 3B 73 2F C0 3B 63 9C EE 63 73 10 C0 3B B7 0E 00 00 93 8E FE FF 73 90 DE 3B -73 2F D0 3B 63 92 EE 61 73 10 D0 3B B7 0E 00 00 -93 8E FE FF 73 90 EE 3B 73 2F E0 3B 63 96 EE 5F +73 2F D0 3B 63 90 EE 63 73 10 D0 3B B7 0E 00 00 +93 8E FE FF 73 90 EE 3B 73 2F E0 3B 63 94 EE 61 73 10 E0 3B B7 0E 00 00 93 8E FE FF 73 90 FE 3B -73 2F F0 3B 63 9A EE 5D 73 10 F0 3B B7 7E 77 77 -93 8E 7E 77 73 90 0E 3A 73 2F 00 3A 63 9E EE 5B +73 2F F0 3B 63 98 EE 5F 73 10 F0 3B B7 7E 77 77 +93 8E 7E 77 73 90 0E 3A 73 2F 00 3A 63 9C EE 5D 73 10 00 3A B7 7E 77 77 93 8E 7E 77 73 90 1E 3A -73 2F 10 3A 63 92 EE 5B 73 10 10 3A B7 7E 77 77 -93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 63 96 EE 59 +73 2F 10 3A 63 90 EE 5D 73 10 10 3A B7 7E 77 77 +93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 63 94 EE 5B 73 10 20 3A B7 7E 77 77 93 8E 7E 77 73 90 3E 3A -73 2F 30 3A 63 9A EE 57 73 10 30 3A 6F 00 00 41 +73 2F 30 3A 63 98 EE 59 73 10 30 3A 6F 00 C0 42 37 0F 00 00 13 0F 0F 08 F3 2E 00 30 B3 EE EE 01 73 90 0E 30 37 1F 00 00 13 0F 0F 80 F3 2E 40 30 -B3 EE EE 01 73 90 4E 30 6F 00 40 3E F3 22 00 3A +B3 EE EE 01 73 90 4E 30 6F 00 00 40 F3 22 00 3A 13 03 F0 0F 93 D2 82 00 B3 F2 62 00 63 96 D2 00 -13 05 00 00 6F 00 80 3C 13 05 10 00 6F 00 00 3C +13 05 00 00 6F 00 40 3E 13 05 10 00 6F 00 C0 3D F3 22 00 30 63 1E 05 00 37 83 00 00 1B 03 F3 FF 13 13 13 01 13 03 F3 FF B3 F2 62 00 6F 00 C0 00 -37 03 02 00 B3 E2 62 00 73 90 02 30 6F 00 00 39 +37 03 02 00 B3 E2 62 00 73 90 02 30 6F 00 C0 3A 03 20 05 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 23 20 05 00 13 00 00 00 13 00 00 00 @@ -240,7 +240,7 @@ F3 22 00 30 63 1E 05 00 37 83 00 00 1B 03 F3 FF 13 56 36 00 93 D5 25 00 B3 E5 C5 00 6F 00 80 00 93 D5 25 00 93 02 40 00 63 40 55 02 93 02 80 00 63 4C 55 0A 93 02 C0 00 63 48 55 14 93 02 00 01 -63 44 55 1E 6F 00 80 2F 73 23 00 3A 93 02 00 00 +63 44 55 1E 6F 00 40 31 73 23 00 3A 93 02 00 00 63 8E A2 00 93 02 10 00 63 86 A2 02 93 02 20 00 63 82 A2 04 93 02 30 00 63 8E A2 04 73 90 05 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 @@ -250,7 +250,7 @@ F3 22 00 30 63 1E 05 00 37 83 00 00 1B 03 F3 FF 93 92 02 01 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 35 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 -73 10 03 3A 6F 00 80 25 73 23 10 3A 93 02 40 00 +73 10 03 3A 6F 00 40 27 73 23 10 3A 93 02 40 00 63 8E A2 00 93 02 50 00 63 86 A2 02 93 02 60 00 63 82 A2 04 93 02 70 00 63 8E A2 04 73 90 45 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 @@ -260,7 +260,7 @@ F3 22 00 30 63 1E 05 00 37 83 00 00 1B 03 F3 FF 93 92 02 01 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 75 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 -73 10 13 3A 6F 00 80 1B 73 23 20 3A 93 02 80 00 +73 10 13 3A 6F 00 40 1D 73 23 20 3A 93 02 80 00 63 8E A2 00 93 02 90 00 63 86 A2 02 93 02 A0 00 63 82 A2 04 93 02 B0 00 63 8E A2 04 73 90 85 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 @@ -270,7 +270,7 @@ F3 22 00 30 63 1E 05 00 37 83 00 00 1B 03 F3 FF 93 92 02 01 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 B5 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 -73 10 23 3A 6F 00 80 11 73 23 30 3A 93 02 C0 00 +73 10 23 3A 6F 00 40 13 73 23 30 3A 93 02 C0 00 63 8E A2 00 93 02 D0 00 63 86 A2 02 93 02 E0 00 63 82 A2 04 93 02 F0 00 63 8E A2 04 73 90 C5 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 @@ -280,39 +280,41 @@ F3 22 00 30 63 1E 05 00 37 83 00 00 1B 03 F3 FF 93 92 02 01 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 F5 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 -73 10 33 3A 6F 00 80 07 93 02 00 00 63 08 57 06 +73 10 33 3A 6F 00 40 09 93 02 00 00 63 06 57 08 93 02 80 00 E3 06 57 D4 93 02 00 01 E3 08 57 D2 -93 02 80 01 E3 04 57 D2 13 05 10 00 6F 00 00 05 -93 0E 00 00 E3 80 D8 A1 93 0E 10 00 E3 86 D8 A5 -93 0E 80 00 E3 82 D8 FD 93 0E 90 00 E3 82 D8 C3 -93 0E A0 00 E3 86 D8 C7 93 0E B0 00 E3 8A D8 C9 -93 0E C0 00 E3 88 D8 CB 93 0E D0 00 E3 86 D8 CD -93 0E E0 00 E3 84 D8 C3 6F 00 40 00 F3 2E 10 34 -93 8E 4E 00 73 90 1E 34 73 00 20 30 13 0A 1A 00 -73 00 20 30 67 80 00 00 6F 00 40 05 93 8F 1F 00 -73 00 10 00 6F F0 9F FD 93 8F 1F 00 73 00 10 00 -73 24 20 34 93 02 50 00 63 0A 54 00 93 02 70 00 -63 06 54 00 93 02 10 00 63 04 54 00 73 00 20 30 -13 09 19 00 93 02 10 00 63 82 22 01 97 02 00 00 -93 82 42 0B 73 90 12 34 6F F0 5F FE 13 05 00 00 -93 05 00 00 37 06 04 00 93 06 F0 01 13 07 80 01 -93 08 80 00 73 00 00 00 13 04 00 00 13 05 10 00 -B7 05 04 00 37 06 04 00 93 06 90 01 13 07 80 01 -93 08 80 00 73 00 00 00 B7 02 04 00 23 A0 02 00 -93 02 70 00 63 12 54 0A 13 04 00 00 13 05 10 00 -B7 05 04 00 37 06 04 00 93 06 C0 01 13 07 80 01 -93 08 80 00 73 00 00 00 B7 02 04 00 03 A0 02 00 -93 02 50 00 63 1A 54 06 13 04 00 00 13 05 10 00 -B7 05 04 00 37 06 04 00 93 06 B0 01 13 07 80 01 -93 08 80 00 73 00 00 00 B7 02 04 00 67 80 02 00 -93 02 10 00 63 12 54 04 13 04 10 00 63 1E 54 02 -6F 00 80 04 93 02 00 00 13 03 A0 00 93 03 00 00 -13 0E 00 00 B3 83 53 00 23 20 7E 00 93 83 13 00 -83 23 0E 00 93 82 12 00 13 9E 22 00 E3 94 62 FE -67 80 00 00 63 1A 30 00 13 95 11 00 63 00 05 00 -13 65 15 00 73 00 00 00 13 05 10 00 73 00 00 00 -73 00 10 00 73 10 00 C0 -@80003128 +93 02 80 01 E3 04 57 D2 13 05 10 00 6F 00 C0 06 +63 06 A0 00 73 10 65 30 6F 00 00 06 73 50 60 30 +6F 00 80 05 93 0E 00 00 E3 86 D8 9F 93 0E 10 00 +E3 8C D8 A3 93 0E 80 00 E3 88 D8 FB 93 0E 90 00 +E3 88 D8 C1 93 0E A0 00 E3 8C D8 C5 93 0E B0 00 +E3 80 D8 C9 93 0E C0 00 E3 8E D8 C9 93 0E D0 00 +E3 8C D8 CB 93 0E E0 00 E3 8A D8 C1 93 0E F0 00 +E3 80 D8 FB 6F 00 40 00 F3 2E 10 34 93 8E 4E 00 +73 90 1E 34 73 00 20 30 13 0A 1A 00 73 00 20 30 +67 80 00 00 6F 00 40 05 93 8F 1F 00 73 00 10 00 +6F F0 9F FD 93 8F 1F 00 73 00 10 00 73 24 20 34 +93 02 50 00 63 0A 54 00 93 02 70 00 63 06 54 00 +93 02 10 00 63 04 54 00 73 00 20 30 13 09 19 00 +93 02 10 00 63 82 22 01 97 02 00 00 93 82 42 0B +73 90 12 34 6F F0 5F FE 13 05 00 00 93 05 00 00 +37 06 04 00 93 06 F0 01 13 07 80 01 93 08 80 00 +73 00 00 00 13 04 00 00 13 05 10 00 B7 05 04 00 +37 06 04 00 93 06 90 01 13 07 80 01 93 08 80 00 +73 00 00 00 B7 02 04 00 23 A0 02 00 93 02 70 00 +63 12 54 0A 13 04 00 00 13 05 10 00 B7 05 04 00 +37 06 04 00 93 06 C0 01 13 07 80 01 93 08 80 00 +73 00 00 00 B7 02 04 00 03 A0 02 00 93 02 50 00 +63 1A 54 06 13 04 00 00 13 05 10 00 B7 05 04 00 +37 06 04 00 93 06 B0 01 13 07 80 01 93 08 80 00 +73 00 00 00 B7 02 04 00 67 80 02 00 93 02 10 00 +63 12 54 04 13 04 10 00 63 1E 54 02 6F 00 80 04 +93 02 00 00 13 03 A0 00 93 03 00 00 13 0E 00 00 +B3 83 53 00 23 20 7E 00 93 83 13 00 83 23 0E 00 +93 82 12 00 13 9E 22 00 E3 94 62 FE 67 80 00 00 +63 1A 30 00 13 95 11 00 63 00 05 00 13 65 15 00 +73 00 00 00 13 05 10 00 73 00 00 00 73 00 10 00 +73 10 00 C0 +@80003148 41 73 73 65 72 74 69 6F 6E 20 66 61 69 6C 65 64 3A 20 61 64 64 72 20 3E 3D 20 28 31 55 4C 20 3C 3C 20 31 32 29 20 26 26 20 61 64 64 72 20 3C 20 diff --git a/test/priv_sec_testsuite/tests/rv64ui-v-test4.v b/test/priv_sec_testsuite/tests/rv64ui-v-test4.v index 52016a7..96e2d60 100755 --- a/test/priv_sec_testsuite/tests/rv64ui-v-test4.v +++ b/test/priv_sec_testsuite/tests/rv64ui-v-test4.v @@ -9,8 +9,8 @@ 13 0D 00 00 93 0D 00 00 13 0E 00 00 93 0E 00 00 13 0F 00 00 93 0F 00 00 97 02 00 00 93 82 02 F8 73 90 52 30 17 A1 00 00 13 01 C1 E4 F3 22 40 F1 -93 92 C2 00 33 01 51 00 73 10 01 34 EF 20 90 71 -17 35 00 00 13 05 85 F1 6F 20 00 6B 83 32 85 10 +93 92 C2 00 33 01 51 00 73 10 01 34 EF 20 50 73 +17 35 00 00 13 05 45 F3 6F 20 00 6B 83 32 85 10 73 90 12 14 83 30 85 00 03 31 05 01 83 31 85 01 03 32 05 02 83 32 85 02 03 33 05 03 83 33 85 03 03 34 05 04 83 34 85 04 83 35 85 05 03 36 05 06 @@ -114,11 +114,11 @@ E3 9C 07 FD 73 90 08 10 93 97 36 00 B3 06 F6 00 63 94 E5 04 93 96 36 00 B3 06 D6 00 23 B0 F6 00 73 00 05 12 83 30 81 00 13 01 01 01 67 80 00 00 93 E7 07 04 6F F0 1F FE 97 77 00 00 23 BC 07 B2 -6F F0 1F F0 17 15 00 00 13 05 C5 CB EF F0 1F D8 -13 05 30 00 EF F0 1F DC 17 15 00 00 13 05 05 CF +6F F0 1F F0 17 15 00 00 13 05 45 CD EF F0 1F D8 +13 05 30 00 EF F0 1F DC 17 15 00 00 13 05 85 D0 EF F0 DF D6 13 05 30 00 EF F0 DF DA 17 15 00 00 -13 05 45 D2 EF F0 9F D5 13 05 30 00 EF F0 9F D9 -17 15 00 00 13 05 85 D2 EF F0 5F D4 13 05 30 00 +13 05 C5 D3 EF F0 9F D5 13 05 30 00 EF F0 9F D9 +17 15 00 00 13 05 05 D4 EF F0 5F D4 13 05 30 00 EF F0 5F D8 83 35 85 11 13 01 01 F8 23 38 81 06 23 3C 11 06 23 34 91 06 23 30 21 07 23 3C 31 05 23 38 41 05 23 34 51 05 23 30 61 05 23 3C 71 03 @@ -132,12 +132,12 @@ EF F0 5F D8 83 35 85 11 13 01 01 F8 23 38 81 06 03 3D 01 02 83 3D 81 01 13 01 01 08 6F D0 1F AF 03 37 85 10 93 77 37 00 63 98 07 06 EF 07 80 00 73 10 30 00 03 27 07 00 83 A7 07 00 63 0A F7 04 -13 05 10 10 93 07 10 04 97 16 00 00 93 86 06 C8 +13 05 10 10 93 07 10 04 97 16 00 00 93 86 86 C9 17 F7 FF FF 13 07 07 A0 13 15 05 03 83 35 07 00 93 86 16 00 33 E6 A7 00 63 8A 05 00 97 F7 FF FF 23 B2 07 A2 83 37 07 00 E3 9A 07 FE 83 C7 06 00 23 30 C7 00 E3 9C 07 FC 13 05 30 00 EF F0 9F C6 -13 05 10 00 EF F0 1F C6 17 15 00 00 13 05 05 CD +13 05 10 00 EF F0 1F C6 17 15 00 00 13 05 85 CE EF F0 DF C0 13 05 30 00 EF F0 DF C4 03 29 05 05 37 1C 00 00 97 24 00 00 93 84 C4 99 97 3B 00 00 93 8B 4B 99 37 0B 04 00 B7 0A E0 FF 97 7D 00 00 @@ -151,10 +151,10 @@ EF F0 DF C0 13 05 30 00 EF F0 DF C4 03 29 05 05 93 FC 0C 08 83 35 81 00 63 80 0C 04 37 16 00 00 13 05 0C 00 EF F0 DF 8F B3 87 84 00 73 10 0D 10 03 B7 0D 00 23 B0 07 00 E3 1E 07 F6 23 B0 FD 00 -23 30 FA 00 6F F0 9F F7 17 15 00 00 13 05 85 C1 -EF F0 DF B2 6F F0 5F F0 17 15 00 00 13 05 85 BA +23 30 FA 00 6F F0 9F F7 17 15 00 00 13 05 05 C3 +EF F0 DF B2 6F F0 5F F0 17 15 00 00 13 05 05 BC EF F0 DF B1 13 05 30 00 EF F0 DF B5 17 15 00 00 -13 05 C5 B5 EF F0 9F B0 13 05 30 00 EF F0 9F B4 +13 05 45 B7 EF F0 9F B0 13 05 30 00 EF F0 9F B4 13 05 09 00 EF F0 1F B4 F3 27 40 F1 63 9A 07 18 97 57 00 00 93 87 07 89 13 01 01 ED 93 D7 C7 00 23 30 81 12 17 68 00 00 13 08 C8 87 13 04 05 00 @@ -186,51 +186,51 @@ E3 1A E3 FC 13 06 00 12 93 05 00 00 13 05 01 00 2F 20 07 00 13 D7 17 00 B3 C7 E7 00 93 97 E7 03 B3 F7 D7 00 B3 E7 E7 00 33 F7 C7 00 93 F5 17 00 33 07 A7 00 E3 9E 05 FC 03 20 07 00 6F F0 9F FD -17 15 00 00 13 05 05 A2 EF F0 5F 90 13 05 30 00 +17 15 00 00 13 05 85 A3 EF F0 5F 90 13 05 30 00 EF F0 5F 94 73 10 00 3A 73 10 10 3A 73 10 20 3A 73 10 30 3A 73 10 00 3B 73 10 10 3B 73 10 20 3B 73 10 30 3B 73 10 40 3B 73 10 50 3B 73 10 60 3B 73 10 70 3B 73 10 80 3B 73 10 90 3B 73 10 A0 3B 73 10 B0 3B 73 10 C0 3B 73 10 D0 3B 73 10 E0 3B -73 10 F0 3B 6F 00 80 5F 93 02 00 00 B7 0E 00 00 -93 8E FE FF 73 90 0E 3B 73 2F 00 3B 63 90 EE 7B +73 10 F0 3B 6F 00 40 61 93 02 00 00 B7 0E 00 00 +93 8E FE FF 73 90 0E 3B 73 2F 00 3B 63 9E EE 7B 73 10 00 3B B7 0E 00 00 93 8E FE FF 73 90 1E 3B -73 2F 10 3B 63 94 EE 79 73 10 10 3B B7 0E 00 00 -93 8E FE FF 73 90 2E 3B 73 2F 20 3B 63 98 EE 77 +73 2F 10 3B 63 92 EE 7B 73 10 10 3B B7 0E 00 00 +93 8E FE FF 73 90 2E 3B 73 2F 20 3B 63 96 EE 79 73 10 20 3B B7 0E 00 00 93 8E FE FF 73 90 3E 3B -73 2F 30 3B 63 9C EE 75 73 10 30 3B B7 0E 00 00 -93 8E FE FF 73 90 4E 3B 73 2F 40 3B 63 90 EE 75 +73 2F 30 3B 63 9A EE 77 73 10 30 3B B7 0E 00 00 +93 8E FE FF 73 90 4E 3B 73 2F 40 3B 63 9E EE 75 73 10 40 3B B7 0E 00 00 93 8E FE FF 73 90 5E 3B -73 2F 50 3B 63 94 EE 73 73 10 50 3B B7 0E 00 00 -93 8E FE FF 73 90 6E 3B 73 2F 60 3B 63 98 EE 71 +73 2F 50 3B 63 92 EE 75 73 10 50 3B B7 0E 00 00 +93 8E FE FF 73 90 6E 3B 73 2F 60 3B 63 96 EE 73 73 10 60 3B B7 0E 00 00 93 8E FE FF 73 90 7E 3B -73 2F 70 3B 63 9C EE 6F 73 10 70 3B B7 0E 00 00 -93 8E FE FF 73 90 8E 3B 73 2F 80 3B 63 90 EE 6F +73 2F 70 3B 63 9A EE 71 73 10 70 3B B7 0E 00 00 +93 8E FE FF 73 90 8E 3B 73 2F 80 3B 63 9E EE 6F 73 10 80 3B B7 0E 00 00 93 8E FE FF 73 90 9E 3B -73 2F 90 3B 63 94 EE 6D 73 10 90 3B B7 0E 00 00 -93 8E FE FF 73 90 AE 3B 73 2F A0 3B 63 98 EE 6B +73 2F 90 3B 63 92 EE 6F 73 10 90 3B B7 0E 00 00 +93 8E FE FF 73 90 AE 3B 73 2F A0 3B 63 96 EE 6D 73 10 A0 3B B7 0E 00 00 93 8E FE FF 73 90 BE 3B -73 2F B0 3B 63 9C EE 69 73 10 B0 3B B7 0E 00 00 -93 8E FE FF 73 90 CE 3B 73 2F C0 3B 63 90 EE 69 +73 2F B0 3B 63 9A EE 6B 73 10 B0 3B B7 0E 00 00 +93 8E FE FF 73 90 CE 3B 73 2F C0 3B 63 9E EE 69 73 10 C0 3B B7 0E 00 00 93 8E FE FF 73 90 DE 3B -73 2F D0 3B 63 94 EE 67 73 10 D0 3B B7 0E 00 00 -93 8E FE FF 73 90 EE 3B 73 2F E0 3B 63 98 EE 65 +73 2F D0 3B 63 92 EE 69 73 10 D0 3B B7 0E 00 00 +93 8E FE FF 73 90 EE 3B 73 2F E0 3B 63 96 EE 67 73 10 E0 3B B7 0E 00 00 93 8E FE FF 73 90 FE 3B -73 2F F0 3B 63 9C EE 63 73 10 F0 3B B7 7E 77 77 -93 8E 7E 77 73 90 0E 3A 73 2F 00 3A 63 90 EE 63 +73 2F F0 3B 63 9A EE 65 73 10 F0 3B B7 7E 77 77 +93 8E 7E 77 73 90 0E 3A 73 2F 00 3A 63 9E EE 63 73 10 00 3A B7 7E 77 77 93 8E 7E 77 73 90 1E 3A -73 2F 10 3A 63 94 EE 61 73 10 10 3A B7 7E 77 77 -93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 63 98 EE 5F +73 2F 10 3A 63 92 EE 63 73 10 10 3A B7 7E 77 77 +93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 63 96 EE 61 73 10 20 3A B7 7E 77 77 93 8E 7E 77 73 90 3E 3A -73 2F 30 3A 63 9C EE 5D 73 10 30 3A 6F 00 00 41 +73 2F 30 3A 63 9A EE 5F 73 10 30 3A 6F 00 C0 42 37 0F 00 00 13 0F 0F 08 F3 2E 00 30 B3 EE EE 01 73 90 0E 30 37 1F 00 00 13 0F 0F 80 F3 2E 40 30 -B3 EE EE 01 73 90 4E 30 6F 00 40 3E F3 22 00 3A +B3 EE EE 01 73 90 4E 30 6F 00 00 40 F3 22 00 3A 13 03 F0 0F 93 D2 82 00 B3 F2 62 00 63 96 D2 00 -13 05 00 00 6F 00 80 3C 13 05 10 00 6F 00 00 3C +13 05 00 00 6F 00 40 3E 13 05 10 00 6F 00 C0 3D F3 22 00 30 63 1E 05 00 37 83 00 00 1B 03 F3 FF 13 13 13 01 13 03 F3 FF B3 F2 62 00 6F 00 C0 00 -37 03 02 00 B3 E2 62 00 73 90 02 30 6F 00 00 39 +37 03 02 00 B3 E2 62 00 73 90 02 30 6F 00 C0 3A 03 20 05 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 23 20 05 00 13 00 00 00 13 00 00 00 @@ -240,7 +240,7 @@ F3 22 00 30 63 1E 05 00 37 83 00 00 1B 03 F3 FF 13 56 36 00 93 D5 25 00 B3 E5 C5 00 6F 00 80 00 93 D5 25 00 93 02 40 00 63 40 55 02 93 02 80 00 63 4C 55 0A 93 02 C0 00 63 48 55 14 93 02 00 01 -63 44 55 1E 6F 00 80 2F 73 23 00 3A 93 02 00 00 +63 44 55 1E 6F 00 40 31 73 23 00 3A 93 02 00 00 63 8E A2 00 93 02 10 00 63 86 A2 02 93 02 20 00 63 82 A2 04 93 02 30 00 63 8E A2 04 73 90 05 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 @@ -250,7 +250,7 @@ F3 22 00 30 63 1E 05 00 37 83 00 00 1B 03 F3 FF 93 92 02 01 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 35 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 -73 10 03 3A 6F 00 80 25 73 23 10 3A 93 02 40 00 +73 10 03 3A 6F 00 40 27 73 23 10 3A 93 02 40 00 63 8E A2 00 93 02 50 00 63 86 A2 02 93 02 60 00 63 82 A2 04 93 02 70 00 63 8E A2 04 73 90 45 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 @@ -260,7 +260,7 @@ F3 22 00 30 63 1E 05 00 37 83 00 00 1B 03 F3 FF 93 92 02 01 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 75 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 -73 10 13 3A 6F 00 80 1B 73 23 20 3A 93 02 80 00 +73 10 13 3A 6F 00 40 1D 73 23 20 3A 93 02 80 00 63 8E A2 00 93 02 90 00 63 86 A2 02 93 02 A0 00 63 82 A2 04 93 02 B0 00 63 8E A2 04 73 90 85 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 @@ -270,7 +270,7 @@ F3 22 00 30 63 1E 05 00 37 83 00 00 1B 03 F3 FF 93 92 02 01 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 B5 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 -73 10 23 3A 6F 00 80 11 73 23 30 3A 93 02 C0 00 +73 10 23 3A 6F 00 40 13 73 23 30 3A 93 02 C0 00 63 8E A2 00 93 02 D0 00 63 86 A2 02 93 02 E0 00 63 82 A2 04 93 02 F0 00 63 8E A2 04 73 90 C5 3B 9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 @@ -280,45 +280,47 @@ F3 22 00 30 63 1E 05 00 37 83 00 00 1B 03 F3 FF 93 92 02 01 93 82 F2 FF 33 73 53 00 93 96 06 01 6F 00 C0 01 73 90 F5 3B B7 02 00 01 9B 82 F2 FF 33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 -73 10 33 3A 6F 00 80 07 93 02 00 00 63 08 57 06 +73 10 33 3A 6F 00 40 09 93 02 00 00 63 06 57 08 93 02 80 00 E3 06 57 D4 93 02 00 01 E3 08 57 D2 -93 02 80 01 E3 04 57 D2 13 05 10 00 6F 00 00 05 -93 0E 00 00 E3 80 D8 A1 93 0E 10 00 E3 86 D8 A5 -93 0E 80 00 E3 82 D8 FD 93 0E 90 00 E3 82 D8 C3 -93 0E A0 00 E3 86 D8 C7 93 0E B0 00 E3 8A D8 C9 -93 0E C0 00 E3 88 D8 CB 93 0E D0 00 E3 86 D8 CD -93 0E E0 00 E3 84 D8 C3 6F 00 40 00 F3 2E 10 34 -93 8E 4E 00 73 90 1E 34 73 00 20 30 13 0A 1A 00 -73 00 20 30 67 80 00 00 6F 00 00 08 93 8F 1F 00 -73 00 10 00 6F F0 9F FD 93 8F 1F 00 73 00 10 00 -73 24 20 34 93 02 50 00 63 0A 54 00 93 02 70 00 -63 02 54 02 93 02 10 00 63 0A 54 02 13 09 19 00 -13 05 50 00 97 02 00 00 93 82 82 09 73 90 12 34 -6F 00 40 03 13 09 19 00 13 05 70 00 97 02 00 00 -93 82 C2 0B 73 90 12 34 6F 00 C0 01 13 09 19 00 -13 05 10 00 97 02 00 00 93 82 C2 0E 73 90 12 34 -6F 00 40 00 73 00 20 30 13 05 00 00 93 05 00 00 -37 06 04 00 93 06 F0 01 13 07 80 01 93 08 80 00 -73 00 00 00 13 04 00 00 13 05 10 00 93 08 A0 00 -73 00 00 00 13 05 10 00 B7 05 04 00 37 06 04 00 -93 06 C0 01 13 07 80 01 93 08 80 00 73 00 00 00 -37 05 04 00 93 08 B0 00 73 00 00 00 93 02 50 00 -63 16 A4 0C 93 02 10 00 63 12 59 0C 13 00 00 00 -13 05 10 00 B7 05 04 00 37 06 04 00 93 06 90 01 -13 07 80 01 93 08 80 00 73 00 00 00 37 05 04 00 -93 08 C0 00 73 00 00 00 93 02 70 00 63 18 A4 08 -93 02 20 00 63 14 59 08 13 00 00 00 13 05 10 00 -B7 05 04 00 37 06 04 00 93 06 B0 09 13 07 80 01 -93 08 80 00 73 00 00 00 93 02 30 01 37 03 04 00 -23 20 53 00 37 05 04 00 93 08 D0 00 73 00 00 00 -93 02 10 00 63 14 A4 04 93 02 30 00 63 10 59 04 -13 00 00 00 13 05 10 00 B7 05 04 00 13 06 00 02 +93 02 80 01 E3 04 57 D2 13 05 10 00 6F 00 C0 06 +63 06 A0 00 73 10 65 30 6F 00 00 06 73 50 60 30 +6F 00 80 05 93 0E 00 00 E3 86 D8 9F 93 0E 10 00 +E3 8C D8 A3 93 0E 80 00 E3 88 D8 FB 93 0E 90 00 +E3 88 D8 C1 93 0E A0 00 E3 8C D8 C5 93 0E B0 00 +E3 80 D8 C9 93 0E C0 00 E3 8E D8 C9 93 0E D0 00 +E3 8C D8 CB 93 0E E0 00 E3 8A D8 C1 93 0E F0 00 +E3 80 D8 FB 6F 00 40 00 F3 2E 10 34 93 8E 4E 00 +73 90 1E 34 73 00 20 30 13 0A 1A 00 73 00 20 30 +67 80 00 00 6F 00 00 08 93 8F 1F 00 73 00 10 00 +6F F0 9F FD 93 8F 1F 00 73 00 10 00 73 24 20 34 +93 02 50 00 63 0A 54 00 93 02 70 00 63 02 54 02 +93 02 10 00 63 0A 54 02 13 09 19 00 13 05 50 00 +97 02 00 00 93 82 82 09 73 90 12 34 6F 00 40 03 +13 09 19 00 13 05 70 00 97 02 00 00 93 82 C2 0B +73 90 12 34 6F 00 C0 01 13 09 19 00 13 05 10 00 +97 02 00 00 93 82 C2 0E 73 90 12 34 6F 00 40 00 +73 00 20 30 13 05 00 00 93 05 00 00 37 06 04 00 93 06 F0 01 13 07 80 01 93 08 80 00 73 00 00 00 -13 05 F0 01 93 08 E0 00 73 00 00 00 93 02 10 00 -63 16 55 00 6F 00 80 01 63 1A 30 00 13 95 11 00 -63 00 05 00 13 65 15 00 73 00 00 00 13 05 10 00 -73 00 00 00 73 00 10 00 73 10 00 C0 -@80003190 +13 04 00 00 13 05 10 00 93 08 A0 00 73 00 00 00 +13 05 10 00 B7 05 04 00 37 06 04 00 93 06 C0 01 +13 07 80 01 93 08 80 00 73 00 00 00 37 05 04 00 +93 08 B0 00 73 00 00 00 93 02 50 00 63 16 A4 0C +93 02 10 00 63 12 59 0C 13 00 00 00 13 05 10 00 +B7 05 04 00 37 06 04 00 93 06 90 01 13 07 80 01 +93 08 80 00 73 00 00 00 37 05 04 00 93 08 C0 00 +73 00 00 00 93 02 70 00 63 18 A4 08 93 02 20 00 +63 14 59 08 13 00 00 00 13 05 10 00 B7 05 04 00 +37 06 04 00 93 06 B0 09 13 07 80 01 93 08 80 00 +73 00 00 00 93 02 30 01 37 03 04 00 23 20 53 00 +37 05 04 00 93 08 D0 00 73 00 00 00 93 02 10 00 +63 14 A4 04 93 02 30 00 63 10 59 04 13 00 00 00 +13 05 10 00 B7 05 04 00 13 06 00 02 93 06 F0 01 +13 07 80 01 93 08 80 00 73 00 00 00 13 05 F0 01 +93 08 E0 00 73 00 00 00 93 02 10 00 63 16 55 00 +6F 00 80 01 63 1A 30 00 13 95 11 00 63 00 05 00 +13 65 15 00 73 00 00 00 13 05 10 00 73 00 00 00 +73 00 10 00 73 10 00 C0 +@800031A8 41 73 73 65 72 74 69 6F 6E 20 66 61 69 6C 65 64 3A 20 61 64 64 72 20 3E 3D 20 28 31 55 4C 20 3C 3C 20 31 32 29 20 26 26 20 61 64 64 72 20 3C 20 diff --git a/test/priv_sec_testsuite/tests/rv64ui-v-test5.v b/test/priv_sec_testsuite/tests/rv64ui-v-test5.v new file mode 100755 index 0000000..922bc8c --- /dev/null +++ b/test/priv_sec_testsuite/tests/rv64ui-v-test5.v @@ -0,0 +1,343 @@ +@80000000 +6F 00 C0 00 6F 20 80 2C 6F 20 40 2C 93 00 00 00 +13 01 00 00 93 01 00 00 13 02 00 00 93 02 00 00 +13 03 00 00 93 03 00 00 13 04 00 00 93 04 00 00 +13 05 00 00 93 05 00 00 13 06 00 00 93 06 00 00 +13 07 00 00 93 07 00 00 13 08 00 00 93 08 00 00 +13 09 00 00 93 09 00 00 13 0A 00 00 93 0A 00 00 +13 0B 00 00 93 0B 00 00 13 0C 00 00 93 0C 00 00 +13 0D 00 00 93 0D 00 00 13 0E 00 00 93 0E 00 00 +13 0F 00 00 93 0F 00 00 97 02 00 00 93 82 02 F8 +73 90 52 30 17 A1 00 00 13 01 C1 E4 F3 22 40 F1 +93 92 C2 00 33 01 51 00 73 10 01 34 EF 20 50 73 +17 35 00 00 13 05 45 F3 6F 20 00 6B 83 32 85 10 +73 90 12 14 83 30 85 00 03 31 05 01 83 31 85 01 +03 32 05 02 83 32 85 02 03 33 05 03 83 33 85 03 +03 34 05 04 83 34 85 04 83 35 85 05 03 36 05 06 +83 36 85 06 03 37 05 07 83 37 85 07 03 38 05 08 +83 38 85 08 03 39 05 09 83 39 85 09 03 3A 05 0A +83 3A 85 0A 03 3B 05 0B 83 3B 85 0B 03 3C 05 0C +83 3C 85 0C 03 3D 05 0D 83 3D 85 0D 03 3E 05 0E +83 3E 85 0E 03 3F 05 0F 83 3F 85 0F 03 35 05 05 +73 00 20 10 73 11 01 14 23 34 11 00 23 3C 31 00 +23 30 41 02 23 34 51 02 23 38 61 02 23 3C 71 02 +23 30 81 04 23 34 91 04 23 38 A1 04 23 3C B1 04 +23 30 C1 06 23 34 D1 06 23 38 E1 06 23 3C F1 06 +23 30 01 09 23 34 11 09 23 38 21 09 23 3C 31 09 +23 30 41 0B 23 34 51 0B 23 38 61 0B 23 3C 71 0B +23 30 81 0D 23 34 91 0D 23 38 A1 0D 23 3C B1 0D +23 30 C1 0F 23 34 D1 0F 23 38 E1 0F 23 3C F1 0F +F3 12 01 14 23 38 51 00 F3 22 00 10 23 30 51 10 +F3 22 10 14 23 34 51 10 F3 22 30 14 23 38 51 10 +F3 22 20 14 23 3C 51 10 13 05 01 00 6F 20 80 33 +@80001000 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 +@80002000 +B3 67 B5 00 B3 E7 C7 00 93 F7 77 00 B3 06 C5 00 +63 84 07 02 33 86 C5 00 93 07 05 00 63 7E D5 02 +03 C7 05 00 93 85 15 00 93 87 17 00 A3 8F E7 FE +E3 98 C5 FE 67 80 00 00 E3 7E D5 FE 93 07 05 00 +03 B7 05 00 93 87 87 00 93 85 85 00 23 BC E7 FE +E3 E8 D7 FE 67 80 00 00 67 80 00 00 13 01 01 FF +B3 67 C5 00 23 30 81 00 23 34 11 00 93 F7 77 00 +13 04 05 00 33 07 C5 00 63 82 07 02 63 76 E5 00 +93 F5 F5 0F EF F0 9F FD 83 30 81 00 13 05 04 00 +03 34 01 00 13 01 01 01 67 80 00 00 93 F5 F5 0F +93 96 85 00 B3 E6 B6 00 93 97 06 01 B3 E7 D7 00 +93 96 07 02 B3 E6 F6 00 E3 78 E5 FC 93 07 05 00 +93 87 87 00 23 BC D7 FE E3 EC E7 FE 83 30 81 00 +13 05 04 00 03 34 01 00 13 01 01 01 67 80 00 00 +83 47 05 00 63 8E 07 00 93 07 05 00 03 C7 17 00 +93 87 17 00 E3 1C 07 FE 33 85 A7 40 67 80 00 00 +13 05 00 00 67 80 00 00 83 47 05 00 93 85 15 00 +13 05 15 00 03 C7 F5 FF 63 8A 07 00 E3 86 E7 FE +1B 85 07 00 3B 05 E5 40 67 80 00 00 13 05 00 00 +6F F0 5F FF B3 67 B5 00 93 F7 77 00 63 9E 07 02 +13 78 86 FF 33 08 05 01 63 78 05 03 93 07 05 00 +6F 00 00 01 93 87 87 00 93 85 85 00 63 F8 07 01 +83 B6 07 00 03 B7 05 00 E3 86 E6 FE 33 85 A7 40 +33 06 A6 40 13 85 07 00 33 86 C5 00 6F 00 40 01 +03 C7 05 00 83 47 F5 FF 93 85 15 00 63 9A E7 00 +13 05 15 00 E3 96 C5 FE 13 05 00 00 67 80 00 00 +3B 85 E7 40 67 80 00 00 93 07 05 00 03 C7 05 00 +93 87 17 00 93 85 15 00 A3 8F E7 FE E3 18 07 FE +67 80 00 00 03 47 05 00 93 06 00 02 93 07 05 00 +63 18 D7 00 03 C7 17 00 93 87 17 00 E3 0C D7 FE +93 06 D0 02 63 00 D7 06 93 06 B0 02 63 00 D7 04 +83 C6 07 00 93 05 00 00 63 82 06 04 13 05 00 00 +93 87 17 00 13 17 25 00 1B 86 06 FD 83 C6 07 00 +33 07 A7 00 13 17 17 00 33 05 E6 00 E3 92 06 FE +63 80 05 02 33 05 A0 40 67 80 00 00 83 C6 17 00 +93 05 00 00 93 87 17 00 E3 92 06 FC 13 05 00 00 +67 80 00 00 83 C6 17 00 93 05 10 00 93 87 17 00 +E3 96 06 FA 13 05 00 00 6F F0 9F FE 83 47 05 00 +63 80 07 04 93 05 10 10 17 F7 FF FF 13 07 87 D9 +93 95 05 03 03 36 07 00 13 05 15 00 B3 E6 B7 00 +63 0A 06 00 97 F7 FF FF 23 BE 07 DA 83 37 07 00 +E3 9A 07 FE 23 30 D7 00 83 47 05 00 E3 9C 07 FC +67 80 00 00 17 F7 FF FF 13 07 C7 D5 83 37 07 00 +63 8A 07 00 97 F7 FF FF 23 B6 07 D8 83 37 07 00 +E3 9A 07 FE 23 30 A7 00 6F 00 00 00 13 01 01 FF +13 05 90 34 23 34 11 00 EF F0 DF FC 13 01 01 FE +13 06 81 00 93 07 71 01 13 08 90 00 6F 00 80 00 +93 07 07 00 93 76 F5 00 13 87 06 00 93 05 00 03 +63 74 D8 00 93 05 70 05 3B 07 B7 00 23 80 E7 00 +13 55 45 00 13 87 F7 FF E3 1C F6 FC 83 47 81 00 +23 0C 01 00 63 82 07 04 13 05 10 10 93 06 06 00 +17 F7 FF FF 13 07 07 CD 13 15 05 03 83 35 07 00 +93 86 16 00 33 E6 A7 00 63 8A 05 00 97 F7 FF FF +23 BA 07 CE 83 37 07 00 E3 9A 07 FE 83 C7 06 00 +23 30 C7 00 E3 9C 07 FC 13 01 01 02 67 80 00 00 +13 01 01 FF 37 F8 FF FF 23 34 11 00 33 07 05 01 +B7 E7 03 00 63 78 F7 14 13 57 C5 00 93 06 07 60 +17 36 00 00 13 06 06 C7 93 97 36 00 B3 07 F6 00 +83 B7 07 00 33 75 05 01 63 90 07 0E 97 75 00 00 +93 85 C5 C5 03 B8 05 00 63 02 08 14 83 37 88 00 +97 78 00 00 83 B8 08 C4 23 B0 F5 00 63 8E 17 0F +83 37 08 00 93 98 36 00 B3 08 16 01 93 D7 C7 00 +93 97 A7 00 13 E3 F7 0D 93 E5 F7 01 23 B0 68 00 +73 00 05 12 97 27 00 00 93 87 C7 C0 13 17 47 00 +B3 87 E7 00 03 B7 07 00 63 14 07 10 03 37 08 00 +B7 08 04 00 23 B0 E7 00 03 37 88 00 23 B4 E7 00 +F3 A8 08 10 B7 07 E0 FF B3 07 F5 00 37 18 00 00 +13 07 05 00 33 88 07 01 03 BF 07 00 83 BE 87 00 +03 BE 07 01 03 B3 87 01 23 30 E7 01 23 34 D7 01 +23 38 C7 01 23 3C 67 00 93 87 07 02 13 07 07 02 +E3 9C 07 FD 73 90 08 10 93 97 36 00 B3 06 F6 00 +23 B0 B6 00 73 00 05 12 0F 10 00 00 83 30 81 00 +13 01 01 01 67 80 00 00 13 F7 07 04 63 0A 07 02 +13 F7 07 08 63 1A 07 04 13 07 F0 00 93 E7 07 08 +63 94 E5 04 93 96 36 00 B3 06 D6 00 23 B0 F6 00 +73 00 05 12 83 30 81 00 13 01 01 01 67 80 00 00 +93 E7 07 04 6F F0 1F FE 97 77 00 00 23 BC 07 B2 +6F F0 1F F0 17 15 00 00 13 05 45 C0 EF F0 1F D8 +13 05 30 00 EF F0 1F DC 17 15 00 00 13 05 85 C3 +EF F0 DF D6 13 05 30 00 EF F0 DF DA 17 15 00 00 +13 05 C5 C6 EF F0 9F D5 13 05 30 00 EF F0 9F D9 +17 15 00 00 13 05 05 C7 EF F0 5F D4 13 05 30 00 +EF F0 5F D8 83 35 85 11 13 01 01 F8 23 38 81 06 +23 3C 11 06 23 34 91 06 23 30 21 07 23 3C 31 05 +23 38 41 05 23 34 51 05 23 30 61 05 23 3C 71 03 +23 38 81 03 23 34 91 03 23 30 A1 03 23 3C B1 01 +93 07 80 00 13 04 05 00 63 8A F5 0E 93 07 20 00 +63 80 F5 06 93 87 45 FF 13 07 10 00 63 76 F7 00 +93 07 F0 00 63 92 F5 1A 03 35 04 11 EF F0 5F DE +13 05 04 00 03 34 01 07 83 30 81 07 83 34 81 06 +03 39 01 06 83 39 81 05 03 3A 01 05 83 3A 81 04 +03 3B 01 04 83 3B 81 03 03 3C 01 03 83 3C 81 02 +03 3D 01 02 83 3D 81 01 13 01 01 08 6F D0 1F AF +03 37 85 10 93 77 37 00 63 98 07 06 EF 07 80 00 +73 10 30 00 03 27 07 00 83 A7 07 00 63 0A F7 04 +13 05 10 10 93 07 10 04 97 16 00 00 93 86 86 BC +17 F7 FF FF 13 07 07 A0 13 15 05 03 83 35 07 00 +93 86 16 00 33 E6 A7 00 63 8A 05 00 97 F7 FF FF +23 B2 07 A2 83 37 07 00 E3 9A 07 FE 83 C7 06 00 +23 30 C7 00 E3 9C 07 FC 13 05 30 00 EF F0 9F C6 +13 05 10 00 EF F0 1F C6 17 15 00 00 13 05 85 C1 +EF F0 DF C0 13 05 30 00 EF F0 DF C4 03 29 05 05 +37 1C 00 00 97 24 00 00 93 84 C4 99 97 3B 00 00 +93 8B 4B 99 37 0B 04 00 B7 0A E0 FF 97 7D 00 00 +93 8D 4D 98 17 7A 00 00 13 0A 4A 98 B7 F9 03 00 +6F 00 80 01 23 34 F7 00 23 B0 FD 00 B7 17 00 00 +33 0C FC 00 63 0E 3C 0B 93 57 CC 00 13 94 47 00 +33 87 84 00 03 37 07 00 E3 02 07 FE 93 87 07 60 +93 97 37 00 B3 87 FB 00 83 BC 07 00 93 F7 0C 04 +63 8E 07 06 73 2D 0B 10 37 16 00 00 B3 05 5C 01 +13 05 0C 00 23 34 B1 00 EF F0 DF A4 63 0E 05 00 +93 FC 0C 08 83 35 81 00 63 80 0C 04 37 16 00 00 +13 05 0C 00 EF F0 DF 8F B3 87 84 00 73 10 0D 10 +03 B7 0D 00 23 B0 07 00 E3 1E 07 F6 23 B0 FD 00 +23 30 FA 00 6F F0 9F F7 17 15 00 00 13 05 05 B6 +EF F0 DF B2 6F F0 5F F0 17 15 00 00 13 05 05 AF +EF F0 DF B1 13 05 30 00 EF F0 DF B5 17 15 00 00 +13 05 45 AA EF F0 9F B0 13 05 30 00 EF F0 9F B4 +13 05 09 00 EF F0 1F B4 F3 27 40 F1 63 9A 07 18 +97 57 00 00 93 87 07 89 13 01 01 ED 93 D7 C7 00 +23 30 81 12 17 68 00 00 13 08 C8 87 13 04 05 00 +93 97 A7 00 17 45 00 00 13 05 C5 86 23 34 11 12 +93 56 C5 00 13 57 C8 00 93 E7 17 00 97 38 00 00 +93 88 48 85 13 06 F0 FF 23 3C F5 FE 93 96 A6 00 +13 17 A7 00 B7 07 00 20 93 E6 16 00 13 67 17 00 +93 D5 C8 00 13 13 F6 03 93 87 F7 0C 23 3C F8 FE +23 B0 D8 00 23 30 E5 00 B3 E7 65 00 73 90 07 18 +73 27 00 18 63 9E E7 14 13 56 B6 00 93 07 F0 01 +97 02 00 00 93 82 42 01 F3 92 52 30 73 10 06 3B +73 90 07 3A 73 90 52 30 13 08 F0 BF 13 18 58 01 +97 E7 FF FF 93 87 47 92 B3 87 07 01 73 90 57 10 +F3 27 00 34 B3 87 07 01 73 90 07 14 B7 B7 00 00 +9B 87 07 10 73 90 27 30 B7 E7 01 00 9B 87 07 60 +73 90 07 30 73 50 40 30 17 27 00 00 13 07 87 B9 +93 07 08 3E B3 06 07 01 B3 07 F7 00 B7 08 08 00 +17 66 00 00 23 3C D6 78 17 23 00 00 13 03 83 F6 +97 66 00 00 23 B0 F6 78 93 88 F8 03 93 07 F0 03 +13 08 08 01 13 D6 17 00 B3 86 17 01 B3 47 F6 00 +B3 05 07 01 93 96 C6 00 93 97 57 00 23 30 D7 00 +23 34 B7 00 93 F7 07 02 13 07 07 01 B3 67 F6 00 +E3 1A E3 FC 13 06 00 12 93 05 00 00 13 05 01 00 +97 27 00 00 23 B4 07 F0 EF F0 4F F8 B7 07 00 80 +33 04 F4 00 13 05 01 00 23 34 81 10 EF D0 0F FD +83 30 81 12 03 34 01 12 13 01 01 13 67 80 00 00 +13 07 10 00 B7 37 E7 06 37 06 08 00 93 87 C7 BD +13 06 C6 FF 13 15 F7 01 93 16 E7 03 6F 00 C0 01 +2F 20 07 00 13 D7 17 00 B3 C7 E7 00 93 97 E7 03 +B3 F7 D7 00 B3 E7 E7 00 33 F7 C7 00 93 F5 17 00 +33 07 A7 00 E3 9E 05 FC 03 20 07 00 6F F0 9F FD +17 15 00 00 13 05 85 96 EF F0 5F 90 13 05 30 00 +EF F0 5F 94 73 10 00 3A 73 10 10 3A 73 10 20 3A +73 10 30 3A 73 10 00 3B 73 10 10 3B 73 10 20 3B +73 10 30 3B 73 10 40 3B 73 10 50 3B 73 10 60 3B +73 10 70 3B 73 10 80 3B 73 10 90 3B 73 10 A0 3B +73 10 B0 3B 73 10 C0 3B 73 10 D0 3B 73 10 E0 3B +73 10 F0 3B 6F 00 40 61 93 02 00 00 B7 0E 00 00 +93 8E FE FF 73 90 0E 3B 73 2F 00 3B 63 96 EE 6F +73 10 00 3B B7 0E 00 00 93 8E FE FF 73 90 1E 3B +73 2F 10 3B 63 9A EE 6D 73 10 10 3B B7 0E 00 00 +93 8E FE FF 73 90 2E 3B 73 2F 20 3B 63 9E EE 6B +73 10 20 3B B7 0E 00 00 93 8E FE FF 73 90 3E 3B +73 2F 30 3B 63 92 EE 6B 73 10 30 3B B7 0E 00 00 +93 8E FE FF 73 90 4E 3B 73 2F 40 3B 63 96 EE 69 +73 10 40 3B B7 0E 00 00 93 8E FE FF 73 90 5E 3B +73 2F 50 3B 63 9A EE 67 73 10 50 3B B7 0E 00 00 +93 8E FE FF 73 90 6E 3B 73 2F 60 3B 63 9E EE 65 +73 10 60 3B B7 0E 00 00 93 8E FE FF 73 90 7E 3B +73 2F 70 3B 63 92 EE 65 73 10 70 3B B7 0E 00 00 +93 8E FE FF 73 90 8E 3B 73 2F 80 3B 63 96 EE 63 +73 10 80 3B B7 0E 00 00 93 8E FE FF 73 90 9E 3B +73 2F 90 3B 63 9A EE 61 73 10 90 3B B7 0E 00 00 +93 8E FE FF 73 90 AE 3B 73 2F A0 3B 63 9E EE 5F +73 10 A0 3B B7 0E 00 00 93 8E FE FF 73 90 BE 3B +73 2F B0 3B 63 92 EE 5F 73 10 B0 3B B7 0E 00 00 +93 8E FE FF 73 90 CE 3B 73 2F C0 3B 63 96 EE 5D +73 10 C0 3B B7 0E 00 00 93 8E FE FF 73 90 DE 3B +73 2F D0 3B 63 9A EE 5B 73 10 D0 3B B7 0E 00 00 +93 8E FE FF 73 90 EE 3B 73 2F E0 3B 63 9E EE 59 +73 10 E0 3B B7 0E 00 00 93 8E FE FF 73 90 FE 3B +73 2F F0 3B 63 92 EE 59 73 10 F0 3B B7 7E 77 77 +93 8E 7E 77 73 90 0E 3A 73 2F 00 3A 63 96 EE 57 +73 10 00 3A B7 7E 77 77 93 8E 7E 77 73 90 1E 3A +73 2F 10 3A 63 9A EE 55 73 10 10 3A B7 7E 77 77 +93 8E 7E 77 73 90 2E 3A 73 2F 20 3A 63 9E EE 53 +73 10 20 3A B7 7E 77 77 93 8E 7E 77 73 90 3E 3A +73 2F 30 3A 63 92 EE 53 73 10 30 3A 6F 00 C0 42 +37 0F 00 00 13 0F 0F 08 F3 2E 00 30 B3 EE EE 01 +73 90 0E 30 37 1F 00 00 13 0F 0F 80 F3 2E 40 30 +B3 EE EE 01 73 90 4E 30 6F 00 00 40 F3 22 00 3A +13 03 F0 0F 93 D2 82 00 B3 F2 62 00 63 96 D2 00 +13 05 00 00 6F 00 40 3E 13 05 10 00 6F 00 C0 3D +F3 22 00 30 63 1E 05 00 37 83 00 00 1B 03 F3 FF +13 13 13 01 13 03 F3 FF B3 F2 62 00 6F 00 C0 00 +37 03 02 00 B3 E2 62 00 73 90 02 30 6F 00 C0 3A +03 20 05 00 13 00 00 00 13 00 00 00 13 00 00 00 +13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 +13 00 00 00 23 20 05 00 13 00 00 00 13 00 00 00 +13 00 00 00 13 00 00 00 13 00 00 00 13 00 00 00 +13 00 00 00 13 00 00 00 67 00 05 00 13 00 00 00 +13 00 00 00 13 00 00 00 13 00 00 00 13 06 F6 FF +13 56 36 00 93 D5 25 00 B3 E5 C5 00 6F 00 80 00 +93 D5 25 00 93 02 40 00 63 40 55 02 93 02 80 00 +63 4C 55 0A 93 02 C0 00 63 48 55 14 93 02 00 01 +63 44 55 1E 6F 00 40 31 73 23 00 3A 93 02 00 00 +63 8E A2 00 93 02 10 00 63 86 A2 02 93 02 20 00 +63 82 A2 04 93 02 30 00 63 8E A2 04 73 90 05 3B +9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 +6F 00 C0 05 73 90 15 3B B7 02 01 00 9B 82 F2 FF +93 92 02 01 93 82 F2 0F 33 73 53 00 93 96 86 00 +6F 00 C0 03 73 90 25 3B B7 02 01 00 9B 82 12 F0 +93 92 02 01 93 82 F2 FF 33 73 53 00 93 96 06 01 +6F 00 C0 01 73 90 35 3B B7 02 00 01 9B 82 F2 FF +33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 +73 10 03 3A 6F 00 40 27 73 23 10 3A 93 02 40 00 +63 8E A2 00 93 02 50 00 63 86 A2 02 93 02 60 00 +63 82 A2 04 93 02 70 00 63 8E A2 04 73 90 45 3B +9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 +6F 00 C0 05 73 90 55 3B B7 02 01 00 9B 82 F2 FF +93 92 02 01 93 82 F2 0F 33 73 53 00 93 96 86 00 +6F 00 C0 03 73 90 65 3B B7 02 01 00 9B 82 12 F0 +93 92 02 01 93 82 F2 FF 33 73 53 00 93 96 06 01 +6F 00 C0 01 73 90 75 3B B7 02 00 01 9B 82 F2 FF +33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 +73 10 13 3A 6F 00 40 1D 73 23 20 3A 93 02 80 00 +63 8E A2 00 93 02 90 00 63 86 A2 02 93 02 A0 00 +63 82 A2 04 93 02 B0 00 63 8E A2 04 73 90 85 3B +9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 +6F 00 C0 05 73 90 95 3B B7 02 01 00 9B 82 F2 FF +93 92 02 01 93 82 F2 0F 33 73 53 00 93 96 86 00 +6F 00 C0 03 73 90 A5 3B B7 02 01 00 9B 82 12 F0 +93 92 02 01 93 82 F2 FF 33 73 53 00 93 96 06 01 +6F 00 C0 01 73 90 B5 3B B7 02 00 01 9B 82 F2 FF +33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 +73 10 23 3A 6F 00 40 13 73 23 30 3A 93 02 C0 00 +63 8E A2 00 93 02 D0 00 63 86 A2 02 93 02 E0 00 +63 82 A2 04 93 02 F0 00 63 8E A2 04 73 90 C5 3B +9B 02 10 00 93 92 02 02 93 82 02 F0 33 73 53 00 +6F 00 C0 05 73 90 D5 3B B7 02 01 00 9B 82 F2 FF +93 92 02 01 93 82 F2 0F 33 73 53 00 93 96 86 00 +6F 00 C0 03 73 90 E5 3B B7 02 01 00 9B 82 12 F0 +93 92 02 01 93 82 F2 FF 33 73 53 00 93 96 06 01 +6F 00 C0 01 73 90 F5 3B B7 02 00 01 9B 82 F2 FF +33 73 53 00 93 96 86 01 6F 00 40 00 33 63 D3 00 +73 10 33 3A 6F 00 40 09 93 02 00 00 63 06 57 08 +93 02 80 00 E3 06 57 D4 93 02 00 01 E3 08 57 D2 +93 02 80 01 E3 04 57 D2 13 05 10 00 6F 00 C0 06 +63 06 A0 00 73 10 65 30 6F 00 00 06 73 50 60 30 +6F 00 80 05 93 0E 00 00 E3 86 D8 9F 93 0E 10 00 +E3 8C D8 A3 93 0E 80 00 E3 88 D8 FB 93 0E 90 00 +E3 88 D8 C1 93 0E A0 00 E3 8C D8 C5 93 0E B0 00 +E3 80 D8 C9 93 0E C0 00 E3 8E D8 C9 93 0E D0 00 +E3 8C D8 CB 93 0E E0 00 E3 8A D8 C1 93 0E F0 00 +E3 80 D8 FB 6F 00 40 00 F3 2E 10 34 93 8E 4E 00 +73 90 1E 34 73 00 20 30 13 0A 1A 00 73 00 20 30 +67 80 00 00 6F 00 00 05 93 8F 1F 00 73 00 10 00 +6F F0 9F FD 13 04 14 00 F3 2E 10 34 93 8E 4E 00 +73 90 1E 34 73 00 20 30 73 24 20 34 93 02 20 00 +63 04 54 00 6F 00 40 0A 13 09 19 00 13 05 20 00 +97 02 00 00 93 82 42 08 73 90 12 34 6F 00 40 00 +73 00 20 30 13 05 00 00 93 05 00 00 37 06 04 00 +93 06 F0 01 13 07 80 01 93 08 80 00 73 00 00 00 +13 04 00 00 13 05 10 00 93 08 F0 00 73 00 00 00 +B7 52 55 55 9B 82 52 55 37 53 55 55 1B 03 53 55 +F3 22 00 B0 63 82 62 04 63 10 04 04 13 00 00 00 +6F 00 80 04 13 05 00 00 93 08 F0 00 73 00 00 00 +B7 52 55 55 9B 82 52 55 37 53 55 55 1B 03 53 55 +F3 22 00 B0 63 9A 62 00 63 18 04 00 13 00 00 00 +6F 00 80 01 63 1A 30 00 13 95 11 00 63 00 05 00 +13 65 15 00 73 00 00 00 13 05 10 00 73 00 00 00 +73 00 10 00 73 10 00 C0 +@800030D8 +41 73 73 65 72 74 69 6F 6E 20 66 61 69 6C 65 64 +3A 20 61 64 64 72 20 3E 3D 20 28 31 55 4C 20 3C +3C 20 31 32 29 20 26 26 20 61 64 64 72 20 3C 20 +36 33 20 2A 20 28 31 55 4C 20 3C 3C 20 31 32 29 +0A 00 00 00 00 00 00 00 41 73 73 65 72 74 69 6F +6E 20 66 61 69 6C 65 64 3A 20 21 28 70 74 5B 33 +5D 5B 61 64 64 72 2F 28 31 55 4C 20 3C 3C 20 31 +32 29 5D 20 26 20 30 78 30 38 30 29 20 26 26 20 +63 61 75 73 65 20 3D 3D 20 30 78 66 0A 00 00 00 +41 73 73 65 72 74 69 6F 6E 20 66 61 69 6C 65 64 +3A 20 6E 6F 64 65 0A 00 41 73 73 65 72 74 69 6F +6E 20 66 61 69 6C 65 64 3A 20 75 73 65 72 5F 6D +61 70 70 69 6E 67 5B 61 64 64 72 2F 28 31 55 4C +20 3C 3C 20 31 32 29 5D 2E 61 64 64 72 20 3D 3D +20 30 0A 00 00 00 00 00 41 73 73 65 72 74 69 6F +6E 20 66 61 69 6C 65 64 3A 20 21 22 69 6C 6C 65 +67 61 6C 20 69 6E 73 74 72 75 63 74 69 6F 6E 22 +0A 00 00 00 00 00 00 00 41 73 73 65 72 74 69 6F +6E 20 66 61 69 6C 65 64 3A 20 70 74 5B 33 5D 5B +61 64 64 72 2F 28 31 55 4C 20 3C 3C 20 31 32 29 +5D 20 26 20 30 78 30 34 30 0A 00 00 00 00 00 00 +41 73 73 65 72 74 69 6F 6E 20 66 61 69 6C 65 64 +3A 20 70 74 5B 33 5D 5B 61 64 64 72 2F 28 31 55 +4C 20 3C 3C 20 31 32 29 5D 20 26 20 30 78 30 38 +30 0A 00 00 00 00 00 00 41 73 73 65 72 74 69 6F +6E 20 66 61 69 6C 65 64 3A 20 74 66 2D 3E 65 70 +63 20 25 20 34 20 3D 3D 20 30 0A 00 00 00 00 00 +41 73 73 65 72 74 69 6F 6E 20 66 61 69 6C 65 64 +3A 20 21 22 75 6E 65 78 70 65 63 74 65 64 20 65 +78 63 65 70 74 69 6F 6E 22 0A 00 00 00 00 00 00 +41 73 73 65 72 74 69 6F 6E 20 66 61 69 6C 65 64 +3A 20 21 22 75 6E 73 75 70 70 6F 72 74 65 64 20 +73 61 74 70 20 6D 6F 64 65 22 0A 00 diff --git a/test/priv_sec_testsuite/tests/rv64ui/Makefrag b/test/priv_sec_testsuite/tests/rv64ui/Makefrag index fcd7dfe..c8e161b 100644 --- a/test/priv_sec_testsuite/tests/rv64ui/Makefrag +++ b/test/priv_sec_testsuite/tests/rv64ui/Makefrag @@ -8,6 +8,7 @@ rv64ui_sc_tests = \ test2 \ test3 \ test4 \ + test5 \ rv64ui_p_tests = $(addprefix rv64ui-p-, $(rv64ui_sc_tests)) rv64ui_v_tests = $(addprefix rv64ui-v-, $(rv64ui_sc_tests)) diff --git a/test/priv_sec_testsuite/tests/rv64ui/test4.S b/test/priv_sec_testsuite/tests/rv64ui/test4.S index 3335f63..13c704a 100644 --- a/test/priv_sec_testsuite/tests/rv64ui/test4.S +++ b/test/priv_sec_testsuite/tests/rv64ui/test4.S @@ -9,9 +9,9 @@ #include "pmp.S" ###################################################################### -# Test 3: machine mode access fault +# Test 4: machine mode access fault # -# Checks MPRV mstatus bit and PMP.LOCK to provoque access fault +# Checks machine mode experience access fault on MPRV or locked region # # x31 is the error status register to trigger the testbench status # when encounter a problem during the testcase diff --git a/test/priv_sec_testsuite/tests/rv64ui/test5.S b/test/priv_sec_testsuite/tests/rv64ui/test5.S new file mode 100644 index 0000000..b4845db --- /dev/null +++ b/test/priv_sec_testsuite/tests/rv64ui/test5.S @@ -0,0 +1,163 @@ +###################################################################### +# distributed under the mit license +# https://opensource.org/licenses/mit-license.php +###################################################################### + +#include "riscv_test.h" +#include "test_macros.h" +#include "pmp_service.S" +#include "pmp.S" + +###################################################################### +# Test 5: mcounter access +# +# Checks user mode can access or not based in MCOUNTEREN setup +# +# x31 is the error status register to trigger the testbench status +# when encounter a problem during the testcase +###################################################################### + +###################################################################### +# Defines / Constants +###################################################################### + +# Machine interrupt enable (MSTATUS) +.equ MPIE_ON, 0x00000080 +.equ MPIE_OFF, 0xFFFFFFF7 +# Machine external interrupt enable (MIE) +.equ MEIE_ON, 0x00000800 +.equ MEIE_OFF, 0xFFFFF7FF + +.equ NOP_INST, 0x00000013 + +RVTEST_RV64U +RVTEST_CODE_BEGIN + +j TEST + + +################################# +# Not supported for the moment +################################# +ECALL_SUPERVISOR_MODE: + add x31, x31, 1 + ebreak + +################################# +# No service for machine-mode +################################# +ECALL_MACHINE_MODE: + j RET_ECALL + + +################################# +# +# Services +# +################################# + +# Trap for illegal / malformed / unsupported instruction +ILLEGAL_INSTRUCTION: + add s0, s0, 1 + # Increment PC value to return next instruction + csrr t4, mepc + add t4, t4, 4 + csrw mepc, t4 + mret + + +EXP_SERVICE: + csrr s0, mcause + li t0, CAUSE_ILLEGAL_INSTRUCTION + beq s0, t0, EXP_INST_FAULT + j fail + +EXP_INST_FAULT: + // increment error + addi s2, s2, 1 + li a0, CAUSE_ILLEGAL_INSTRUCTION + la t0, TEST2_CHECK + csrw mepc, t0 + j EXP_MRET + +EXP_MRET: + mret + + +################################################## +# +# Testcases +# +################################################## + +TEST: + +// Configure a NAPOT 256 KB for code +TEST_SETUP: + li a0, 0 // pmp number + li a1, 0 // base address + li a2, S256K // size + li a3, NAPOT_RWX // permissions + li a4, NAPOT // type + li a7, SVC_SETUP + ecall + + # Reset error flag + li s0, 0 + +// Check user mode can access the IR TM CY counters +TEST1_SETUP: + // Enable access + li a0, 1 + li a7, SVC_MCOUNTEREN + ecall + +// Read CY (allowed) +TEST1: + // check data is read + li t0, 0x55555555 + li t1, 0x55555555 + csrr t0, mcycle + beq t0, t1, fail + // check it didn't experience an illegal instruction + bne s0, zero, fail + +TEST1_TEARDOWN: + nop + j pass + +// Check user mode can access the IR TM CY counters +TEST2_SETUP: + // Enable access + li a0, 0 + li a7, SVC_MCOUNTEREN + ecall + +// Read CY (allowed) +TEST2: + // check data is read + li t0, 0x55555555 + li t1, 0x55555555 + csrr t0, mcycle +TEST2_CHECK: + bne t0, t1, fail + // check it didn't experience an illegal instruction + bne s0, zero, fail + +TEST2_TEARDOWN: + nop + j pass + + + +TEST_PASSFAIL + +RVTEST_CODE_END + +.data + +RVTEST_DATA_BEGIN + +TEST_DATA + +RVTEST_DATA_END