diff --git a/nemu/Kconfig b/nemu/Kconfig index 85074bd..5816143 100644 --- a/nemu/Kconfig +++ b/nemu/Kconfig @@ -180,7 +180,7 @@ config ITRACE_BUFFER default 10 config MTRACE - depends on TRACE && TARGET_NATIVE_ELF && ENGINE_INTERPRETER + depends on TRACE bool "Enable memory tracing" default n diff --git a/nemu/src/cpu/difftest/ref.c b/nemu/src/cpu/difftest/ref.c index 7d59b4a..3f44732 100644 --- a/nemu/src/cpu/difftest/ref.c +++ b/nemu/src/cpu/difftest/ref.c @@ -25,7 +25,7 @@ __EXPORT void difftest_memcpy(paddr_t addr, void *buf, size_t n, if (direction == DIFFTEST_TO_REF) { memcpy(guest_to_host(addr), buf, n); } else { - assert(0); + memcpy(buf, guest_to_host(addr), n); } } diff --git a/npc/.gitignore b/npc/.gitignore index e0793d8..5a4f7bc 100644 --- a/npc/.gitignore +++ b/npc/.gitignore @@ -16,3 +16,4 @@ hs_err_pid* .direnv/ compile_commands.json +*.vcd diff --git a/npc/CMakeLists.txt b/npc/CMakeLists.txt index bcd356b..bb6cd95 100644 --- a/npc/CMakeLists.txt +++ b/npc/CMakeLists.txt @@ -10,10 +10,10 @@ enable_testing() list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) # -- Build options -option(BUILD_USE_BLOOP "Whether to use bloop to speed up elaborate" ON) +option(BUILD_USE_BLOOP "Whether to use bloop to speed up elaborate" OFF) option(BUILD_SIM_TARGET "Whether to build verilator simulation binary" ON) cmake_dependent_option(BUILD_SIM_NVBOARD_TARGET "Whether to build nvboard target" OFF "BUILD_SIM_TARGET" OFF) -option(ENABLE_YSYX_GIT_TRACKER "Ysyx tracker support" OFF) +option(ENABLE_YSYX_GIT_TRACKER "Ysyx tracker support" ON) set(TOPMODULE "Flow" CACHE STRING "Topmodule name in chisel") set(DIFFTEST_LIB "" CACHE STRING "Dynamic library file used as difftest reference") @@ -34,8 +34,6 @@ if(BUILD_SIM_NVBOARD_TARGET) find_package(SDL2_image REQUIRED) endif() find_package(CLI11 CONFIG REQUIRED) -# TODO: Not required -find_package(LLVM CONFIG REQUIRED) option(ENABLE_SDB "Enable simple debugger" ON) @@ -47,14 +45,11 @@ find_path(NVBOARD_INCLUDE_DIR NAMES nvboard.h) set(SCALA_CORE "${CMAKE_CURRENT_SOURCE_DIR}/core") set(CHISEL_MODULE_CLASS "${CMAKE_PROJECT_NAME}.${TOPMODULE}") -# Verilog files are generted in CHISEL_OUTPUT_TMP_DIR and copy to -# CHISEL_OUTPUT_DIR if content changes set(CHISEL_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/${TOPMODULE}/vsrc) -set(CHISEL_OUTPUT_TMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/${TOPMODULE}/vsrc_tmp) set(CHISEL_OUTPUT_VERILATOR_CONF ${CHISEL_OUTPUT_DIR}/conf.vlt) set(CHISEL_OUTPUT_TOPMODULE ${CHISEL_OUTPUT_DIR}/${TOPMODULE}.sv) -set(CHISEL_EMIT_ARGS "--target-dir ${CHISEL_OUTPUT_TMP_DIR}") +set(CHISEL_EMIT_ARGS "--target-dir ${CHISEL_OUTPUT_DIR}") # -- Build NVBoard executable if(BUILD_SIM_NVBOARD_TARGET) @@ -69,15 +64,9 @@ add_subdirectory(csrc) # -- Add build tracking if(ENABLE_YSYX_GIT_TRACKER) - add_custom_command( - TARGET V${TOPMODULE}_nvboard PRE_BUILD - COMMAND ${CMAKE_SOURCE_DIR}/../git_commit.sh "build_${CMAKE_PROJECT_NAME}_V${TOPMODULE}_nvboard" - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/.. - ) - - add_custom_command( - TARGET V${TOPMODULE} PRE_BUILD - COMMAND ${CMAKE_SOURCE_DIR}/../git_commit.sh "build_${CMAKE_PROJECT_NAME}_V${TOPMODULE}" - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/.. + add_custom_target( + ysyx_git_tracer ALL + COMMAND ${CMAKE_SOURCE_DIR}/../git_commit.sh "build_${CMAKE_PROJECT_NAME}_V${TOPMODULE}" + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/.. ) endif() diff --git a/npc/LICENSE b/npc/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/npc/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/npc/cmake/ChiselBuild.cmake b/npc/cmake/ChiselBuild.cmake index aa830f7..789b476 100644 --- a/npc/cmake/ChiselBuild.cmake +++ b/npc/cmake/ChiselBuild.cmake @@ -3,6 +3,7 @@ # NOTE: Must reconfigure if we add new files in SCALA_CORE directory file(GLOB_RECURSE SCALA_CORE_SOURCES "${SCALA_CORE}/src/main/scala/*.scala") file(GLOB_RECURSE SCALA_CORE_RESOURCES "${SCALA_CORE}/src/main/resources/*") +message(STATUS "Found scala source file: ${SCALA_CORE_SOURCES}") set(CHISEL_DEPENDENCY ${SCALA_CORE_SOURCES} ${SCALA_CORE_RESOURCES} ${SCALA_CORE}/build.sbt) if(BUILD_USE_BLOOP) @@ -18,9 +19,8 @@ if(BUILD_USE_BLOOP) string(REPLACE " " ";" CHISEL_EMIT_ARGS_LIST ${CHISEL_EMIT_ARGS}) list(TRANSFORM CHISEL_EMIT_ARGS_LIST PREPEND "--args;") add_custom_command( - OUTPUT ${CHISEL_OUTPUT_TOPMODULE} - COMMAND bloop run root ${CHISEL_EMIT_ARGS_LIST} - COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CHISEL_OUTPUT_TMP_DIR} ${CHISEL_OUTPUT_DIR} + OUTPUT ${CHISEL_OUTPUT_TOPMODULE} ${CHISEL_OUTPUT_VERILATOR_CONF} + COMMAND bloop run --no-color root ${CHISEL_EMIT_ARGS_LIST} WORKING_DIRECTORY ${SCALA_CORE} DEPENDS ${CHISEL_DEPENDENCY} COMMAND_EXPAND_LISTS @@ -35,11 +35,10 @@ else() set(CHISEL_TARGET sbt_${TOPMODULE}) set(CHISEL_TEST_TARGET sbt_${TOPMODULE}_test) add_custom_command( - OUTPUT ${CHISEL_OUTPUT_TOPMODULE} + OUTPUT ${CHISEL_OUTPUT_TOPMODULE} ${CHISEL_OUTPUT_VERILATOR_CONF} COMMAND sbt "run ${CHISEL_EMIT_ARGS}" - COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CHISEL_OUTPUT_TMP_DIR} ${CHISEL_OUTPUT_DIR} WORKING_DIRECTORY ${SCALA_CORE} - # DEPENDS ${CHISEL_DEPENDENCY} test.scala + DEPENDS ${CHISEL_DEPENDENCY} VERBATIM COMMENT "Run sbt from CMake" ) @@ -50,13 +49,10 @@ else() ) endif() -if(NOT EXISTS ${CHISEL_OUTPUT_DIR}) +if(NOT EXISTS ${CHISEL_OUTPUT_TOPMODULE}) # Probably cold build, generate verilog at configure time to produce top module file execute_process( COMMAND sbt "run ${CHISEL_EMIT_ARGS}" WORKING_DIRECTORY ${SCALA_CORE} ) - execute_process( - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CHISEL_OUTPUT_TMP_DIR} ${CHISEL_OUTPUT_DIR} - ) endif() diff --git a/npc/core/project/build.properties b/npc/core/project/build.properties new file mode 100644 index 0000000..04267b1 --- /dev/null +++ b/npc/core/project/build.properties @@ -0,0 +1 @@ +sbt.version=1.9.9 diff --git a/npc/core/project/plugin.sbt b/npc/core/project/plugin.sbt new file mode 100644 index 0000000..0c0f704 --- /dev/null +++ b/npc/core/project/plugin.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.2") diff --git a/npc/core/src/main/resources/RamDpi.v b/npc/core/src/main/resources/RamDpi.v index c9f8b7c..0f4308b 100644 --- a/npc/core/src/main/resources/RamDpi.v +++ b/npc/core/src/main/resources/RamDpi.v @@ -2,6 +2,8 @@ import "DPI-C" function int pmem_read(input int addr); import "DPI-C" function void pmem_write(input int waddr, input int wdata, input byte wmask); module RamDpi ( + input clock, + input reset, input writeEnable, input valid, input [31:0] writeAddr, diff --git a/npc/core/src/main/scala/components/ALU.scala b/npc/core/src/main/scala/components/ALU.scala index 0c22b15..44e9c14 100644 --- a/npc/core/src/main/scala/components/ALU.scala +++ b/npc/core/src/main/scala/components/ALU.scala @@ -6,13 +6,13 @@ import shapeless.{HNil, ::} class ALUControlInterface extends Bundle { object OpSelect extends ChiselEnum { - val aOpAdd, aOpSub, aOpNot, aOpAnd, aOpOr, aOpXor, aOpSlt, aOpSll, aOpSrl, aOpSra = Value + val aOpAdd, aOpSub, aOpNot, aOpAnd, aOpOr, aOpXor, aOpSlt, aOpSltu, aOpSll, aOpSrl, aOpSra = Value } object SrcASelect extends ChiselEnum { val aSrcARs1, aSrcAPc, aSrcAZero = Value } object SrcBSelect extends ChiselEnum { - val aSrcBRs2, aSrcBImmI, aSrcBImmJ, aSrcBImmB, aSrcBImmS = Value + val aSrcBRs2, aSrcBImmI, aSrcBImmJ, aSrcBImmS, aSrcBImmU = Value } val op = Input(OpSelect()) val srcASelect = Input(SrcASelect()) @@ -45,7 +45,8 @@ class ALU[T <: UInt](tpe: T) extends Module { val not = ~a val or = a | b val xor = a ^ b - val slt = a < b + val slt = a.asSInt < b.asSInt + val sltu = a < b val sll = a << b(log2Ceil(tpe.getWidth), 0) val srl = a >> b(log2Ceil(tpe.getWidth), 0) val sra = a.asSInt >> b(log2Ceil(tpe.getWidth), 0) @@ -61,6 +62,7 @@ class ALU[T <: UInt](tpe: T) extends Module { aOpOr -> or, aOpXor -> xor, aOpSlt -> slt, + aOpSltu -> sltu, aOpSll -> sll, aOpSrl -> srl, aOpSra -> sra.asUInt diff --git a/npc/core/src/main/scala/components/Mem.scala b/npc/core/src/main/scala/components/Mem.scala index 7562730..24f9927 100644 --- a/npc/core/src/main/scala/components/Mem.scala +++ b/npc/core/src/main/scala/components/Mem.scala @@ -23,6 +23,8 @@ class RamControlInterface(addrWidth: Int) extends Bundle { * We need a way to merge two bundles together */ class RamInterface[T <: Data](tpe: T, addrWidth: Int) extends RamControlInterface(addrWidth) { + val clock = Input(Clock()) + val reset = Input(Reset()) val writeAddr = Input(UInt(addrWidth.W)) val writeData = Input(tpe) val readAddr = Input(UInt(addrWidth.W)) diff --git a/npc/core/src/main/scala/top/FlowMain.scala b/npc/core/src/main/scala/top/FlowMain.scala index 899783c..b6aa888 100644 --- a/npc/core/src/main/scala/top/FlowMain.scala +++ b/npc/core/src/main/scala/top/FlowMain.scala @@ -130,6 +130,16 @@ class Control(width: Int) extends RawModule { // Exe | op :: srcASelect :: srcBSelect :: signExt :: HNil // Mem | valid :: writeMask :: writeEnable :: HNil + (lui , (r(true.B) :: r(rAluOut) :: + r(false.B) :: r(pStaticNpc):: + r(aOpAdd) :: r(aSrcAZero) :: r(aSrcBImmU) :: r(false.B) :: + r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)), + + (auipc , (r(true.B) :: r(rAluOut) :: + r(false.B) :: r(pStaticNpc):: + r(aOpAdd) :: r(aSrcAPc) :: r(aSrcBImmU) :: r(false.B) :: + r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)), + // ---- Control Transfer Instructions ---- (jal , (r(true.B) :: r(rNpc) :: r(false.B) :: r(pExeOut) :: @@ -138,37 +148,37 @@ class Control(width: Int) extends RawModule { (jalr , (r(true.B) :: r(rNpc) :: r(false.B) :: r(pExeOut) :: - r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmJ) :: r(false.B) :: + r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: r(false.B) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)), (beq , (r(false.B) :: l(WriteSelect) :: - r(true.B) :: r(pExeOut) :: - r(aOpSlt) :: r(aSrcAPc) :: r(aSrcBImmB) :: l(Bool()) :: + r(true.B) :: r(pStaticNpc) :: + r(aOpSlt) :: r(aSrcARs1) :: r(aSrcBRs2) :: l(Bool()) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)), (bne , (r(false.B) :: l(WriteSelect) :: - r(true.B) :: r(pExeOut) :: - r(aOpSlt) :: r(aSrcAPc) :: r(aSrcBImmB) :: l(Bool()) :: + r(true.B) :: r(pStaticNpc) :: + r(aOpSlt) :: r(aSrcARs1) :: r(aSrcBRs2) :: l(Bool()) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)), (blt , (r(false.B) :: l(WriteSelect) :: - r(true.B) :: r(pExeOut) :: - r(aOpSlt) :: r(aSrcAPc) :: r(aSrcBImmB) :: r(true.B) :: + r(true.B) :: r(pStaticNpc) :: + r(aOpSlt) :: r(aSrcARs1) :: r(aSrcBRs2) :: r(true.B) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)), (bge , (r(false.B) :: l(WriteSelect) :: - r(true.B) :: r(pExeOut) :: - r(aOpSlt) :: r(aSrcAPc) :: r(aSrcBImmB) :: r(true.B) :: + r(true.B) :: r(pStaticNpc) :: + r(aOpSlt) :: r(aSrcARs1) :: r(aSrcBRs2) :: r(true.B) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)), (bltu , (r(false.B) :: l(WriteSelect):: - r(true.B) :: r(pExeOut) :: - r(aOpSlt) :: r(aSrcAPc) :: r(aSrcBImmB) :: r(false.B) :: + r(true.B) :: r(pStaticNpc) :: + r(aOpSltu) :: r(aSrcARs1) :: r(aSrcBRs2) :: r(false.B) :: r(false.B) :: l(UInt(4.W)) :: r(false.B) :: HNil)), (bgeu , (r(false.B) :: l(WriteSelect):: - r(true.B) :: r(pExeOut) :: - r(aOpSlt) :: r(aSrcAPc) :: r(aSrcBImmB) :: r(false.B) :: + r(true.B) :: r(pStaticNpc) :: + r(aOpSltu) :: r(aSrcARs1) :: r(aSrcBRs2) :: r(false.B) :: r(false.B) :: l(UInt(4.W)) :: r(false.B) :: HNil)), // ---- Memory Access Instructions ---- @@ -176,39 +186,49 @@ class Control(width: Int) extends RawModule { (lb , (r(true.B) :: r(rMemOut) :: r(false.B) :: r(pStaticNpc) :: r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) :: - r(true.B) :: l(UInt(4.W)) :: r(false.B) :: HNil)), + r(true.B) :: r(1.U(4.W)) :: r(false.B) :: HNil)), - (lh , (r(true.B) :: r(rMemOut) :: + (lbu , (r(true.B) :: r(rMemOut) :: r(false.B) :: r(pStaticNpc) :: r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) :: - r(true.B) :: l(UInt(4.W)) :: r(false.B) :: HNil)), + r(true.B) :: r(0.U(4.W)) :: r(false.B) :: HNil)), + + (lh , (r(true.B) :: r(rMemOut) :: + r(false.B) :: r(pStaticNpc) :: + r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) :: + r(true.B) :: r(3.U(4.W)) :: r(false.B) :: HNil)), + + (lhu , (r(true.B) :: r(rMemOut) :: + r(false.B) :: r(pStaticNpc) :: + r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) :: + r(true.B) :: r(2.U(4.W)) :: r(false.B) :: HNil)), (lw , (r(true.B) :: r(rMemOut) :: r(false.B) :: r(pStaticNpc) :: r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) :: - r(true.B) :: l(UInt(4.W)) :: r(false.B) :: HNil)), + r(true.B) :: r(14.U(4.W)) :: r(false.B) :: HNil)), (sb , (r(false.B) :: l(WriteSelect):: r(false.B) :: r(pStaticNpc) :: - r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) :: - r(true.B) :: r(1.U(4.W)) :: r(false.B) :: HNil)), + r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmS) :: l(Bool()) :: + r(true.B) :: r(1.U(4.W)) :: r(true.B) :: HNil)), (sh , (r(false.B) :: l(WriteSelect):: r(false.B) :: r(pStaticNpc) :: - r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) :: - r(true.B) :: r(3.U(4.W)) :: r(false.B) :: HNil)), + r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmS) :: l(Bool()) :: + r(true.B) :: r(3.U(4.W)) :: r(true.B) :: HNil)), (sw , (r(false.B) :: l(WriteSelect):: r(false.B) :: r(pStaticNpc) :: - r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) :: - r(true.B) :: r(15.U(4.W)) :: r(false.B) :: HNil)), + r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmS) :: l(Bool()) :: + r(true.B) :: r(15.U(4.W)) :: r(true.B) :: HNil)), // ---- Integer Computational Instructions --- (addi , (r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc) :: r(aOpAdd) :: r(aSrcARs1) :: r(aSrcBImmI) :: l(Bool()) :: - r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)), + r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)), (slti , (r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc) :: @@ -217,7 +237,7 @@ class Control(width: Int) extends RawModule { (sltiu , (r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc) :: - r(aOpSlt) :: r(aSrcARs1) :: r(aSrcBImmI) :: r(false.B) :: + r(aOpSltu) :: r(aSrcARs1) :: r(aSrcBImmI) :: r(false.B) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)), (xori , (r(true.B) :: r(rAluOut) :: @@ -272,7 +292,7 @@ class Control(width: Int) extends RawModule { (sltu , (r(true.B) :: r(rAluOut) :: r(false.B) :: r(pStaticNpc) :: - r(aOpSlt) :: r(aSrcARs1) :: r(aSrcBRs2) :: r(false.B) :: + r(aOpSltu) :: r(aSrcARs1) :: r(aSrcBRs2) :: r(false.B) :: r(false.B) :: l(UInt(4.W)):: r(false.B) :: HNil)), (xor , (r(true.B) :: r(rAluOut) :: @@ -318,8 +338,6 @@ class Control(width: Int) extends RawModule { .foreach({ case (src, dst) => dst.toOption.get := src.asTypeOf(dst.toOption.get) }) - - pc.useImmB := DontCare } import flow.components.{RegisterFile, ProgramCounter, ALU, RamDpi} @@ -345,37 +363,59 @@ class Flow extends Module { val npc = Wire(dataType) npc := pc.out + 4.U pc.in.exeOut := alu.out.result - pc.in.immB := Cat(Fill(20, inst(31)), inst(7), inst(30, 25), inst(11, 8), inst(0)) + pc.in.immB := Cat(Fill(20, inst(31)), inst(7), inst(30, 25), inst(11, 8), 0.U(1.W)) control.inst := inst reg.control <> control.reg // FIXME: Probably optimizable with bulk connection pc.control <> control.pc + pc.control.useImmB := control.pc.useImmB alu.control <> control.alu val branchUseSlt = Wire(Bool()) val branchInvertResult = Wire(Bool()) branchUseSlt := inst(14) branchInvertResult := inst(12) val _branchResult = Mux(branchUseSlt, alu.out.result(0), alu.out.eq) - val branchResult = Mux(branchInvertResult, _branchResult, !_branchResult) - pc.control.useImmB := control.pc.useImmB && _branchResult + val branchResult = Mux(branchInvertResult, !_branchResult, _branchResult) + pc.control.useImmB := control.pc.useImmB && branchResult + // printf(cf"_branchResult = ${_branchResult}, branchResult = ${branchResult}\n") + // printf(cf"pcin.useImmB = ${pc.control.useImmB}, control.out.useImmB = ${control.pc.useImmB} \n") import control.reg.WriteSelect._ reg.in.writeData(lit(rAluOut)) := alu.out.result - // TODO: Read address in load command goes here - reg.in.writeData(lit(rMemOut)) := ram.io.readData + val maskedData = ram.io.readData & Cat( + Fill(8, ram.io.writeMask(3)), + Fill(8, ram.io.writeMask(2)), + Fill(8, ram.io.writeMask(1)), + "b11111111".U) + + val doSignExt = control.ram.writeMask(0) + val signExt16 = control.ram.writeMask(1) + when(!doSignExt) { + reg.in.writeData(lit(rMemOut)) := maskedData + // printf(cf"!doSignExt\n") + }.elsewhen(signExt16) { + reg.in.writeData(lit(rMemOut)) := Cat(Fill(16, maskedData(15)), maskedData(15, 0)) + // printf(cf"elsewhen\n") + }.otherwise { + reg.in.writeData(lit(rMemOut)) := Cat(Fill(24, maskedData(7)), maskedData(7, 0)) + // printf(cf"otherwise\n") + } + // printf(cf"maskedData = ${maskedData}, writeData = ${reg.in.writeData(lit(rMemOut))}\n") reg.in.writeData(lit(rNpc)) := npc reg.in.writeAddr := inst(11, 7) reg.in.rs(0) := inst(19, 15) // rs1 reg.in.rs(1) := inst(24, 20) // rs2 - // TODO: Memory write goes here + // TODO: Bulk connection here + ram.io.clock := clock + ram.io.reset := reset ram.io.writeAddr := alu.out.result ram.io.writeData := reg.out.src(1) ram.io.writeMask := control.ram.writeMask ram.io.writeEnable := control.ram.writeEnable - ram.io.valid := true.B + ram.io.valid := control.ram.valid ram.io.readAddr := alu.out.result import control.alu.SrcASelect._ @@ -385,11 +425,12 @@ class Flow extends Module { alu.in.a(lit(aSrcAZero)) := 0.U alu.in.b(lit(aSrcBRs2)) := reg.out.src(1) - alu.in.b(lit(aSrcBImmI)) := inst(31, 20).pad(aSrcBImmI.getWidth) + // alu.in.b(lit(aSrcBImmI)) := inst(31, 20).pad(aSrcBImmI.getWidth) + alu.in.b(lit(aSrcBImmI)) := Cat(Fill(20, inst(31)), inst(31, 20)) alu.in.b(lit(aSrcBImmJ)) := Cat(Fill(12, inst(31)), inst(19, 12), inst(20), inst(30, 25), inst(24, 21), 0.U(1.W)) - alu.in.b(lit(aSrcBImmB)) := Cat(Fill(20, inst(31)), inst(7), inst(30, 25), inst(11, 8), inst(0)) - alu.in.b(lit(aSrcBImmS)) := Cat(inst(31), inst(19, 12), inst(20), inst(30, 25), inst(24, 21), 0.U(1.W)).pad(aSrcBImmS.getWidth) + alu.in.b(lit(aSrcBImmS)) := Cat(Fill(20, inst(31)), inst(31), inst(30, 25), inst(11, 8), inst(7)) + alu.in.b(lit(aSrcBImmU)) := Cat(inst(31, 12), 0.U(12.W)) - Trace.traceName(pc.out); + Trace.traceName(pc.out) dontTouch(control.out) } diff --git a/npc/csrc/Flow/CMakeLists.txt b/npc/csrc/Flow/CMakeLists.txt index ad8d2e9..16aaef1 100644 --- a/npc/csrc/Flow/CMakeLists.txt +++ b/npc/csrc/Flow/CMakeLists.txt @@ -1,8 +1,8 @@ include(ChiselBuild) add_executable(V${TOPMODULE} config.cpp main.cpp) -target_link_libraries(V${TOPMODULE} PRIVATE disasm sdb) +target_link_libraries(V${TOPMODULE} PRIVATE sdb) -verilate(V${TOPMODULE} TRACE COVERAGE THREADS +verilate(V${TOPMODULE} TRACE THREADS TOP_MODULE ${TOPMODULE} PREFIX V${TOPMODULE} SOURCES ${CHISEL_OUTPUT_TOPMODULE} ${CHISEL_OUTPUT_VERILATOR_CONF} diff --git a/npc/csrc/Flow/config.cpp b/npc/csrc/Flow/config.cpp index 4d8338b..fd49141 100644 --- a/npc/csrc/Flow/config.cpp +++ b/npc/csrc/Flow/config.cpp @@ -7,18 +7,16 @@ void Config::cli_parse(int argc, char **argv) { ->check(CLI::ExistingFile); app.add_flag("!--no-bin", memory_file_binary, "Memory file is in text format"); - app.add_flag("--trace", do_trace, "Enable tracing"); - app.add_option("--wav", wavefile, "output .vcd file path") - ->check([=](const std::string &) { - if (!do_trace) - throw CLI::ValidationError( - "dependency", "You must turn on trace before specify wave file"); - return std::string(); - }); + app.add_option("--wav", wavefile, "output .vcd file path"); app.add_option("-t", max_sim_time, "Max simulation timestep"); app.add_option("--diff-lib", lib_ref, "Dynamic library file of difftest reference") ->check(CLI::ExistingFile); + app.add_flag("--mtrace", do_mtrace, "Enable memory tracing"); + app.add_option( + "--mtrace-range", mtrace_ranges, + "Specify memory tracing range (default: 0x80000000-0x8fffffff)") + ->delimiter(','); try { app.parse(argc, argv); diff --git a/npc/csrc/Flow/config.hpp b/npc/csrc/Flow/config.hpp deleted file mode 100644 index 9f5873c..0000000 --- a/npc/csrc/Flow/config.hpp +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef _NPC_CONFIG_H_ -#define _NPC_CONFIG_H_ -#include -#include -#include -#include - -struct Config { - std::filesystem::path memory_file; - uint64_t max_sim_time = 1000; - bool memory_file_binary = {true}; - bool do_trace{false}; - std::filesystem::path wavefile; - std::filesystem::path lib_ref; - void cli_parse(int argc, char **argv); -}; - -extern Config config; - -#endif \ No newline at end of file diff --git a/npc/csrc/Flow/main.cpp b/npc/csrc/Flow/main.cpp index b1c37c9..664db56 100644 --- a/npc/csrc/Flow/main.cpp +++ b/npc/csrc/Flow/main.cpp @@ -1,23 +1,35 @@ #include "VFlow___024root.h" -#include "config.hpp" -#include "disasm.hpp" -#include "vl_wrapper.hpp" -#include "vpi_user.h" -#include "vpi_wrapper.hpp" #include +#include #include #include -#include +#include +#include +#include #include +#include +#include #include +#include +#include +#include using VlModule = VlModuleInterfaceCommon; using Registers = _RegistersVPI; +// SDB::SDB sdb_dut; +using CPUState = CPUStateBase; +bool g_skip_memcheck = false; +CPUState npc_cpu; +VlModule *top; +Registers *regs; +vpiHandle pc = nullptr; + extern "C" { void *pmem_get() { - static auto pmem = new Memory(config.memory_file, - config.memory_file_binary); + static auto pmem = + new Memory(config.memory_file, config.memory_file_binary, + std::move(config.mtrace_ranges)); return pmem; } @@ -26,26 +38,33 @@ int pmem_read(int raddr) { auto mem = static_cast *>(pmem); // TODO: Do memory difftest at memory read and write to diagnose at a finer // granularity + if (config.do_mtrace) + mem->trace(raddr, true, regs->get_pc()); return mem->read(raddr); } void pmem_write(int waddr, int wdata, char wmask) { void *pmem = pmem_get(); auto mem = static_cast *>(pmem); + if (config.do_mtrace) + mem->trace((std::size_t)waddr, false, regs->get_pc(), wdata); return mem->write((std::size_t)waddr, wdata, wmask); } } -Disassembler d{"riscv32-pc-linux-gnu"}; +namespace NPC { +void npc_memcpy(paddr_t addr, void *buf, size_t sz, bool direction) { + if (direction == TRM_FROM_MACHINE) { + memcpy( + buf, + static_cast *>(pmem_get())->guest_to_host(addr), + sz); + } +}; -VlModule *top; -Registers *regs; -vpiHandle pc = nullptr; -void difftest_memcpy(paddr_t, void *, size_t, bool){}; +void npc_regcpy(void *p, bool direction) { -void difftest_regcpy(void *p, bool direction) { - - if (direction == DIFFTEST_FROM_REF) { + if (direction == TRM_FROM_MACHINE) { ((CPUState *)p)->pc = regs->get_pc(); for (int i = 0; i < 32; i++) { ((CPUState *)p)->reg[i] = (*regs)[i]; @@ -53,7 +72,7 @@ void difftest_regcpy(void *p, bool direction) { } } -void difftest_exec(uint64_t n) { +void npc_exec(uint64_t n) { while (n--) { for (int i = 0; i < 2; i++) { if (top->is_posedge()) { @@ -64,43 +83,61 @@ void difftest_exec(uint64_t n) { } } } -// std::cout << d.disassemble(top->rootp->Flow__DOT__pc__DOT__pc_reg, (uint8_t *)&top->rootp->Flow__DOT___ram_inst, 4) << std::endl; -void difftest_init(int port) { - // top = std::make_unique(config.do_trace, config.wavefile); - top = new VlModule{config.do_trace, config.wavefile}; +void npc_atexit(void) { + delete top; + delete regs; +} + +void npc_init(int port) { + top = new VlModule{config.wavefile}; regs = new Registers("TOP.Flow.reg_0.regFile_", "TOP.Flow.pc.out"); + atexit(npc_atexit); top->reset_eval(10); } -DifftestInterface dut_interface = DifftestInterface{ - &difftest_memcpy, &difftest_regcpy, &difftest_exec, &difftest_init}; +class DutTrmInterface : public TrmInterface { +public: + DutTrmInterface(memcpy_t f_memcpy, regcpy_t f_regcpy, exec_t f_exec, + init_t f_init, void *cpu_state) + : TrmInterface{f_memcpy, f_regcpy, f_exec, f_init, cpu_state} {} + word_t at(std::string name) const override { + return ((CPUState *)cpu_state)->at(name); + } + + word_t at(paddr_t addr) const override { + word_t buf; + this->memcpy(addr, &buf, sizeof(word_t), TRM_FROM_MACHINE); + return buf; + } + void print(std::ostream &os) const override {} +}; + +DutTrmInterface npc_interface = + DutTrmInterface{&npc_memcpy, &npc_regcpy, &npc_exec, &npc_init, &npc_cpu}; +}; // namespace NPC -SDB::SDB sdb_dut; extern "C" { word_t reg_str2val(const char *name, bool *success) { - return sdb_dut.reg_str2val(name, success); + return npc_cpu.reg_str2val(name, success); } } int main(int argc, char **argv, char **env) { config.cli_parse(argc, argv); - /* -- Difftest -- */ - std::filesystem::path ref{config.lib_ref}; - DifftestInterface ref_interface = DifftestInterface{ref}; + if (config.max_sim_time > 1) { + NPC::npc_interface.exec(config.max_sim_time / 2); + } else { + /* -- Difftest -- */ + std::filesystem::path ref{config.lib_ref}; + RefTrmInterface ref_interface{ref}; + DifftestTrmInterface diff_interface{NPC::npc_interface, ref_interface, + pmem_get(), 128 * 1024}; + SDB::SDB sdb_diff{diff_interface}; - Difftest> diff{dut_interface, ref_interface, - pmem_get(), 128}; - int t = 8; - sdb_dut.main_loop(); - while (t--) { - if (!diff.step(1)) { - uint32_t pc = regs->get_pc(); - uint32_t inst = pmem_read(pc); - std::cout << diff << d.disassemble(pc, (uint8_t *)&inst, 4) << std::endl; - return EXIT_FAILURE; - } + int t = 8; + sdb_diff.main_loop(); } return 0; diff --git a/npc/csrc/Flow/vl_wrapper.hpp b/npc/csrc/Flow/vl_wrapper.hpp deleted file mode 100644 index 4d42b55..0000000 --- a/npc/csrc/Flow/vl_wrapper.hpp +++ /dev/null @@ -1,65 +0,0 @@ -#ifndef _NPC_TRACER_H_ -#define _NPC_TRACER_H_ -#include -#include - -template class Tracer { - std::shared_ptr top; - std::unique_ptr m_trace; - uint64_t cycle = 0; - -public: - Tracer(T *top, std::filesystem::path wavefile) { - top = top; - Verilated::traceEverOn(true); - m_trace = std::make_unique(); - top->trace(m_trace.get(), 5); - m_trace->open(wavefile.c_str()); - } - ~Tracer() { m_trace->close(); } - - /** - * Dump signals to waveform file. Must be called once after every top->eval() - * call. - */ - void update() { m_trace->dump(cycle++); } -}; - -template class VlModuleInterfaceCommon : public T { - uint64_t sim_time = 0; - uint64_t posedge_cnt = 0; - std::unique_ptr> tracer; - -public: - VlModuleInterfaceCommon(bool do_trace, - std::filesystem::path wavefile = "waveform.vcd") { - if (do_trace) - tracer = std::make_unique>(this, wavefile); - } - void eval() { - if (this->is_posedge()) { - posedge_cnt++; - } - T::clock = !T::clock; - sim_time++; - T::eval(); - if (tracer) - tracer->update(); - } - void eval(int n) { - for (int i = 0; i < n; i++) { - this->eval(); - } - } - void reset_eval(int n) { - this->reset = 1; - this->eval(n); - this->reset = 0; - } - bool is_posedge() { - // Will be posedge when eval is called - return T::clock == 0; - } -}; - -#endif diff --git a/npc/include/components.hpp b/npc/include/components.hpp index fced1af..91847a7 100644 --- a/npc/include/components.hpp +++ b/npc/include/components.hpp @@ -1,23 +1,20 @@ #ifndef _NPC_COMPONENTS_H_ #define _NPC_COMPONENTS_H_ +#include "types.h" #include +#include +#include #include #include #include #include #include #include +#include #include #include - -const std::map riscv32_regs_by_name{ - {"$0", 0}, {"ra", 1}, {"sp", 2}, {"gp", 3}, {"tp", 4}, {"t0", 5}, - {"t1", 6}, {"t2", 7}, {"s0", 8}, {"s1", 9}, {"a0", 10}, {"a1", 11}, - {"a2", 12}, {"a3", 13}, {"a4", 14}, {"a5", 15}, {"a6", 16}, {"a7", 17}, - {"s2", 18}, {"s3", 19}, {"s4", 20}, {"s5", 21}, {"s6", 22}, {"s7", 23}, - {"s8", 24}, {"s9", 25}, {"s10", 26}, {"s11", 27}, {"t3", 28}, {"t4", 29}, - {"t5", 30}, {"t6", 31}}; +#include template class _RegistersBase { std::array regs; @@ -36,13 +33,6 @@ public: }; template class Memory { - std::size_t addr_to_index(std::size_t addr) { - if (addr < 0x80000000) { - return 0; - } - // Linear mapping - return (addr >> 2) - 0x20000000; - } uint32_t expand_bits(uint8_t bits) { uint32_t x = bits; x = (x | (x << 7) | (x << 14) | (x << 21)) & 0x01010101; @@ -53,7 +43,10 @@ template class Memory { public: std::array mem; - Memory(std::filesystem::path filepath, bool is_binary = true) { + std::vector> trace_ranges; + Memory(std::filesystem::path filepath, bool is_binary, + std::vector> &&trace_ranges) + : trace_ranges(std::move(trace_ranges)) { if (!std::filesystem::exists(filepath)) throw std::runtime_error("Memory file not found"); if (is_binary) { @@ -73,9 +66,9 @@ public: /** * Always reads and returns 4 bytes from the address raddr & ~0x3u. */ - T read(int raddr) { + T read(paddr_t raddr) { // printf("raddr: 0x%x\n", raddr); - return mem[addr_to_index((uint32_t)raddr)]; + return *(word_t *)guest_to_host(raddr); } /** * Always writes to the 4 bytes at the address `waddr` & ~0x3u. @@ -83,9 +76,44 @@ public: * For example, wmask = 0x3 means only the lowest 2 bytes are written, * and the other bytes in memory remain unchanged. */ - void write(int waddr, T wdata, char wmask) { + void write(paddr_t waddr, T wdata, char wmask) { // printf("waddr: 0x%x\n", waddr); - mem[addr_to_index((uint32_t)waddr)] = expand_bits(wmask) & wdata; + uint8_t *p_data = (uint8_t *)&wdata; + while (wmask & 0x1) { + memcpy(guest_to_host(waddr), p_data, 1); + waddr++; + p_data++; + wmask >>= 1; + } + } + void *guest_to_host(std::size_t addr) { + extern bool g_skip_memcheck; + if (g_skip_memcheck) { + return mem.data(); + } + if (addr < 0x80000000 || addr > 0x87ffffff) { + std::cerr << std::hex << "ACCESS " << addr << std::dec << std::endl; + throw std::runtime_error("Invalid memory access"); + } + // Linear mapping + return (uint8_t *)(mem.data() + (addr >> 2) - 0x20000000) + (addr & 0x3); + } + void trace(paddr_t addr, bool is_read, word_t pc = 0, word_t value = 0) { + for (auto &r : trace_ranges) { + if (r[0] <= addr && r[1] >= addr) { + std::stringstream os; + os << std::hex; + if (pc != 0) + os << "0x" << pc << " "; + if (is_read) + os << "[R] "; + else + os << "[W] " << value << " -> "; + os << "0x" << addr << std::dec << std::endl; + std::cout << os.rdbuf(); + break; + } + } } }; #endif diff --git a/npc/include/config.hpp b/npc/include/config.hpp index 9f5873c..de536b6 100644 --- a/npc/include/config.hpp +++ b/npc/include/config.hpp @@ -3,13 +3,17 @@ #include #include #include +#include #include +#include struct Config { std::filesystem::path memory_file; - uint64_t max_sim_time = 1000; + uint64_t max_sim_time = 0; bool memory_file_binary = {true}; - bool do_trace{false}; + bool do_mtrace{false}; + std::vector> mtrace_ranges{ + {0x80000000, 0x8ffffffff}}; std::filesystem::path wavefile; std::filesystem::path lib_ref; void cli_parse(int argc, char **argv); diff --git a/npc/include/difftest.hpp b/npc/include/difftest.hpp deleted file mode 100644 index 7349004..0000000 --- a/npc/include/difftest.hpp +++ /dev/null @@ -1,130 +0,0 @@ -#ifndef _DIFFTEST_DIFFTEST_H_ -#define _DIFFTEST_DIFFTEST_H_ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using paddr_t = uint32_t; -enum { DIFFTEST_FROM_REF, DIFFTEST_TO_REF }; - -struct DifftestInterface { - using memcpy_t = void (*)(paddr_t, void *, size_t, bool); - using regcpy_t = void (*)(void *, bool); - using exec_t = void (*)(uint64_t); - using init_t = void (*)(int); - std::function memcpy; - std::function regcpy; - std::function exec; - std::function init; - - DifftestInterface(memcpy_t memcpy, regcpy_t regcpy, exec_t exec, init_t init) - : memcpy(memcpy), regcpy(regcpy), exec(exec), init(init){}; - - // using fs = std::filesystem::path; - DifftestInterface(std::filesystem::path lib_file) { - void *handle = dlopen(lib_file.c_str(), RTLD_LAZY); - assert(handle != nullptr); - memcpy = (memcpy_t)dlsym(handle, "difftest_memcpy"); - assert(memcpy); - regcpy = (regcpy_t)dlsym(handle, "difftest_regcpy"); - assert(regcpy); - exec = (exec_t)dlsym(handle, "difftest_exec"); - assert(exec); - init = (init_t)dlsym(handle, "difftest_init"); - assert(init); - } -}; - -template class Difftest { - const DifftestInterface &ref; - std::unique_ptr ref_state; - const DifftestInterface &dut; - std::unique_ptr dut_state; - -public: - Difftest(const DifftestInterface &dut, const DifftestInterface &ref, - void *mem, size_t n, std::unique_ptr ref_state = nullptr, - std::unique_ptr dut_state = nullptr) - : ref(ref), dut(dut), ref_state(std::move(ref_state)), - dut_state(std::move(dut_state)) { - if (ref_state == nullptr) - this->ref_state = std::make_unique(); - if (dut_state == nullptr) - this->dut_state = std::make_unique(); - ref.init(0); - dut.init(0); - fetch_state(); - paddr_t reset_vector = 0x80000000; - ref.memcpy(reset_vector, mem, n, DIFFTEST_TO_REF); - dut.memcpy(reset_vector, mem, n, DIFFTEST_TO_REF); - }; - - void fetch_state() { - ref.regcpy(ref_state.get(), DIFFTEST_FROM_REF); - dut.regcpy(dut_state.get(), DIFFTEST_FROM_REF); - } - - bool step(uint64_t n) { - ref.exec(n); - dut.exec(n); - fetch_state(); - return *ref_state == *dut_state; - } - - friend std::ostream &operator<<(std::ostream &os, const Difftest &d) { - os << "REF state:\n" - << *d.ref_state << "DUT state:\n" - << *d.dut_state << std::endl; - return os; - } -}; - -template struct CPUStateBase { - R reg[nr_reg] = {0}; - paddr_t pc = 0x80000000; - static const std::map inline regs_by_name = - riscv32_regs_by_name; - CPUStateBase() { - for (int i = 0; i < nr_reg; i++) - reg[i] = 0; - } - bool operator==(const CPUStateBase &other) const { - if (pc != other.pc) - return false; - for (int i = 0; i < nr_reg; ++i) { - if (reg[i] != other.reg[i]) - return false; - } - return true; - } - bool operator!=(const CPUStateBase &other) const { - return !(*this == other); // Reuse the == operator for != implementation - } - - /* This does not update the register!!! */ - R at(std::string name) { return reg[regs_by_name.at(name)]; } -}; - -template -std::ostream &operator<<(std::ostream &os, const CPUStateBase &cpu) { - os << "PC: " << std::hex << cpu.pc << std::endl; - for (int i = 0; i < nr_reg; i++) { - os << "reg " << std::dec << std::setw(2) << i << ":" << std::hex - << std::setw(10) << cpu.reg[i]; - if (i % 4 == 3) { - os << std::endl; - } else { - os << " | "; - } - } - return os; -} - -#endif \ No newline at end of file diff --git a/npc/include/trm_difftest.hpp b/npc/include/trm_difftest.hpp new file mode 100644 index 0000000..ef8bde0 --- /dev/null +++ b/npc/include/trm_difftest.hpp @@ -0,0 +1,102 @@ +#ifndef _DIFFTEST_DIFFTEST_H_ +#define _DIFFTEST_DIFFTEST_H_ +#include "disasm.hpp" +#include "types.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +using paddr_t = uint32_t; +struct DifftestTrmInterface : public TrmInterface { + TrmInterface &dut; + TrmInterface &ref; + + DifftestTrmInterface(TrmInterface &dut, TrmInterface &ref, void *mem, + size_t mem_size) + : dut(dut), ref(ref) { + init = [this, mem, mem_size](int n) { + this->ref.init(n); + this->dut.init(n); + paddr_t reset_vector = 0x80000000; + this->ref.memcpy(reset_vector, mem, mem_size, TRM_TO_MACHINE); + this->dut.memcpy(reset_vector, mem, mem_size, TRM_TO_MACHINE); + fetch_state(); + }; + exec = [this](uint64_t n) { + bool enable_disasm = true; + if (n > 30) { + enable_disasm = false; + } + + while (n--) { + word_t pc = this->ref.at("pc"); + word_t inst = this->ref.at(pc); + if (enable_disasm) + std::cout << d.disassemble(pc, (uint8_t *)&inst, WORD_BYTES) + << std::endl; + if (inst == 1048691) { + // ebreak + throw TrmRuntimeException(TrmRuntimeException::EBREAK, "ebreak"); + } + this->ref.exec(1); + this->dut.exec(1); + this->ref.fetch_state(); + this->dut.fetch_state(); + if (*(CPUState *)this->ref.cpu_state != + *(CPUState *)this->dut.cpu_state) { + throw TrmRuntimeException(TrmRuntimeException::DIFFTEST_FAILED, + "Difftest failed"); + } + } + }; + + // NOTE: Different from normal Trm, we copy 2 * sizeof(CPUState) to/from p, + // which represents ref_state and dut state + regcpy = [this](void *p, bool direction) { + // this->ref.regcpy(p, direction); + // this->dut.regcpy(p, direction); + }; + + memcpy = [this](paddr_t paddr, void *p, size_t n, bool direction) { + this->dut.memcpy(paddr, p, n, direction); + this->ref.memcpy(paddr, (uint8_t *)p + n, n, direction); + }; + } + + word_t at(std::string name) const override { + if (name.empty()) { + throw std::runtime_error("Empty register name"); + } else if (name[0] == 'r') { + std::cout << name.substr(1) << std::endl; + this->ref.at(name.substr(1)); + } else if (name[0] == 'd') { + this->dut.at(name.substr(1)); + } else { + throw std::runtime_error("Register name provided to difftest interface " + "must start with r or d."); + } + return 0; + } + + word_t at(paddr_t addr) const override { + std::cout << ref.at(addr) << "\t" << dut.at(addr) << std::endl; + return dut.at(addr); + } + + void print(std::ostream &os) const override { + os << "REF state:\n" + << *(CPUState *)ref.cpu_state << "DUT state:\n" + << *(CPUState *)dut.cpu_state << std::endl; + } +}; +#endif \ No newline at end of file diff --git a/npc/include/trm_interface.hpp b/npc/include/trm_interface.hpp new file mode 100644 index 0000000..5acb8d6 --- /dev/null +++ b/npc/include/trm_interface.hpp @@ -0,0 +1,157 @@ +#ifndef _NPC_TRM_INTERFACE_HEADER_FILE_ +#define _NPC_TRM_INTERFACE_HEADER_FILE_ +#include +#include +#include +#include +#include +#include +#include + +extern Disassembler d; + +template struct CPUStateBase { + R reg[nr_reg] = {0}; + word_t pc = 0x80000000; + + static const std::map inline regs_by_name = + riscv32_regs_by_name; + CPUStateBase() { + for (int i = 0; i < nr_reg; i++) + reg[i] = 0; + } + + bool operator==(const CPUStateBase &other) const { + if (pc != other.pc) + return false; + for (int i = 0; i < nr_reg; ++i) { + if (reg[i] != other.reg[i]) + return false; + } + return true; + } + + bool operator!=(const CPUStateBase &other) const { + return !(*this == other); // Reuse the == operator for != implementation + } + + /* This does not update the register!!! */ + R at(std::string name) { + return name == "pc" ? pc : reg[regs_by_name.at(name)]; + } + + uint32_t reg_str2val(const char *name, bool *success) { + try { + *success = true; + return this->at(name); + } catch (std::runtime_error) { + *success = false; + return 0; + } + } +}; + +template +std::ostream &operator<<(std::ostream &os, const CPUStateBase &cpu) { + os << "PC: " << std::hex << cpu.pc << std::endl; + for (int i = 0; i < nr_reg; i++) { + os << "reg " << std::dec << std::setw(2) << i << ":" << std::hex + << std::setw(10) << cpu.reg[i]; + if (i % 4 == 3) { + os << std::endl; + } else { + os << " | "; + } + } + return os; +} + +using CPUState = CPUStateBase; + +enum { TRM_FROM_MACHINE, TRM_TO_MACHINE }; + +class TrmInterface { +protected: + using memcpy_t = void (*)(paddr_t, void *, size_t, bool); + using regcpy_t = void (*)(void *, bool); + using exec_t = void (*)(uint64_t); + using init_t = void (*)(int); + std::function regcpy; + +public: + std::function exec; + std::function init; + // TODO: paddr_t can probably changed to (void *)? + std::function memcpy; + // Managed by callee + void *cpu_state; + + TrmInterface() {} + TrmInterface(memcpy_t f_memcpy, regcpy_t f_regcpy, exec_t f_exec, + init_t f_init, void *cpu_state) + : memcpy(f_memcpy), regcpy(f_regcpy), exec(f_exec), init(f_init), + cpu_state(cpu_state) {} + + void fetch_state() { this->regcpy(cpu_state, TRM_FROM_MACHINE); } + void push_state() { this->regcpy(cpu_state, TRM_TO_MACHINE); } + virtual word_t at(std::string) const = 0; + virtual word_t at(word_t addr) const = 0; + virtual void print(std::ostream &os) const = 0; +}; + +class TrmRuntimeException : public std::exception { +private: + const char *msg_; + int code_; + +public: + enum { EBREAK, DIFFTEST_FAILED }; + TrmRuntimeException(int code, const char *message) + : code_(code), msg_(message) {} + + virtual const char *what() const throw() { return msg_; } + + int error_code() const { return code_; } +}; + +struct RefTrmInterface : TrmInterface { + RefTrmInterface(std::filesystem::path lib_file) { + void *handle = dlopen(lib_file.c_str(), RTLD_LAZY); + if (handle == nullptr) { + throw std::runtime_error("Failed to open diff library file"); + }; + memcpy = (memcpy_t)dlsym(handle, "difftest_memcpy"); + if (handle == nullptr) { + throw std::runtime_error("Failed to find `difftest_memcpy`"); + }; + regcpy = (regcpy_t)dlsym(handle, "difftest_regcpy"); + if (handle == nullptr) { + throw std::runtime_error("Failed to find `difftest_regcpy`"); + }; + exec = (exec_t)dlsym(handle, "difftest_exec"); + if (handle == nullptr) { + throw std::runtime_error("Failed to find `difftest_exec`"); + }; + init = (init_t)dlsym(handle, "difftest_init"); + if (handle == nullptr) { + throw std::runtime_error("Failed to find `difftest_init`"); + }; + cpu_state = new CPUState{}; + } + + ~RefTrmInterface() { delete (CPUState *)cpu_state; } + + word_t at(std::string name) const override { + return ((CPUState *)cpu_state)->at(name); + } + + word_t at(paddr_t addr) const override { + word_t buf; + this->memcpy(addr, &buf, sizeof(word_t), TRM_FROM_MACHINE); + return buf; + } + + void print(std::ostream &os) const override { os << *(CPUState *)cpu_state; } +}; + +#endif \ No newline at end of file diff --git a/npc/include/types.h b/npc/include/types.h index f6a8d87..6f78cc1 100644 --- a/npc/include/types.h +++ b/npc/include/types.h @@ -8,6 +8,7 @@ static const word_t WORD_T_MAX = UINT32_MAX; static const sword_t SWORD_T_MAX = INT32_MAX; static const sword_t SWORD_T_MIN = INT32_MIN; #define WORD_BYTES 4 +#define REG_COUNT 32 #define FMT_WORD "0x%08x" typedef uint32_t vaddr_t; @@ -16,8 +17,16 @@ typedef uint32_t paddr_t; typedef uint16_t ioaddr_t; #ifdef __cplusplus -#include -using CPUState = CPUStateBase; +#include +#include + +const std::map riscv32_regs_by_name{ + {"$0", 0}, {"ra", 1}, {"sp", 2}, {"gp", 3}, {"tp", 4}, {"t0", 5}, + {"t1", 6}, {"t2", 7}, {"s0", 8}, {"s1", 9}, {"a0", 10}, {"a1", 11}, + {"a2", 12}, {"a3", 13}, {"a4", 14}, {"a5", 15}, {"a6", 16}, {"a7", 17}, + {"s2", 18}, {"s3", 19}, {"s4", 20}, {"s5", 21}, {"s6", 22}, {"s7", 23}, + {"s8", 24}, {"s9", 25}, {"s10", 26}, {"s11", 27}, {"t3", 28}, {"t4", 29}, + {"t5", 30}, {"t6", 31}}; #endif #endif \ No newline at end of file diff --git a/npc/include/vl_wrapper.hpp b/npc/include/vl_wrapper.hpp index 4d42b55..61414c4 100644 --- a/npc/include/vl_wrapper.hpp +++ b/npc/include/vl_wrapper.hpp @@ -1,5 +1,6 @@ #ifndef _NPC_TRACER_H_ #define _NPC_TRACER_H_ +#include "components.hpp" #include #include @@ -31,9 +32,8 @@ template class VlModuleInterfaceCommon : public T { std::unique_ptr> tracer; public: - VlModuleInterfaceCommon(bool do_trace, - std::filesystem::path wavefile = "waveform.vcd") { - if (do_trace) + VlModuleInterfaceCommon(std::filesystem::path wavefile) { + if (!wavefile.empty()) tracer = std::make_unique>(this, wavefile); } void eval() { @@ -52,9 +52,12 @@ public: } } void reset_eval(int n) { + extern bool g_skip_memcheck; + g_skip_memcheck = true; this->reset = 1; this->eval(n); this->reset = 0; + g_skip_memcheck = false; } bool is_posedge() { // Will be posedge when eval is called diff --git a/npc/csrc/Flow/vpi_wrapper.hpp b/npc/include/vpi_wrapper.hpp similarity index 100% rename from npc/csrc/Flow/vpi_wrapper.hpp rename to npc/include/vpi_wrapper.hpp diff --git a/npc/utils/CMakeLists.txt b/npc/utils/CMakeLists.txt index 017313c..d61f3d8 100644 --- a/npc/utils/CMakeLists.txt +++ b/npc/utils/CMakeLists.txt @@ -1,4 +1,3 @@ -add_subdirectory(disasm) if (ENABLE_SDB) add_subdirectory(sdb) endif() diff --git a/npc/utils/disasm/CMakeLists.txt b/npc/utils/disasm/CMakeLists.txt deleted file mode 100644 index e019bf7..0000000 --- a/npc/utils/disasm/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_library(disasm disasm.cpp) -target_include_directories(disasm PUBLIC include) -llvm_map_components_to_libnames(LLVM_LIBS ${LLVM_TARGETS_TO_BUILD}) -target_link_libraries(disasm PUBLIC ${LLVM_LIBS}) diff --git a/npc/utils/sdb/CMakeLists.txt b/npc/utils/sdb/CMakeLists.txt index 6b1cb2c..2a41fbf 100644 --- a/npc/utils/sdb/CMakeLists.txt +++ b/npc/utils/sdb/CMakeLists.txt @@ -1,6 +1,7 @@ find_package(Readline REQUIRED) find_package(FLEX REQUIRED) find_package(BISON REQUIRED) +find_package(LLVM CONFIG REQUIRED) set(PARSER_DIR "${CMAKE_CURRENT_BINARY_DIR}") set(LEXER_OUT "${PARSER_DIR}/lexer.c") set(PARSER_OUT "${PARSER_DIR}/parser.c") @@ -8,7 +9,10 @@ flex_target(LEXER addrexp.l "${LEXER_OUT}" DEFINES_FILE "${PARSER_DIR}/addrexp_l bison_target(PARSER addrexp.y "${PARSER_OUT}" DEFINES_FILE "${PARSER_DIR}/addrexp.h") add_flex_bison_dependency(LEXER PARSER) -add_library(sdb sdb.cpp console.cpp "${LEXER_OUT}" "${PARSER_OUT}") +add_library(sdb OBJECT sdb.cpp console.cpp disasm.cpp "${LEXER_OUT}" "${PARSER_OUT}") +llvm_map_components_to_libnames(LLVM_LIBS core target asmparser riscvasmparser riscvdesc riscvdisassembler riscvinfo riscvtargetmca) +target_link_libraries(sdb PUBLIC ${LLVM_LIBS}) target_link_libraries(sdb PRIVATE ${Readline_LIBRARY}) +target_include_directories(sdb PRIVATE ${PARSER_DIR}) target_include_directories(sdb PRIVATE ${Readline_INCLUDE_DIR}) target_include_directories(sdb PUBLIC include) diff --git a/npc/utils/sdb/addrexp.y b/npc/utils/sdb/addrexp.y index ca1a5c9..477d8dd 100644 --- a/npc/utils/sdb/addrexp.y +++ b/npc/utils/sdb/addrexp.y @@ -22,6 +22,7 @@ %parse-param { uint32_t *result } %left '-' '+' %left '*' '/' +%expect 68 %% input diff --git a/npc/utils/sdb/console.cpp b/npc/utils/sdb/console.cpp index 485e192..61c9452 100644 --- a/npc/utils/sdb/console.cpp +++ b/npc/utils/sdb/console.cpp @@ -83,6 +83,12 @@ void Console::registerCommand(const std::string &s, CommandFunction f) { pimpl_->commands_[s] = f; } +void Console::removeCommands(const std::vector sv) { + for (auto const &s : sv) { + pimpl_->commands_.erase(s); + } +} + std::vector Console::getRegisteredCommands() const { std::vector allCommands; for (auto &pair : pimpl_->commands_) diff --git a/npc/utils/disasm/disasm.cpp b/npc/utils/sdb/disasm.cpp similarity index 89% rename from npc/utils/disasm/disasm.cpp rename to npc/utils/sdb/disasm.cpp index 0e817ba..e4671f0 100644 --- a/npc/utils/disasm/disasm.cpp +++ b/npc/utils/sdb/disasm.cpp @@ -25,11 +25,14 @@ #endif Disassembler::Disassembler(std::string triple) : triple(triple) { - llvm::InitializeAllTargetInfos(); - llvm::InitializeAllTargetMCs(); - llvm::InitializeAllAsmParsers(); - llvm::InitializeAllDisassemblers(); - + // llvm::InitializeAllTargetInfos(); + // llvm::InitializeAllTargetMCs(); + // llvm::InitializeAllAsmParsers(); + // llvm::InitializeAllDisassemblers(); + LLVMInitializeRISCVTargetInfo(); + LLVMInitializeRISCVTargetMC(); + LLVMInitializeRISCVAsmParser(); + LLVMInitializeRISCVDisassembler(); std::string errstr; llvm::MCInstrInfo *gMII = nullptr; diff --git a/npc/utils/sdb/include/console.hpp b/npc/utils/sdb/include/console.hpp index 538ce2f..69c4099 100644 --- a/npc/utils/sdb/include/console.hpp +++ b/npc/utils/sdb/include/console.hpp @@ -64,6 +64,13 @@ public: */ void registerCommand(const std::string &s, CommandFunction f); + /** + * @brief This function removes a list of registered commands. + * + * @param sv The vector of command names to be removed. + */ + void removeCommands(const std::vector sv); + /** * @brief This function returns a list with the currently available commands. * diff --git a/npc/utils/disasm/include/disasm.hpp b/npc/utils/sdb/include/disasm.hpp similarity index 100% rename from npc/utils/disasm/include/disasm.hpp rename to npc/utils/sdb/include/disasm.hpp diff --git a/npc/utils/sdb/include/sdb.hpp b/npc/utils/sdb/include/sdb.hpp index 18aae8a..964412a 100644 --- a/npc/utils/sdb/include/sdb.hpp +++ b/npc/utils/sdb/include/sdb.hpp @@ -3,9 +3,10 @@ #include #include -#include #include #include +#include +#include #include namespace cr = CppReadline; @@ -15,132 +16,81 @@ namespace SDB { enum SDBStatus { SDB_SUCCESS, + SDB_EBREAK = 2, SDB_WRONG_ARGUMENT, + SDB_DIFFTEST_FAILED }; +class SDBHandlers; + struct Handler { const std::vector names; - cr::Console::CommandFunction f; + // cr::Console::CommandFunction f; + std::function f; }; -template class _SDBHandlers { - using CPUState = CPUStateBase; - +class SDBHandlers { private: - std::vector all_handlers; + const TrmInterface &funcs; + std::vector all_handlers = { + Handler{{"c", "continue"}, &SDBHandlers::cmd_continue}, + Handler{{"si", "step-instruction"}, &SDBHandlers::cmd_step}, + Handler{{"info-r"}, &SDBHandlers::cmd_info_registers}, + Handler{{"p", "print"}, &SDBHandlers::cmd_print}, + Handler{{"disas", "disassemble"}, &SDBHandlers::cmd_disassemble}, + }; + int cmd_continue(const cr::Console::Arguments &input); + int cmd_step(const std::vector &input); + int cmd_info_registers(const std::vector &input); + int cmd_print(const std::vector &input); + int cmd_disassemble(const std::vector &input); + int exec_catch(uint64_t); public: - static CPUState cpu; - -private: - static _SDBHandlers *instance; - static int cmd_continue(const cr::Console::Arguments &input); - static int cmd_step(const std::vector &input); - static int cmd_info_registers(const std::vector &input); - static int cmd_print(const std::vector &input); - _SDBHandlers(std::vector all_handlers) - : all_handlers(all_handlers){}; - -public: - _SDBHandlers(const _SDBHandlers &) = delete; - _SDBHandlers operator=(const _SDBHandlers &) = delete; - - static _SDBHandlers *getInstance() { - if (instance == nullptr) { - std::vector all_handlers{ - Handler{{"c", "continue"}, &_SDBHandlers::cmd_continue}, - Handler{{"si", "step-instruction"}, &_SDBHandlers::cmd_step}, - }; - instance = new _SDBHandlers(all_handlers); - } - return instance; - } - - void registerHandlers(cr::Console *c); + SDBHandlers(const TrmInterface &funcs) : funcs(funcs){}; + void register_handlers(cr::Console *c); }; -template -_SDBHandlers *_SDBHandlers::instance = nullptr; - -template -CPUState _SDBHandlers::cpu = CPUState(); - -template -int _SDBHandlers::cmd_continue(const cr::Console::Arguments &input) { - if (input.size() > 1) - return SDB_WRONG_ARGUMENT; - funcs.exec(-1); - return SDB_SUCCESS; -} - -template -int _SDBHandlers::cmd_step(const std::vector &input) { - if (input.size() > 2) { - return SDB_WRONG_ARGUMENT; - } - uint64_t step_count = input.size() == 2 ? std::stoull(input[1]) : 1; - funcs.exec(step_count); - return SDB_SUCCESS; -} - -template -int _SDBHandlers::cmd_info_registers( - const std::vector &input) { - if (input.size() > 1) - return SDB_WRONG_ARGUMENT; - std::cout << _SDBHandlers::getInstance()->cpu << std::endl; - return SDB_SUCCESS; -} - -template -int _SDBHandlers::cmd_print(const std::vector &input) { - exit(1); -} - -template -void _SDBHandlers::registerHandlers(cr::Console *c) { - for (auto &h : this->all_handlers) { - for (auto &name : h.names) { - c->registerCommand(name, h.f); - } - } -} - -template class SDB { +class SDB { private: std::unique_ptr c; - using SDBHandlers = _SDBHandlers; + const TrmInterface &funcs; + SDBHandlers handlers; public: - SDB(std::string const &greeting = "\033[1;34m(npc)\033[0m ") { + SDB(const TrmInterface &funcs, + std::string const &greeting = "\033[1;34m(npc)\033[0m ") + : handlers(SDBHandlers{funcs}), funcs(funcs) { c = std::make_unique(greeting); - SDBHandlers::getInstance()->registerHandlers(c.get()); + + handlers.register_handlers(c.get()); }; - word_t reg_str2val(const char *name, bool *success) { - try { - *success = true; - return SDBHandlers::getInstance()->cpu.at(name); - } catch (std::runtime_error) { - *success = false; - return 0; - } - } - int main_loop() { - int retCode; + int ret_code; + funcs.init(0); + std::vector step_commands{"c", "continue", "si", + "step-instruction"}; do { - retCode = c->readLine(); + ret_code = c->readLine(); // We can also change the prompt based on last return value: - if (retCode == ret::Ok) + if (ret_code == SDB_SUCCESS || ret_code == SDB_EBREAK) c->setGreeting("\033[1;34m(npc)\033[0m "); else c->setGreeting("\033[1;31m(npc)\033[0m "); - if (retCode == SDB_WRONG_ARGUMENT) { - std::cout << "Wrong argument give to command\n"; + switch (ret_code) { + case SDB_EBREAK: { + std::cout << "\033[1;31m=== ebreak ===\033[0m" << std::endl; + c->removeCommands(step_commands); + break; } - } while (retCode != ret::Quit); + case SDB_WRONG_ARGUMENT: { + std::cout << "Wrong argument(s) is given to command handler\n"; + break; + } + } + } while (ret_code != ret::Quit); return 0; } }; diff --git a/npc/utils/sdb/sdb.cpp b/npc/utils/sdb/sdb.cpp index 9bfa6b5..55d6d41 100644 --- a/npc/utils/sdb/sdb.cpp +++ b/npc/utils/sdb/sdb.cpp @@ -1,10 +1,114 @@ #include #include -#include +#include +#include #include +#include +#include #include +extern "C" { +#include +#include +} namespace cr = CppReadline; using ret = cr::Console::ReturnCode; -namespace SDB {} +std::ostream &operator<<(std::ostream &os, const TrmInterface &d) { + d.print(os); + return os; +}; + +Disassembler d{"riscv32-linux-pc-gnu"}; + +namespace SDB { + +int SDBHandlers::exec_catch(uint64_t n) { + try { + this->funcs.exec(n); + } catch (TrmRuntimeException &e) { + switch (e.error_code()) { + case TrmRuntimeException::EBREAK: + return SDB_EBREAK; + case TrmRuntimeException::DIFFTEST_FAILED: + std::cout << "Difftest Failed" << std::endl << funcs << std::endl; + return SDB_DIFFTEST_FAILED; + default: + std::cerr << "Unknown error code" << std::endl; + exit(1); + } + } + return SDB_SUCCESS; +} + +int SDBHandlers::cmd_continue(const cr::Console::Arguments &input) { + if (input.size() > 1) + return SDB_WRONG_ARGUMENT; + return exec_catch(-1); +} + +int SDBHandlers::cmd_step(const std::vector &input) { + if (input.size() > 2) { + return SDB_WRONG_ARGUMENT; + } + uint64_t step_count = input.size() == 2 ? std::stoull(input[1]) : 1; + return exec_catch(step_count); + // std::cout << funcs << std::endl; +} + +int SDBHandlers::cmd_info_registers(const std::vector &input) { + if (input.size() > 1) + return SDB_WRONG_ARGUMENT; + std::cout << this->funcs << std::endl; + return SDB_SUCCESS; +} + +word_t parse_expr(const char *arg) { + if (arg == NULL) { + puts("Invalid expr argument."); + return 0; + } else { + word_t res; + yy_scan_string(arg); + yyparse(&res); + yylex_destroy(); + return res; + } +} + +int SDBHandlers::cmd_print(const std::vector &input) { + word_t buf[2]; + word_t addr = parse_expr(input[1].c_str()); + this->funcs.memcpy(addr, &buf, sizeof(word_t), TRM_FROM_MACHINE); + // TODO: Difftest only + std::cout << std::hex << "dut: 0x" << buf[0] << ' ' << "ref: 0x" << buf[1] + << std::dec << std::endl; + return SDB_SUCCESS; +} + +int SDBHandlers::cmd_disassemble(const std::vector &input) { + word_t buf[2]; + word_t addr = parse_expr(input[1].c_str()); + this->funcs.memcpy(addr, &buf, sizeof(word_t), TRM_FROM_MACHINE); + // TODO: Difftest only + std::cout << "dut: \n" + << d.disassemble(addr, (uint8_t *)&buf[0], sizeof(word_t)) + << std::endl + << "ref: \n" + << d.disassemble(addr, (uint8_t *)&buf[0], sizeof(word_t)) + << std::endl; + ; + return SDB_SUCCESS; +} + +void SDBHandlers::register_handlers(cr::Console *c) { + for (auto &h : this->all_handlers) { + for (auto &name : h.names) { + std::function)> f{ + std::bind(h.f, this, std::placeholders::_1)}; + c->registerCommand(name, f); + } + } +} + +} // namespace SDB