From a820ba0c3e01866c359c2aa4f2adda92ccf09f40 Mon Sep 17 00:00:00 2001
From: Michael Kuron <mkuron@icp.uni-stuttgart.de>
Date: Mon, 22 Feb 2021 21:34:32 +0100
Subject: [PATCH] Apple ARM64 support
---
apps/benchmarks/PhaseFieldAllenCahn/multiphase_codegen.py | 2 +-
apps/showcases/PhaseFieldAllenCahn/CPU/multiphase_codegen.py | 2 +-
tests/lbm/codegen/GeneratedOutflowBC.py | 2 --
tests/simd/CMakeLists.txt | 2 +-
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/apps/benchmarks/PhaseFieldAllenCahn/multiphase_codegen.py b/apps/benchmarks/PhaseFieldAllenCahn/multiphase_codegen.py
index 999f76d3c..a751f35a4 100644
--- a/apps/benchmarks/PhaseFieldAllenCahn/multiphase_codegen.py
+++ b/apps/benchmarks/PhaseFieldAllenCahn/multiphase_codegen.py
@@ -137,7 +137,7 @@ stream_hydro = create_lb_update_rule(stencil=stencil_hydro,
# GENERATE SWEEPS #
###################
-cpu_vec = {'instruction_set': 'sse', 'assume_inner_stride_one': True, 'nontemporal': True}
+cpu_vec = {'assume_inner_stride_one': True, 'nontemporal': True}
vp = [('int32_t', 'cudaBlockSize0'),
('int32_t', 'cudaBlockSize1')]
diff --git a/apps/showcases/PhaseFieldAllenCahn/CPU/multiphase_codegen.py b/apps/showcases/PhaseFieldAllenCahn/CPU/multiphase_codegen.py
index 497e00299..5621212eb 100644
--- a/apps/showcases/PhaseFieldAllenCahn/CPU/multiphase_codegen.py
+++ b/apps/showcases/PhaseFieldAllenCahn/CPU/multiphase_codegen.py
@@ -150,7 +150,7 @@ stream_hydro = create_lb_update_rule(stencil=stencil_hydro,
###################
# GENERATE SWEEPS #
###################
-cpu_vec = {'instruction_set': 'sse', 'assume_inner_stride_one': True, 'nontemporal': True}
+cpu_vec = {'assume_inner_stride_one': True, 'nontemporal': True}
vp = [('int32_t', 'cudaBlockSize0'),
('int32_t', 'cudaBlockSize1')]
diff --git a/tests/lbm/codegen/GeneratedOutflowBC.py b/tests/lbm/codegen/GeneratedOutflowBC.py
index 59a916fec..c3d4fc985 100644
--- a/tests/lbm/codegen/GeneratedOutflowBC.py
+++ b/tests/lbm/codegen/GeneratedOutflowBC.py
@@ -40,8 +40,6 @@ method = create_lb_method(**options)
setter_assignments = macroscopic_values_setter(method, velocity=velocity_field.center_vector,
pdfs=pdfs, density=1)
-# opt = {'instruction_set': 'sse', 'assume_aligned': True, 'nontemporal': False, 'assume_inner_stride_one': True}
-
update_rule = create_lb_update_rule(lb_method=method, **options)
info_header = f"""
diff --git a/tests/simd/CMakeLists.txt b/tests/simd/CMakeLists.txt
index 6fa07c3c5..843dd9315 100644
--- a/tests/simd/CMakeLists.txt
+++ b/tests/simd/CMakeLists.txt
@@ -8,7 +8,7 @@
# builds the test
-if ( WALBERLA_CXX_COMPILER_IS_GNU OR WALBERLA_CXX_COMPILER_IS_CLANG )
+if ( WALBERLA_CXX_COMPILER_IS_GNU OR (WALBERLA_CXX_COMPILER_IS_CLANG AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")) )
set( MarchNativeString "-march=native" )
endif()
--
GitLab