Merge branch 'master' into dev

.github/workflows/basic_reg_test.sh

@@ -116,3 +116,7 @@ run-task basic_tests/global_tile_ports/global_tile_4clock --debug --show_thread_
 
 echo -e "Testing yosys flow using custom ys script for running quicklogic device";
 run-task quicklogic_tests/flow_test --debug --show_thread_logs
+
+# Repgression test to test multi-user enviroment
+cp -r */*/basic_tests/full_testbench/configuration_chain /tmp/
+cd /tmp/ && run-task configuration_chain --debug --show_thread_logs

openfpga_flow/scripts/run_fpga_flow.py

@@ -257,17 +257,12 @@ def main():
         logger.info('Running "yosys_vpr" Flow')
         run_yosys_with_abc()
         # TODO Make it optional if activity file is provided
-        run_ace2()
-        run_pro_blif_3arg()
         if args.power:
+            run_ace2()
+            run_pro_blif_3arg()
             run_rewrite_verilog()
     if (args.fpga_flow == "vpr_blif"):
         collect_files_for_vpr()
-    # if (args.fpga_flow == "vtr"):
-    #     run_odin2()
-    #     run_abc_vtr()
-    # if (args.fpga_flow == "vtr_standard"):
-    #     run_abc_for_standarad()
     logger.info("Runing OpenFPGA Shell Engine ")
     run_openfpga_shell()
     if args.end_flow_with_test:

openfpga_flow/scripts/run_fpga_task.py

@@ -166,8 +166,14 @@ def generate_each_task_actions(taskname):
     """
 
     # Check if task directory exists and consistent
-    curr_task_dir = os.path.join(gc["task_dir"], *(taskname))
-    if not os.path.isdir(curr_task_dir):
+    local_tasks = os.path.join(*(taskname))
+    repo_tasks = os.path.join(gc["task_dir"], *(taskname))
+    if os.path.isdir(local_tasks):
+        os.chdir(local_tasks)
+        curr_task_dir = os.path.abspath(os.getcwd())
+    elif os.path.isdir(repo_tasks):
+        curr_task_dir = repo_tasks
+    else:
         clean_up_and_exit("Task directory [%s] not found" % curr_task_dir)
     os.chdir(curr_task_dir)