Remove ffts dep for Apple Silicon targets.

Disables OFDMDemodulator, SpectrogramFilter, and TDRStepDeEmbedFilter. Disables LPF in TestWaveformSource.
ngscopeclient · Sep 25, 2022 · 576eb21 · 576eb21
1 parent 8318e59
commit 576eb21
Show file tree

Hide file tree

Showing 19 changed files with 145 additions and 32 deletions.
diff --git a/scopeexports/CMakeLists.txt b/scopeexports/CMakeLists.txt
@@ -12,12 +12,18 @@ set(SCOPEEXPORTS_SOURCES
 add_library(scopeexports SHARED
 	${SCOPEEXPORTS_SOURCES})
 
-target_link_libraries(scopeexports
-	scopehal
-	${LIBFFTS_LIBRARIES})
-
-target_include_directories(scopeexports
-PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
-       ${LIBFFTS_INCLUDE_DIR})
+if(APPLE_SILICON)
+	target_link_libraries(scopeexports
+		scopehal)
+	target_include_directories(scopeexports
+	PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+else()
+	target_link_libraries(scopeexports
+		scopehal
+		${LIBFFTS_LIBRARIES})
+	target_include_directories(scopeexports
+	PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
+		${LIBFFTS_INCLUDE_DIR})
+endif()
 
 install(TARGETS scopeexports LIBRARY)
diff --git a/scopehal/CMakeLists.txt b/scopehal/CMakeLists.txt
@@ -170,6 +170,25 @@ target_link_libraries(scopehal
 	OSDependent
 	glfw
 	)
+elseif(APPLE_SILICON)
+target_link_libraries(scopehal
+	${SIGCXX_LIBRARIES}
+	${GTKMM_LIBRARIES}
+	xptools
+	log
+	graphwidget
+	${YAML_LIBRARIES}
+	${LXI_LIBRARIES}
+	${LINUXGPIB_LIBRARIES}
+	${WIN_LIBS}
+	${LIN_LIBS}
+	${OpenMP_CXX_LIBRARIES}
+	${Vulkan_LIBRARIES}
+	Vulkan::Vulkan
+	Vulkan::glslang
+	Vulkan::shaderc_combined
+	glfw
+	)
 else()
 target_link_libraries(scopehal
 	${SIGCXX_LIBRARIES}
@@ -192,18 +211,32 @@ target_link_libraries(scopehal
 	)
 endif()
 
-target_include_directories(scopehal
-PUBLIC
-	${CMAKE_CURRENT_SOURCE_DIR}
-	${CMAKE_CURRENT_BINARY_DIR}
-	${LIBFFTS_INCLUDE_DIR}
-	${YAML_INCLUDES}
-
-	# TODO: this needs to come from FindPackage etc
-	/usr/include/glslang/Include
-	# for macOS:
-	/usr/local/include/glslang/Include
-	)
+if(APPLE_SILICON)
+	target_include_directories(scopehal
+	PUBLIC
+		${CMAKE_CURRENT_SOURCE_DIR}
+		${CMAKE_CURRENT_BINARY_DIR}
+		${YAML_INCLUDES}
+
+		# TODO: this needs to come from FindPackage etc
+		/usr/include/glslang/Include
+		# for macOS:
+		/usr/local/include/glslang/Include
+		)
+else()
+	target_include_directories(scopehal
+	PUBLIC
+		${CMAKE_CURRENT_SOURCE_DIR}
+		${CMAKE_CURRENT_BINARY_DIR}
+		${LIBFFTS_INCLUDE_DIR}
+		${YAML_INCLUDES}
+
+		# TODO: this needs to come from FindPackage etc
+		/usr/include/glslang/Include
+		# for macOS:
+		/usr/local/include/glslang/Include
+		)
+endif()
 
 target_include_directories(scopehal
 PUBLIC SYSTEM

diff --git a/scopehal/TestWaveformSource.cpp b/scopehal/TestWaveformSource.cpp
@@ -43,6 +43,7 @@ using namespace std;
 TestWaveformSource::TestWaveformSource(minstd_rand& rng)
 	: m_rng(rng)
 {
+#ifndef _APPLE_SILICON
 	m_forwardPlan = NULL;
 	m_reversePlan = NULL;
 
@@ -52,10 +53,12 @@ TestWaveformSource::TestWaveformSource(minstd_rand& rng)
 	m_forwardInBuf = NULL;
 	m_forwardOutBuf = NULL;
 	m_reverseOutBuf = NULL;
+#endif
 }
 
 TestWaveformSource::~TestWaveformSource()
 {
+#ifndef _APPLE_SILICON
 	if(m_forwardPlan)
 		ffts_free(m_forwardPlan);
 	if(m_reversePlan)
@@ -70,6 +73,7 @@ TestWaveformSource::~TestWaveformSource()
 	m_forwardInBuf = NULL;
 	m_forwardOutBuf = NULL;
 	m_reverseOutBuf = NULL;
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -300,6 +304,8 @@ void TestWaveformSource::DegradeSerialData(
 	//RNGs
 	normal_distribution<> noise(0, noise_amplitude);
 
+	// ffts is not available on apple silicon, so for now we only apply noise there
+#ifndef _APPLE_SILICON
 	//Prepare for second pass: reallocate FFT buffer if sample depth changed
 	const size_t npoints = next_pow2(depth);
 	size_t nouts = npoints/2 + 1;
@@ -356,6 +362,7 @@ void TestWaveformSource::DegradeSerialData(
 	}
 
 	else
+#endif
 	{
 		for(size_t i=0; i<depth; i++)
 			cap->m_samples[i] += noise(m_rng);

diff --git a/scopehal/TestWaveformSource.h b/scopehal/TestWaveformSource.h
@@ -37,7 +37,9 @@
 #define TestWaveformSource_h
 
 #include "../scopehal/AlignedAllocator.h"
+#ifndef _APPLE_SILICON
 #include <ffts.h>
+#endif
 #include <random>
 
 /**
@@ -99,6 +101,7 @@ class TestWaveformSource
 protected:
 	std::minstd_rand& m_rng;
 
+#ifndef _APPLE_SILICON
 	//FFT stuff
 	AlignedAllocator<float, 32> m_allocator;
 	ffts_plan_t* m_forwardPlan;
@@ -109,6 +112,7 @@ class TestWaveformSource
 	float* m_forwardInBuf;
 	float* m_forwardOutBuf;
 	float* m_reverseOutBuf;
+#endif
 };
 
 #endif
diff --git a/scopeprotocols/CMakeLists.txt b/scopeprotocols/CMakeLists.txt
@@ -164,15 +164,23 @@ set(SCOPEPROTOCOLS_SOURCES
 add_library(scopeprotocols SHARED
 	${SCOPEPROTOCOLS_SOURCES})
 
-target_link_libraries(scopeprotocols
-	scopehal
-	${LIBFFTS_LIBRARIES}
-	)
-
-target_include_directories(scopeprotocols
-PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
-       ${LIBFFTS_INCLUDE_DIR}
-       )
+if(APPLE_SILICON)
+	target_link_libraries(scopeprotocols
+		scopehal
+		)
+	target_include_directories(scopeprotocols
+	PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
+		)
+else()
+	target_link_libraries(scopeprotocols
+		scopehal
+		${LIBFFTS_LIBRARIES}
+		)
+	target_include_directories(scopeprotocols
+	PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
+		${LIBFFTS_INCLUDE_DIR}
+		)
+endif()
 
 # Setup for vkfft
 target_compile_definitions(scopeprotocols PUBLIC -DVK_API_VERSION=10 -DVKFFT_BACKEND=0)

diff --git a/scopeprotocols/CTLEFilter.cpp b/scopeprotocols/CTLEFilter.cpp
@@ -29,7 +29,6 @@
 
 #include "../scopehal/scopehal.h"
 #include "CTLEFilter.h"
-#include <ffts.h>
 #include <complex>
 
 using namespace std;
@@ -141,4 +140,3 @@ void CTLEFilter::Refresh(vk::raii::CommandBuffer& cmdBuf, vk::raii::Queue& queue
 	//Do the actual refresh operation
 	DoRefresh(false, cmdBuf, queue);
 }
-
diff --git a/scopeprotocols/ChannelEmulationFilter.cpp b/scopeprotocols/ChannelEmulationFilter.cpp
@@ -29,7 +29,6 @@
 
 #include "../scopehal/scopehal.h"
 #include "ChannelEmulationFilter.h"
-#include <ffts.h>
 
 using namespace std;
 

diff --git a/scopeprotocols/DeEmbedFilter.cpp b/scopeprotocols/DeEmbedFilter.cpp
@@ -65,8 +65,10 @@ DeEmbedFilter::DeEmbedFilter(const string& color)
 
 	m_cachedBinSize = 0;
 
+#ifndef _APPLE_SILICON
 	m_forwardPlan = NULL;
 	m_reversePlan = NULL;
+#endif
 
 	m_cachedNumPoints = 0;
 	m_cachedMaxGain = 0;
@@ -84,13 +86,15 @@ DeEmbedFilter::DeEmbedFilter(const string& color)
 
 DeEmbedFilter::~DeEmbedFilter()
 {
+#ifndef _APPLE_SILICON
 	if(m_forwardPlan)
 		ffts_free(m_forwardPlan);
 	if(m_reversePlan)
 		ffts_free(m_reversePlan);
 
 	m_forwardPlan = NULL;
 	m_reversePlan = NULL;
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -190,6 +194,7 @@ void DeEmbedFilter::DoRefresh(bool invert, vk::raii::CommandBuffer& cmdBuf, vk::
 	bool sizechange = false;
 	if(m_cachedNumPoints != npoints)
 	{
+	#ifndef _APPLE_SILICON
 		//Delete old FFTS plan objects
 		if(m_forwardPlan)
 		{
@@ -201,6 +206,7 @@ void DeEmbedFilter::DoRefresh(bool invert, vk::raii::CommandBuffer& cmdBuf, vk::
 			ffts_free(m_reversePlan);
 			m_reversePlan = nullptr;
 		}
+	#endif
 
 		m_forwardInBuf.resize(npoints);
 		m_forwardOutBuf.resize(2 * nouts);
@@ -213,8 +219,12 @@ void DeEmbedFilter::DoRefresh(bool invert, vk::raii::CommandBuffer& cmdBuf, vk::
 		//(save time, don't make FFTS plans if using vkFFT)
 		if(!g_gpuFilterEnabled)
 		{
+		#ifdef _APPLE_SILICON
+			LogFatal("DeEmbedFilter CPU fallback not available on Apple Silicon");
+		#else
 			m_forwardPlan = ffts_init_1d_real(npoints, FFTS_FORWARD);
 			m_reversePlan = ffts_init_1d_real(npoints, FFTS_BACKWARD);
+		#endif
 		}
 	}
 
@@ -353,6 +363,9 @@ void DeEmbedFilter::DoRefresh(bool invert, vk::raii::CommandBuffer& cmdBuf, vk::
 		cap->MarkModifiedFromGpu();
 	}
 	else
+	#ifdef _APPLE_SILICON
+		LogFatal("DeEmbedFilter CPU fallback not available on Apple Silicon");
+	#else
 	{
 		din->PrepareForCpuAccess();
 		m_forwardInBuf.PrepareForCpuAccess();
@@ -385,6 +398,7 @@ void DeEmbedFilter::DoRefresh(bool invert, vk::raii::CommandBuffer& cmdBuf, vk::
 
 		cap->MarkModifiedFromCpu();
 	}
+	#endif
 }
 
 /**

diff --git a/scopeprotocols/DeEmbedFilter.h b/scopeprotocols/DeEmbedFilter.h
@@ -81,8 +81,10 @@ class DeEmbedFilter : public Filter
 	AcceleratorBuffer<float> m_resampledSparamSines;
 	AcceleratorBuffer<float> m_resampledSparamCosines;
 
+#ifndef _APPLE_SILICON
 	ffts_plan_t* m_forwardPlan;
 	ffts_plan_t* m_reversePlan;
+#endif
 	size_t m_cachedNumPoints;
 
 	AcceleratorBuffer<float> m_forwardInBuf;

diff --git a/scopeprotocols/EnhancedResolutionFilter.cpp b/scopeprotocols/EnhancedResolutionFilter.cpp
@@ -29,7 +29,6 @@
 
 #include "../scopehal/scopehal.h"
 #include "EnhancedResolutionFilter.h"
-#include <ffts.h>
 
 using namespace std;
 

diff --git a/scopeprotocols/FFTFilter.cpp b/scopeprotocols/FFTFilter.cpp
@@ -58,7 +58,9 @@ FFTFilter::FFTFilter(const string& color)
 
 	m_cachedNumPoints = 0;
 	m_cachedNumPointsFFT = 0;
+#ifndef _APPLE_SILICON
 	m_plan = NULL;
+#endif
 
 	//Default config
 	m_range = 70;
@@ -81,8 +83,10 @@ FFTFilter::FFTFilter(const string& color)
 
 FFTFilter::~FFTFilter()
 {
+#ifndef _APPLE_SILICON
 	if(m_plan)
 		ffts_free(m_plan);
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -144,6 +148,7 @@ void FFTFilter::ReallocateBuffers(size_t npoints_raw, size_t npoints, size_t nou
 	{
 		m_cachedNumPointsFFT = npoints;
 
+	#ifndef _APPLE_SILICON
 		if(g_gpuFilterEnabled)
 			m_plan = nullptr;
 
@@ -159,6 +164,10 @@ void FFTFilter::ReallocateBuffers(size_t npoints_raw, size_t npoints, size_t nou
 			m_rdoutbuf.SetCpuAccessHint(AcceleratorBuffer<float>::HINT_LIKELY);
 			m_rdoutbuf.SetGpuAccessHint(AcceleratorBuffer<float>::HINT_NEVER);
 		}
+	#else
+		if(!g_gpuFilterEnabled)
+			LogFatal("FFTFilter cpu fallback not available on Apple Silicon (yet?)");
+	#endif
 	}
 
 	//Update our FFT plan if it's out of date
@@ -339,6 +348,9 @@ void FFTFilter::DoRefresh(
 		cap->MarkModifiedFromGpu();
 	}
 	else
+	#ifdef _APPLE_SILICON
+		LogFatal("FFTFilter cpu fallback not available on Apple Silicon (yet?)");
+	#else
 	{
 		data.PrepareForCpuAccess();
 		m_rdinbuf.PrepareForCpuAccess();
@@ -379,6 +391,7 @@ void FFTFilter::DoRefresh(
 
 		cap->MarkModifiedFromCpu();
 	}
+	#endif
 
 	//Peak search
 	FindPeaks(cap);

diff --git a/scopeprotocols/FFTFilter.h b/scopeprotocols/FFTFilter.h
@@ -35,7 +35,9 @@
 #ifndef FFTFilter_h
 #define FFTFilter_h
 
+#ifndef _APPLE_SILICON
 #include <ffts.h>
+#endif
 
 #ifdef HAVE_CLFFT
 #include <clFFT.h>
@@ -130,7 +132,9 @@ class FFTFilter : public PeakDetectionFilter
 	size_t m_cachedNumPointsFFT;
 	AcceleratorBuffer<float> m_rdinbuf;
 	AcceleratorBuffer<float> m_rdoutbuf;
+#ifndef _APPLE_SILICON
 	ffts_plan_t* m_plan;
+#endif
 
 	float m_range;
 	float m_offset;