Merge branch 'master' of https://github.com/verilog-to-routing/vtr-verilog-to-routing into fix_3d_delay

Author: amin1377

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 ARG DEBIAN_FRONTEND=noninteractive
 # set out workspace
 ENV WORKSPACE=/workspace
@@ -19,6 +19,7 @@ RUN apt-get update -qq \
     libtbb-dev \
     python3-pip \
     git \
+    time \
 # Install python packages
     && pip install -r requirements.txt \
 # Cleanup

blifexplorer/src/container.cpp

@@ -929,25 +929,23 @@ void Container::showActivity()
 
 void Container::getActivityInformation()
 {
-    //right now it is a dummy function. the activity values are
-    //generated randomly
+    // Right now, it is a dummy function. The activity values are
+    // generated randomly.
     QHash<QString, nnode_t *>::const_iterator blockIterator = odinTable.constBegin();
 
     while(blockIterator != odinTable.constEnd()){
-         QString name = blockIterator.key();
-         LogicUnit* visNode = unithashtable[name];
-         //get all connections outgoing and advise them to
-         //represent the activity by color
-         QList<Wire*> outgoingWires = visNode->getOutCons();
-         foreach(Wire* wire, outgoingWires){
-             int act = qrand() % 255;
-             wire->setActivity(act);
-
-         }
+        QString name = blockIterator.key();
+        LogicUnit* visNode = unithashtable[name];
+        // Get all connections outgoing and advise them to
+        // represent the activity by color.
+        QList<Wire*> outgoingWires = visNode->getOutCons();
+        foreach(Wire* wire, outgoingWires){
+            int act = QRandomGenerator::global()->bounded(255); // Use QRandomGenerator
+            wire->setActivity(act);
+        }
         ++blockIterator;
     }
 }
-
 /*---------------------------------------------------------------------------------------------
  * (function: showSimulationStep)
  *-------------------------------------------------------------------------------------------*/

blifexplorer/src/mainwindow.cpp

@@ -271,10 +271,10 @@ void MainWindow::fontSizeChanged(const QString &)
  *-------------------------------------------------------------------------------------------*/
 void MainWindow::sceneScaleChanged(int scale)
 {
-    double newScale = scale/100.0;
-    QMatrix oldMatrix = view->matrix();
-    view->resetMatrix();
-    view->translate(oldMatrix.dx(), oldMatrix.dy());
+    double newScale = scale / 100.0;
+    QTransform oldTransform = view->transform(); // Use transform() instead of matrix()
+    view->resetTransform(); // Changed from resetMatrix() to resetTransform()
+    view->translate(oldTransform.dx(), oldTransform.dy()); // Use dx() and dy() from QTransform
     view->scale(newScale, newScale);
 }
 
@@ -915,7 +915,7 @@ void MainWindow::openFileWithOdin(){
                                                    tr("Open BLIF"),
                                                    QDir::homePath(),
                                                    tr("BLIF files (*.blif);;All files (*.*)"),
-                                                   0,
+                                                nullptr, // No parent,
                                                    QFileDialog::DontUseNativeDialog);
 
     myContainer->setFilename(actBlifFilename);
@@ -925,10 +925,10 @@ void MainWindow::openFileWithOdin(){
         //An error occured
         QMessageBox msgBox(QMessageBox::Warning, tr("No Structure Found in File"),
                            "The file you tried to explore does not contain any structures or could not be opened. Please select another file."
-                           , 0, this);
-        msgBox.addButton(tr("Open &Again"), QMessageBox::AcceptRole);
-        msgBox.addButton(tr("&Continue"), QMessageBox::RejectRole);
-        if (msgBox.exec() == QMessageBox::AcceptRole)
+                           
+                           , QMessageBox::Open | QMessageBox::Cancel, this);
+        msgBox.setDefaultButton(QMessageBox::Open);
+        if (msgBox.exec() == QMessageBox::Open)
             openFileWithOdin();
 
     }else{

dev/DOCKER_DEPLOY.md

@@ -1,52 +1,62 @@
-Overview
-========
+# Building VTR on Docker
 
+## Overview
 Docker creates an isolated container on your system so you know that VTR will run without further configurations nor affecting any other work.
 
 Our Docker file sets up this enviroment by installing all necessary Linux packages and applications as well as Perl modules.
 
-Additionally, Cloud9 is installed, which enables the remote management of your container through browser. With Cloud9, VTR can be started easier (and even modified and recompiled) without the need to logging into a terminal. If the Cloud9 endpoint is published outside your LAN, you can also execute VTR remotely or share your screen with other users.
+## Setup
 
+1. Install docker (Community Edition is free and sufficient for VTR): https://docs.docker.com/engine/install/
 
-Setup
-=====
+2. Clone the VTR project:
 
-Install docker (Community Edition is free and sufficient for VTR): https://docs.docker.com/engine/installation/
+    ```
+    git clone https://github.com/verilog-to-routing/vtr-verilog-to-routing
+    ```
 
-Clone the VTR project:
+3. CD to the VTR folder and build the docker image:
 
-`git clone https://github.com/verilog-to-routing/vtr-verilog-to-routing`
+    ```
+    docker build . -t vtrimg
+    ```
 
-CD to the VTR folder and build the docker image:
+4. Start docker with the new image:
 
-`docker build . -t vtrimg`
+    ```
+    docker run -it -d --name vtr vtrimg
+    ```
 
-Start docker with the new image and connect the current volume with the workspace volume of the container:
 
-`sudo docker run -it -d -p <port-to-open-on-host>:8080 -v <absolute-path-to-VTR-folder>:/workspace vtrimg`
+## Running
 
+1. Attach to the Docker container. Attaching will open a shell on the `/workspace` directory within the container.
+The project root directory from the docker build process is copied and placed in the `/workspace` directory.
 
-Running
-=======
+    ```sh
+    # from host computer
+    docker exec -it vtr /bin/bash
+    ```
 
-Open a browser (Google Chrome for example) and navigate to your host's url at the port you opened up. For example:
-http://192.168.1.30:8080
+1. Verfiy that VTR has been installed correctly:
 
-First, use one of the terminals and compile VTR:
-make && make installation/
+    ```sh
+    # in container
+    ./vtr_flow/scripts/run_vtr_task.py regression_tests/vtr_reg_basic/basic_timing
+    ```
 
-Second, ensure that a basic regression test passes:
-./run_reg_test.py vtr_reg_basic
+    The expected output is:
 
-Third, run and/or modify VTR in the usual way.
+    ```
+    k6_N10_mem32K_40nm/single_ff            OK
+    k6_N10_mem32K_40nm/single_ff            OK
+    k6_N10_mem32K_40nm/single_wire          OK
+    k6_N10_mem32K_40nm/single_wire          OK
+    k6_N10_mem32K_40nm/diffeq1              OK
+    k6_N10_mem32K_40nm/diffeq1              OK
+    k6_N10_mem32K_40nm/ch_intrinsics                OK
+    k6_N10_mem32K_40nm/ch_intrinsics                OK
+    ```
 
-Developpement Debugging
-=======================
-the container already comes with clang as the default compiler and with scan-build the do statistical analysis on the build
-set to `debug` in makefile
-
-run `scan-build make -j4` from the root VTR directory.
-to output the html analysis to a specific folder, run `scan-build make -j4 -o /some/folder`
-
-the output is html and viewable in any browser.
+2. Run and/or modify VTR in the usual way.
 

libs/libarchfpga/src/echo_arch.cpp

@@ -13,6 +13,10 @@
 
 using vtr::t_linked_vptr;
 
+/// @brief indices to lookup IPIN connection block switch name
+constexpr int ipin_cblock_switch_index_within_die = 0;
+constexpr int ipin_cblock_switch_index_between_dice = 1;
+
 void PrintArchInfo(FILE* Echo, const t_arch* arch);
 static void PrintPb_types_rec(FILE* Echo, const t_pb_type* pb_type, int level);
 static void PrintPb_types_recPower(FILE* Echo,
@@ -231,10 +235,14 @@ void PrintArchInfo(FILE* Echo, const t_arch* arch) {
             break;
     }
 
-    fprintf(Echo, "\tInput Connect Block Switch Name Within a Same Die: %s\n", arch->ipin_cblock_switch_name[0].c_str());
+    fprintf(Echo, "\tInput Connect Block Switch Name Within a Same Die: %s\n", arch->ipin_cblock_switch_name[ipin_cblock_switch_index_within_die].c_str());
+    
     //if there is more than one layer available, print the connection block switch name that is used for connection between two dice
-    if (arch->grid_layouts.size() > 1) {
-        fprintf(Echo, "\tInput Connect Block Switch Name Between Two Dice: %s\n", arch->ipin_cblock_switch_name[1].c_str());
+    for(const auto& layout : arch->grid_layouts){
+        int num_layers = (int)layout.layers.size();
+        if(num_layers > 1){
+            fprintf(Echo, "\tInput Connect Block Switch Name Between Two Dice: %s\n", arch->ipin_cblock_switch_name[ipin_cblock_switch_index_between_dice].c_str());
+        }
     }
 
     fprintf(Echo, "*************************************************\n\n");
@@ -287,9 +295,12 @@ void PrintArchInfo(FILE* Echo, const t_arch* arch) {
             fprintf(Echo, "\t\t\t\ttype unidir mux_name for within die connections: %s\n",
                     arch->Switches[seg.arch_wire_switch].name.c_str());
             //if there is more than one layer available, print the segment switch name that is used for connection between two dice
-            if (arch->grid_layouts.size() > 1) {
-                fprintf(Echo, "\t\t\t\ttype unidir mux_name for between two dice connections: %s\n",
+            for(const auto& layout : arch->grid_layouts){
+                int num_layers = (int)layout.layers.size();
+                if(num_layers > 1){
+                    fprintf(Echo, "\t\t\t\ttype unidir mux_name for between two dice connections: %s\n",
                         arch->Switches[seg.arch_opin_between_dice_switch].name.c_str());
+                }
             }
         } else { //Should be bidir
             fprintf(Echo, "\t\t\t\ttype bidir wire_switch %s arch_opin_switch %s\n",

libs/libvqm/vqm_dll.cpp

@@ -112,13 +112,13 @@ VQM_DLL_API t_module *vqm_parse_file(char *filename)
 
 VQM_DLL_API int vqm_get_error_message(char *message_buffer, int length)
 {
-	int result = -1;
-	int temp = strlen(most_recent_error);
+    int result = -1;
+    int temp = strlen(most_recent_error);
 
-	if (temp <= length)
-	{
-		strcpy(message_buffer, message_buffer);
-		result = temp;
-	}
-	return result;
+    if (temp < length) // Note: Changed to '<' to avoid buffer overflow
+    {
+        strcpy(message_buffer, most_recent_error); // Copy 'most_recent_error' to 'message_buffer'
+        result = temp;
+    }
+    return result;
 }

libs/libvqm/vqm_parser.y

@@ -38,11 +38,11 @@ extern int yylex(void);
 
 %union
 {
-	uintptr_t value;
-	char *string;
+    uintptr_t value;
+    char *string;
 }
 %parse-param {t_parse_info* parse_info}
-%error-verbose
+%define parse.error verbose
 /********************************************************/
 /**** DEFINE TOKENS *************************************/
 /********************************************************/

odin_ii/src/ast/ast_loop_unroll.cpp

@@ -312,19 +312,18 @@ bool is_unsupported_post(ast_node_t* node, ast_node_t* symbol) {
 
 post_condition_function resolve_binary_operation(ast_node_t* node) {
     if (node->type == NUMBERS) {
-        return [=](long value) {
-            /* 
-             * this lambda triggers a warning for unused variable unless
-             * we use value to generate a 0
-             */
-            return node->types.vnumber->get_value() + (value - value);
+        return [=](long value) noexcept {
+            (void)value; // Indicate that value is unused
+            return node->types.vnumber->get_value();
         };
     } else if (node->type == IDENTIFIERS) {
-        return [=](long value) {
+        return [=](long value) noexcept {
+            (void)value; // Indicate that value is unused
             return value;
         };
     } else {
-        return [=](long value) {
+        return [=](long value) noexcept {
+            (void)value; // Indicate that value is unused
             post_condition_function left_func = resolve_binary_operation(node->children[0]);
             post_condition_function right_func = resolve_binary_operation(node->children[1]);
             switch (node->types.operation.op) {
@@ -343,6 +342,7 @@ post_condition_function resolve_binary_operation(ast_node_t* node) {
     }
 }
 
+
 /*
  *  (function: resolve_post_condition)
  *  return a lambda which gives the next value