updated CMakeLists.txt for Apple Silicon

anikau31 · Aug 27, 2024 · a61c455 · a61c455
1 parent 16898cc
commit a61c455
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 41 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -172,7 +172,7 @@ if ("${ENABLE_VERILOG_TESTS}" STREQUAL "")
 else()
   set( V_TESTS_ON ${ENABLE_VERILOG_TESTS} )
   if (V_TESTS_ON)
-    find_package(PythonInterp 3 REQUIRED)
+    find_package(PythonInterp 3.11 REQUIRED)
   endif()
   if (V_TESTS_ON)
     if ("${HDL}" STREQUAL "")
@@ -190,7 +190,7 @@ if ("${ENABLE_HARDWARE_FLOW}" STREQUAL "")
 else()
   set( HW_FLOW_ON ${ENABLE_HARDWARE_FLOW} )
   if (HW_FLOW_ON)
-    find_package(PythonInterp 3 REQUIRED)
+    find_package(PythonInterp 3.11 REQUIRED)
   endif()
   if("${HDL}" STREQUAL "")
     set( PLUGIN_HDL ON )
@@ -306,7 +306,8 @@ llvm_config(CLANG_VERSION "--version" "")
 # https://github.com/halide/Halide/issues/1112
 llvm_config(LLVM_SYSTEM_LIBS "--system-libs" "")
 message(STATUS "LLVM_SYSTEM_LIBS: ${LLVM_SYSTEM_LIBS}")
-
+string(REGEX REPLACE "/opt/homebrew/lib/libzstd.1.5.2.dylib" "/usr/local/lib/libzstd.1.dylib" LLVM_SYSTEM_LIBS ${LLVM_SYSTEM_LIBS})
+message(STATUS "LLVM_SYSTEM_LIBS: ${LLVM_SYSTEM_LIBS}")
 #set( CMAKE_CXX_FLAGS "${LLVM_CXX_FLAGS}" )
 set( CMAKE_CXX_FLAGS "${LLVM_CXX_FLAGS}  -fvisibility=hidden -fvisibility-inlines-hidden" )
 

diff --git a/examples/llnl-examples/zfpsynth/zfp3/z3test_hdl.txt b/examples/llnl-examples/zfpsynth/zfp3/z3test_hdl.txt
@@ -9441,6 +9441,23 @@
       ]
     ]
   ]
+  hTypedef fp_t_11_52_ [
+    hTypeField frac [
+      hType sc_uint [
+        hLiteral 52 NOLIST
+      ]
+    ]
+    hTypeField expo [
+      hType sc_uint [
+        hLiteral 11 NOLIST
+      ]
+    ]
+    hTypeField sign [
+      hType sc_uint [
+        hLiteral 1 NOLIST
+      ]
+    ]
+  ]
   hTypedef bits_t_64_ [
     hTypeField tdata [
       hType sc_bv [
@@ -9488,20 +9505,3 @@
       ]
     ]
   ]
-  hTypedef fp_t_11_52_ [
-    hTypeField frac [
-      hType sc_uint [
-        hLiteral 52 NOLIST
-      ]
-    ]
-    hTypeField expo [
-      hType sc_uint [
-        hLiteral 11 NOLIST
-      ]
-    ]
-    hTypeField sign [
-      hType sc_uint [
-        hLiteral 1 NOLIST
-      ]
-    ]
-  ]
diff --git a/examples/llnl-examples/zfpsynth/zfp7/z7test_hdl.txt b/examples/llnl-examples/zfpsynth/zfp7/z7test_hdl.txt
@@ -9509,25 +9509,22 @@
       ]
     ]
   ]
-  hTypedef plane_reg_2_ [
-    hTypeField f [
-      hType bool NOLIST
-    ]
-    hTypeField w [
+  hTypedef fp_t_11_52_ [
+    hTypeField frac [
       hType sc_uint [
-        hLiteral 32 NOLIST
+        hLiteral 52 NOLIST
       ]
     ]
-  ]
-  hTypedef block_header_fp_t_11_52_ [
-    hTypeField zb [
-      hType bool NOLIST
-    ]
-    hTypeField exp [
+    hTypeField expo [
       hType sc_uint [
         hLiteral 11 NOLIST
       ]
     ]
+    hTypeField sign [
+      hType sc_uint [
+        hLiteral 1 NOLIST
+      ]
+    ]
   ]
   hTypedef bits_t_64_ [
     hTypeField tdata [
@@ -9539,20 +9536,23 @@
       hType bool NOLIST
     ]
   ]
-  hTypedef fp_t_11_52_ [
-    hTypeField frac [
-      hType sc_uint [
-        hLiteral 52 NOLIST
-      ]
+  hTypedef block_header_fp_t_11_52_ [
+    hTypeField zb [
+      hType bool NOLIST
     ]
-    hTypeField expo [
+    hTypeField exp [
       hType sc_uint [
         hLiteral 11 NOLIST
       ]
     ]
-    hTypeField sign [
+  ]
+  hTypedef plane_reg_2_ [
+    hTypeField f [
+      hType bool NOLIST
+    ]
+    hTypeField w [
       hType sc_uint [
-        hLiteral 1 NOLIST
+        hLiteral 32 NOLIST
       ]
     ]
   ]
diff --git a/tests/ClangArgs.h.in b/tests/ClangArgs.h.in
@@ -23,5 +23,5 @@ static std::vector<std::string> catch_test_args{
     "-I${LLVM_INSTALL_DIR}/include",
     "-I${LLVM_INSTALL_DIR}/lib/clang/${CLANG_VERSION}/include",
     "-I${SYSTEMC_DIR}/include/",
-    "-std=c++14"};
+    "-std=c++17"};
 };  // namespace systemc_clang