Vortex 2.0 changes:

+ Microarchitecture optimizations + 64-bit support + Xilinx FPGA support + LLVM-16 support + Refactoring and quality control fixes minor update minor update minor update minor update minor update minor update cleanup cleanup cache bindings and memory perf refactory minor update minor update hw unit tests fixes minor update minor update minor update minor update minor update minor udpate minor update minor update minor update minor update minor update minor update minor update minor updates minor updates minor update minor update minor update minor update minor update minor update minor updates minor updates minor updates minor updates minor update minor update
2023-10-19 20:51:22 -07:00
parent d69a64c32c
commit c1e168fdbe
1309 changed files with 247412 additions and 311463 deletions
--- a/sim/rtlsim/main.cpp
+++ b/sim/rtlsim/main.cpp
@@ -1,11 +1,24 @@
+// Copyright © 2019-2023
+// 
+// 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 <iostream>
 #include <fstream>
 #include <iomanip>
 #include <unistd.h>
-#include <unistd.h>
 #include <util.h>
 #include <mem.h>
 #include <VX_config.h>
+#include <VX_types.h>
 #include "processor.h"

 #define RAM_PAGE_SIZE 4096
@@ -13,11 +26,11 @@
 using namespace vortex;

 static void show_usage() {
-   std::cout << "Usage: [-r] [-h: help] programs.." << std::endl;
+   std::cout << "Usage: [-r: riscv-test] [-h: help] <program>" << std::endl;
 }

 bool riscv_test = false;
-std::vector<const char*> programs;
+const char* program = nullptr;

 static void parse_args(int argc, char **argv) {
  	int c;
@@ -35,56 +48,68 @@ static void parse_args(int argc, char **argv) {
      		show_usage();
      		exit(-1);
    	}
-  	}	
+	}

-	for (int i = optind; i < argc; ++i) {
-		programs.push_back(argv[i]);	
+	if (optind < argc) {
+		program = argv[optind];
+		std::cout << "Running " << program << "..." << std::endl;
+	} else {
+		show_usage();
+      	exit(-1);
 	}
 }

 int main(int argc, char **argv) {
-
 	int exitcode = 0;
-	bool failed = false;
 	
-	parse_args(argc, argv);
+	parse_args(argc, argv);	

+	// create memory module
 	vortex::RAM ram(RAM_PAGE_SIZE);
+
+	// create processor
 	vortex::Processor processor;
+
+	// attach memory module
 	processor.attach_ram(&ram);

-	for (auto program : programs) {
-		std::cout << "Running " << program << "..." << std::endl;		
+	// setup base DCRs
+	const uint64_t startup_addr(STARTUP_ADDR);
+	processor.write_dcr(VX_DCR_BASE_STARTUP_ADDR0, startup_addr & 0xffffffff);
+#if (XLEN == 64)
+    processor.write_dcr(VX_DCR_BASE_STARTUP_ADDR1, startup_addr >> 32);
+#endif
+	processor.write_dcr(VX_DCR_BASE_MPM_CLASS, 0);	

+	// load program
+	{		
 		std::string program_ext(fileExtension(program));
 		if (program_ext == "bin") {
-			ram.loadBinImage(program, STARTUP_ADDR);
+			ram.loadBinImage(program, startup_addr);
 		} else if (program_ext == "hex") {
 			ram.loadHexImage(program);
 		} else {
 			std::cout << "*** error: only *.bin or *.hex images supported." << std::endl;
 			return -1;
 		}
-
-		exitcode = processor.run();
-		
-		if (riscv_test) {
-			if (1 == exitcode) {
-				std::cout << "Passed" << std::endl;
-			} else {
-				std::cout << "Failed: exitcode=" << exitcode << std::endl;
-				failed = true;
-			}
-		} else {
-			if (exitcode != 0) {
-				std::cout << "*** error: exitcode=" << exitcode << std::endl;
-				failed = true;
-			}
-		}	
-		
-		if (failed)
-			break;
 	}

-	return failed ? exitcode : 0;
+	// run simulation
+	exitcode = processor.run();
+	
+	if (riscv_test) {
+		if (1 == exitcode) {
+			std::cout << "Passed" << std::endl;
+			exitcode = 0;
+		} else {
+			std::cout << "Failed" << std::endl;
+			exitcode = 1;
+		}
+	} else {
+		if (exitcode != 0) {
+			std::cout << "*** error: exitcode=" << exitcode << std::endl;
+		}
+	}
+
+	return exitcode;
 }