Pull the jsl Python dependency separately for the Tofino back end.

p4lang · Dec 12, 2024 · 0611777 · 0611777
1 parent 650af7e
commit 0611777
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 13 deletions.
diff --git a/backends/tofino/CMakeLists.txt b/backends/tofino/CMakeLists.txt
@@ -88,6 +88,23 @@ endif()
 set (ENV{P4C_VERSION} "${BFN_P4C_VERSION} (SHA: ${BFN_P4C_GIT_SHA})")
 MESSAGE(STATUS "p4c-barefoot version: $ENV{P4C_VERSION}")
 
+
+# Fetch and declare the jsl for schemas.
+set(FETCHCONTENT_QUIET_PREV ${FETCHCONTENT_QUIET})
+set(FETCHCONTENT_QUIET OFF)
+fetchcontent_declare(
+  tofino_jsl
+  URL https://github.com/aromanovich/jsl/archive/refs/tags/0.2.4.tar.gz
+  # URL_HASH SHA256=cc01a3a05d25e5978c20be7656f14eb8b6fcb120bb1c7e8041e497814fc273cb
+  SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/compiler_interfaces/schemas/jsl
+  USES_TERMINAL_DOWNLOAD TRUE
+  GIT_PROGRESS TRUE
+  DOWNLOAD_EXTRACT_TIMESTAMP TRUE
+)
+fetchcontent_makeavailable(tofino_jsl)
+set(FETCHCONTENT_QUIET ${FETCHCONTENT_QUIET_PREV})
+message("Done with setting up Python JSL for P4C.")
+
 # Generate the sha specific version file. It includes the GIT SHA.
 # Because this version changes frequently, we include it separately from the normal version files.
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/git_sha_version.h.in"

diff --git a/backends/tofino/compiler_interfaces/schemas/.gitignore b/backends/tofino/compiler_interfaces/schemas/.gitignore
@@ -0,0 +1 @@
+jsl
diff --git a/backends/tofino/compiler_interfaces/schemas/bfrt_schema.py b/backends/tofino/compiler_interfaces/schemas/bfrt_schema.py
@@ -8,7 +8,7 @@
 import json
 import sys
 
-import jsl
+import jsl.jsl as jsl
 import jsonschema
 
 ########################################################

diff --git a/backends/tofino/compiler_interfaces/schemas/context_schema.py b/backends/tofino/compiler_interfaces/schemas/context_schema.py
@@ -11,7 +11,7 @@
 import os.path
 import sys
 
-import jsl
+import jsl.jsl as jsl
 
 MYPATH = os.path.dirname(__file__)
 if not getattr(sys, 'frozen', False):

diff --git a/backends/tofino/compiler_interfaces/schemas/event_log_schema.py b/backends/tofino/compiler_interfaces/schemas/event_log_schema.py
@@ -4,7 +4,7 @@
 
 import json
 
-import jsl
+import jsl.jsl as jsl
 
 ########################################################
 #   Schema Version

diff --git a/backends/tofino/compiler_interfaces/schemas/jgf_schema.py b/backends/tofino/compiler_interfaces/schemas/jgf_schema.py
@@ -8,7 +8,7 @@
 
 import json
 
-import jsl
+import jsl.jsl as jsl
 
 ########################################################
 #   Schema Version

diff --git a/backends/tofino/compiler_interfaces/schemas/manifest_schema.py b/backends/tofino/compiler_interfaces/schemas/manifest_schema.py
@@ -31,7 +31,7 @@
 import os.path
 import sys
 
-import jsl
+import jsl.jsl as jsl
 
 MYPATH = os.path.dirname(__file__)
 if not getattr(sys, 'frozen', False):

diff --git a/backends/tofino/compiler_interfaces/schemas/mau_schema.py b/backends/tofino/compiler_interfaces/schemas/mau_schema.py
@@ -7,7 +7,7 @@
 import inspect
 import json
 
-import jsl
+import jsl.jsl as jsl
 
 ########################################################
 #   Schema Version

diff --git a/backends/tofino/compiler_interfaces/schemas/metrics_schema.py b/backends/tofino/compiler_interfaces/schemas/metrics_schema.py
@@ -9,7 +9,7 @@
 import os.path
 import sys
 
-import jsl
+import jsl.jsl as jsl
 
 MYPATH = os.path.dirname(__file__)
 if not getattr(sys, 'frozen', False):

diff --git a/backends/tofino/compiler_interfaces/schemas/phv_schema.py b/backends/tofino/compiler_interfaces/schemas/phv_schema.py
@@ -13,7 +13,7 @@
 import os.path
 import sys
 
-import jsl
+import jsl.jsl as jsl
 
 MYPATH = os.path.dirname(__file__)
 if not getattr(sys, 'frozen', False):

diff --git a/backends/tofino/compiler_interfaces/schemas/power_schema.py b/backends/tofino/compiler_interfaces/schemas/power_schema.py
@@ -7,7 +7,7 @@
 import inspect
 import json
 
-import jsl
+import jsl.jsl as jsl
 
 ########################################################
 #   Schema Version

diff --git a/backends/tofino/compiler_interfaces/schemas/resources_schema.py b/backends/tofino/compiler_interfaces/schemas/resources_schema.py
@@ -7,7 +7,7 @@
 import inspect
 import json
 
-import jsl
+import jsl.jsl as jsl
 
 ########################################################
 #   Schema Version

diff --git a/backends/tofino/compiler_interfaces/schemas/source_info_schema.py b/backends/tofino/compiler_interfaces/schemas/source_info_schema.py
@@ -6,7 +6,7 @@
 
 import json
 
-import jsl
+import jsl.jsl as jsl
 
 ########################################################
 #   Schema Version

diff --git a/backends/tofino/compiler_interfaces/schemas/table_graph_schema.py b/backends/tofino/compiler_interfaces/schemas/table_graph_schema.py
@@ -6,7 +6,7 @@
 
 import json
 
-import jsl
+import jsl.jsl as jsl
 from schemas.jgf_schema import Graph, GraphEdge, GraphNode, JsonGraphFormatSchema
 
 ########################################################

diff --git a/tools/ci-build.sh b/tools/ci-build.sh
@@ -231,7 +231,6 @@ fi
 function build_tofino() {
     P4C_TOFINO_PACKAGES="rapidjson-dev"
     sudo apt-get install -y --no-install-recommends ${P4C_TOFINO_PACKAGES}
-    sudo pip3 install jsl==0.2.4 pyinstaller==6.11.0
 }
 
 if [[ "${ENABLE_TOFINO}" == "ON" ]]; then