Merge branch 'develop' of https://github.com/QuickLogic-Corp/FOEDAG into nj_floorplanning_pcf_pins

Author: Navid Jafarof

.github/workflows/build.yml

@@ -245,14 +245,14 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - runner: ubuntu-20.04
-            install_script: install_dependencies_build_ubuntu2004.sh
-            os: linux
-            arch: x86-64
           - runner: ubuntu-22.04
             install_script: install_dependencies_build_ubuntu2204.sh
             os: linux
             arch: x86-64
+          - runner: ubuntu-24.04
+            install_script: install_dependencies_build_ubuntu2404.sh
+            os: linux
+            arch: x86-64
 
     runs-on: ${{ matrix.runner }}
     name: build ${{ matrix.os }}-${{ matrix.arch }} ${{ matrix.runner }}

.github/workflows/install_dependencies_build_ubuntu2404.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# The package list is designed for Ubuntu 24.04 LTS (Noble Numbat)
+apt-get update
+apt-get install -y \
+    g++ gcc \
+    tclsh \
+    cmake \
+    build-essential \
+    google-perftools \
+    libgoogle-perftools-dev \
+    libunwind-dev \
+    libtcmalloc-minimal4t64 \
+    uuid-dev \
+    lcov \
+    valgrind \
+    xorg \
+    qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools \
+    xvfb \
+    yosys \
+    automake \
+    ninja-build

CMakeLists.txt

@@ -274,7 +274,7 @@ else(MSVC)
     message("MSYS MODE")
     set(TCL_STATIC_LIB libtcl86.dll.a)
     set(TCL_STUBB_LIB libtclstub86.a)
-    set(ZLIB_STATIC_LIB libzlibstatic.a)
+    set(ZLIB_STATIC_LIB libz.a)
 
     add_library(tcl_static STATIC IMPORTED )
     set_target_properties(tcl_static PROPERTIES

Makefile.au

@@ -71,6 +71,7 @@ SUPPORTED_BUILD_PLATFORMS += WIN32_MSYS2_CLANG64
 SUPPORTED_BUILD_PLATFORMS += WIN32_MSVC
 SUPPORTED_BUILD_PLATFORMS += UBUNTU_2004
 SUPPORTED_BUILD_PLATFORMS += UBUNTU_2204
+SUPPORTED_BUILD_PLATFORMS += UBUNTU_2404
 
 ifeq ($(OS),Windows_NT)
 ifneq ($(filter $(MSYSTEM),MINGW64),)
@@ -115,7 +116,7 @@ endif
 prepare:
 ifeq ($(BUILD_PLATFORM),$(filter $(BUILD_PLATFORM),WIN32_MSYS2_MINGW64 WIN32_MSYS2_UCRT64 WIN32_MSYS2_CLANG64))
 else ifeq ($(BUILD_PLATFORM),$(filter $(BUILD_PLATFORM),WIN32_MSVC))
-else ifeq ($(BUILD_PLATFORM),$(filter $(BUILD_PLATFORM),UBUNTU_2004 UBUNTU_2204))
+else ifeq ($(BUILD_PLATFORM),$(filter $(BUILD_PLATFORM),UBUNTU_2004 UBUNTU_2204 UBUNTU_2404))
 endif
 
 
@@ -141,7 +142,7 @@ else ifeq ($(BUILD_PLATFORM),$(filter $(BUILD_PLATFORM),WIN32_MSVC))
 	-DAURORA_USE_TABBYCAD=$(USE_TABBYCAD) \
 	-DAURORA_YOSYS_SYNTH_PASS_NAME=$(AURORA_YOSYS_SYNTH_PASS_NAME) \
 	-S $(SOURCE_DIR) -B $(BUILD_DIR)
-else ifeq ($(BUILD_PLATFORM),$(filter $(BUILD_PLATFORM),UBUNTU_2004 UBUNTU_2204))
+else ifeq ($(BUILD_PLATFORM),$(filter $(BUILD_PLATFORM),UBUNTU_2004 UBUNTU_2204 UBUNTU_2404))
 	@cmake \
 	-DCMAKE_INSTALL_PREFIX=$(PREFIX) \
 	-DAURORA_VERSION=$(AURORA_VERSION) \
@@ -189,7 +190,7 @@ ifeq ($(BUILD_PLATFORM),$(filter $(BUILD_PLATFORM),WIN32_MSYS2_MINGW64 WIN32_MSY
 		cd - &> /dev/null
 	ls aurora-$(COMMIT_SHA1)-$(MSYSTEM_LC).sfx.exe
 	ls aurora-$(COMMIT_SHA1)-$(MSYSTEM_LC).7z
-else ifeq ($(BUILD_PLATFORM),$(filter $(BUILD_PLATFORM),UBUNTU_2004 UBUNTU_2204))
+else ifeq ($(BUILD_PLATFORM),$(filter $(BUILD_PLATFORM),UBUNTU_2004 UBUNTU_2204 UBUNTU_2404))
 endif
 
 
@@ -213,7 +214,7 @@ ifeq ($(BUILD_PLATFORM),$(filter $(BUILD_PLATFORM),WIN32_MSYS2_MINGW64 WIN32_MSY
 	wget --quiet https://www.7-zip.org/a/7z2301-x64.exe --directory-prefix=$(SEVENZIP_DIR_PATH)
 	cd $(SEVENZIP_DIR_PATH) && \
 		$(SEVENZIP_DIR_PATH)/7zr.exe x $(SEVENZIP_DIR_PATH)/7z2301-x64.exe -y > /dev/null
-else ifeq ($(BUILD_PLATFORM),$(filter $(BUILD_PLATFORM),UBUNTU_2004 UBUNTU_2204))
+else ifeq ($(BUILD_PLATFORM),$(filter $(BUILD_PLATFORM),UBUNTU_2004 UBUNTU_2204 UBUNTU_2404))
 endif
 
 

cmake/cmake_tcl.txt

@@ -61,7 +61,7 @@ else()
   if (DEFINED ENV{MSYSTEM})
     set(TCL_STATIC_LIB libtcl86.dll.a)
     set(TCL_STUBB_LIB libtclstub86.a)
-    set(ZLIB_STATIC_LIB libzlibstatic.a)
+    set(ZLIB_STATIC_LIB libz.a)
 
     add_library(tcl_static STATIC IMPORTED )
     set_target_properties(tcl_static PROPERTIES

src/Compiler/CMakeLists.txt

@@ -135,6 +135,16 @@ set (res_LIST
   compiler_resources.qrc
 )
 
+# Conditionally embed power calculator xlsx when built from Aurora2.
+# Aurora2 sets POWER_CALCULATOR_XLSX to the path of the built xlsx file.
+if(POWER_CALCULATOR_XLSX AND EXISTS "${POWER_CALCULATOR_XLSX}")
+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/compiler_power_calc_resources.qrc"
+    "<RCC>\n  <qresource prefix=\"/\">\n    <file alias=\"build/power_calculator/power_calculator.xlsx\">${POWER_CALCULATOR_XLSX}</file>\n  </qresource>\n</RCC>\n"
+  )
+  list(APPEND res_LIST "${CMAKE_CURRENT_BINARY_DIR}/compiler_power_calc_resources.qrc")
+  set(HAS_POWER_CALC_RESOURCE TRUE)
+endif()
+
 add_library(compiler STATIC
   ${SRC_CPP_LIST}
   ${SRC_H_LIST}
@@ -143,6 +153,9 @@ add_library(compiler STATIC
 
 target_link_libraries(compiler PUBLIC Qt5::Widgets Qt5::Core Qt5::Gui Qt5::Xml cryptor)
 target_compile_definitions(compiler PRIVATE COMPILER_LIBRARY)
+if(HAS_POWER_CALC_RESOURCE)
+  target_compile_definitions(compiler PUBLIC HAS_POWER_CALC_RESOURCE)
+endif()
 
 install (
   FILES ${CMAKE_CURRENT_BINARY_DIR}/../../lib/$<TARGET_FILE_NAME:compiler>

src/Compiler/CompilerOpenFPGA_ql.cpp

@@ -87,6 +87,12 @@ using json = nlohmann::ordered_json;
 
 using namespace FOEDAG;
 
+#ifdef HAS_POWER_CALC_RESOURCE
+static inline void initPowerCalcResource() {
+  Q_INIT_RESOURCE(compiler_power_calc_resources);
+}
+#endif
+
 #define USE_INCREMENTAL_COMPILATION
 #define GENERATE_NEW_DEVICE_FPGA_AUTO 1
 #define GENERATE_RR_GRAPH_FPGA_AUTO 0
@@ -5274,6 +5280,9 @@ bool CompilerOpenFPGA_ql::PowerAnalysis() {
 #endif // _WIN32
 
   // unpack embedded in qrc xlsx file to a temprorary location
+#ifdef HAS_POWER_CALC_RESOURCE
+  initPowerCalcResource();
+#endif
   QFile qrc_xlsx_filepath(":/build/power_calculator/power_calculator.xlsx");
   if (!qrc_xlsx_filepath.open(QIODevice::ReadOnly)) {
     ErrorMessage("Cannot open power calculator data file");

src/Compiler/compiler_resources.qrc

@@ -9,6 +9,5 @@
         <file>search.png</file>
         <file>loading.gif</file>
         <file>warning.png</file>
-        <file>../../../../build/power_calculator/power_calculator.xlsx</file>
     </qresource>
 </RCC>

src/IPGenerate/IPCatalog.cpp

@@ -30,6 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <chrono>
 #include <ctime>
 #include <filesystem>
+#include <fstream>
 #include <sstream>
 #include <thread>
 
@@ -120,7 +121,31 @@ std::filesystem::path IPCatalog::getPythonPath(const std::filesystem::path& envs
     std::filesystem::path searchPath = envsPath / "litex";
 #endif
     searchPath = FileUtils::GetFullPath(searchPath);
-    s_pythonPath = FileUtils::LocateFileRecursive(searchPath, pythonExecName);
+    auto candidate = FileUtils::LocateFileRecursive(searchPath, pythonExecName);
+    if (!candidate.empty()) {
+      std::error_code ec;
+      auto perms = std::filesystem::status(candidate, ec).permissions();
+      bool isUsable = !ec &&
+          (perms & std::filesystem::perms::owner_exec) !=
+              std::filesystem::perms::none;
+#ifdef __APPLE__
+      // Reject Linux ELF binaries that cannot run on macOS.
+      // The bundled envs/litex/ Python is built for Linux x86-64; on macOS
+      // QProcess would fail with "execve: Exec format error".
+      if (isUsable) {
+        std::ifstream f(candidate, std::ios::binary);
+        char magic[4]{};
+        f.read(magic, 4);
+        if (magic[0] == 0x7f && magic[1] == 'E' &&
+            magic[2] == 'L' && magic[3] == 'F') {
+          isUsable = false;
+        }
+      }
+#endif
+      if (isUsable) {
+        s_pythonPath = candidate;
+      }
+    }
   }
   return s_pythonPath;
 }

src/IPGenerate/IPGenerator.cpp

@@ -66,13 +66,20 @@ void IPGenerator::setIpOutputLocation(const std::string& moduleName, const std::
 }
 
 IPGenerator::IPGenerator(const std::filesystem::path& installDir, IPCatalog* catalog, Compiler* compiler): m_installDir(installDir), m_catalog(catalog), m_compiler(compiler) {
-  m_environment["PYTHONHOME"] = (EnvsPath() / "python3.8").string();
+  // Only set PYTHONHOME and LD_LIBRARY_PATH when the bundled envs directory
+  // actually exists.  When it doesn't (e.g. macOS builds without the litex
+  // environment), setting PYTHONHOME to a non-existent path poisons the
+  // fallback to system python3, causing "Failed to import encodings module".
+  auto pythonHome = EnvsPath() / "python3.8";
+  if (std::filesystem::is_directory(pythonHome)) {
+    m_environment["PYTHONHOME"] = pythonHome.string();
 #ifndef __WIN32
-  // IP Generator requires libffi.so.6 which is absent on ubuntu>=20.04
-  std::string ldLibraryPath = qgetenv("LD_LIBRARY_PATH").toStdString();
-  std::string newLdLibraryPath = (EnvsPath() / "python3.8" / "lib" / "os_libs").string();
-  m_environment["LD_LIBRARY_PATH"] = newLdLibraryPath + ":" + ldLibraryPath;
+    // IP Generator requires libffi.so.6 which is absent on ubuntu>=20.04
+    std::string ldLibraryPath = qgetenv("LD_LIBRARY_PATH").toStdString();
+    std::string newLdLibraryPath = (pythonHome / "lib" / "os_libs").string();
+    m_environment["LD_LIBRARY_PATH"] = newLdLibraryPath + ":" + ldLibraryPath;
 #endif
+  }
 }
 
 void IPGenerator::shareContext()