Skip to content

Build on M1 #2119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 6, 2022
Merged

Build on M1 #2119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97244e7
Build on M1
meme Aug 7, 2022
49797b3
Merge branch 'master' into m1
vaughnbetz Sep 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions abc/src/misc/util/abc_global.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@
#endif
#endif

#ifdef __APPLE__
#define ABC_USE_STDINT_H
#endif

#include "abc_namespaces.h"

////////////////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/FindTBB.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ if(NOT TBB_FOUND)
# Find TBB components
##################################

if(TBB_VERSION VERSION_LESS 4.3)
if(TBB_VERSION VERSION_LESS 4.3 AND NOT TBB_VERSION_MAJOR STREQUAL 2020)
set(TBB_SEARCH_COMPOMPONENTS tbb_preview tbbmalloc tbb)
else()
set(TBB_SEARCH_COMPOMPONENTS tbb_preview tbbmalloc_proxy tbbmalloc tbb)
Expand Down
2 changes: 1 addition & 1 deletion libs/EXTERNAL/libtatum/cmake/modules/FindTBB.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ if(NOT TBB_FOUND)
# Find TBB components
##################################

if(TBB_VERSION VERSION_LESS 4.3)
if(TBB_VERSION VERSION_LESS 4.3 AND NOT TBB_VERSION_MAJOR STREQUAL 2020)
set(TBB_SEARCH_COMPOMPONENTS tbb_preview tbbmalloc tbb)
else()
set(TBB_SEARCH_COMPOMPONENTS tbb_preview tbbmalloc_proxy tbbmalloc tbb)
Expand Down
2 changes: 1 addition & 1 deletion libs/EXTERNAL/libtatum/libtatum/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ if (TATUM_USE_EXECUTION_ENGINE STREQUAL "tbb")

target_compile_definitions(libtatum PUBLIC TATUM_USE_TBB)
target_link_libraries(libtatum tbb)
target_link_libraries(libtatum tbbmalloc_proxy) #Use the scalable memory allocator
target_link_libraries(libtatum ${TBB_tbbmalloc_proxy_LIBRARY}) #Use the scalable memory allocator

elseif (TATUM_USE_EXECUTION_ENGINE STREQUAL "serial")
#Nothing to do
Expand Down
1 change: 1 addition & 0 deletions libs/libarchfpga/src/arch_check.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <set>
#include <sstream>

#include "vtr_log.h"
#include "arch_error.h"
Expand Down
1 change: 1 addition & 0 deletions libs/libarchfpga/src/read_fpga_interchange_arch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <string>
#include <string.h>
#include <zlib.h>
#include <sstream>

#include "vtr_assert.h"
#include "vtr_digest.h"
Expand Down
2 changes: 2 additions & 0 deletions libs/libvqm/vqm_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@

#include <assert.h>
#include <stdio.h>
#ifndef __APPLE__
#include <malloc.h>
#endif
#include <string.h>
#include <stdint.h>
#include "vqm_dll.h"
Expand Down
2 changes: 2 additions & 0 deletions libs/libvqm/vqm_dll.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,9 @@


#include <stdio.h>
#ifndef __APPLE__
#include <malloc.h>
#endif


/*****************************************************/
Expand Down
2 changes: 2 additions & 0 deletions libs/libvqm/vqm_parser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
#include <stdlib.h>
#include <stdint.h>
//#include <crtdbg.h>
#ifndef __APPLE__
#include <malloc.h>
#endif
#include <string.h>
#include <assert.h>
#include "vqm_dll.h"
Expand Down
2 changes: 1 addition & 1 deletion utils/vqm2blif/src/base/preprocess.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ typedef struct s_split_inout_pin {


struct cmp_str {
bool operator()(char const* a, char const* b) {
bool operator()(char const* a, char const* b) const {
return strcmp(a, b) < 0;
}
};
Expand Down
2 changes: 1 addition & 1 deletion vpr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ endif()
if (VPR_USE_EXECUTION_ENGINE STREQUAL "tbb")
target_compile_definitions(libvpr PRIVATE VPR_USE_TBB)
target_link_libraries(libvpr tbb)
target_link_libraries(libvpr tbbmalloc_proxy) #Use the scalable memory allocator
target_link_libraries(libvpr ${TBB_tbbmalloc_proxy_LIBRARY}) #Use the scalable memory allocator
message(STATUS "VPR: will support parallel execution using '${VPR_USE_EXECUTION_ENGINE}'")
elseif(VPR_USE_EXECUTION_ENGINE STREQUAL "serial")
message(STATUS "VPR: will only support serial execution")
Expand Down
1 change: 1 addition & 0 deletions vpr/src/base/read_interchange_netlist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <unordered_set>
#include <zlib.h>
#include <iostream>
#include <sstream>

#include "LogicalNetlist.capnp.h"
#include "capnp/serialize.h"
Expand Down