Added compatibility

Author: stevenewald

CMakeLists.txt

@@ -14,7 +14,7 @@ include(cmake/project-is-top-level.cmake)
 include(cmake/variables.cmake)
 
 set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -mavx512f -mavx512dq -mavx512vl -mavx512bf16")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
 # add_compile_options(-fno-inline -fno-omit-frame-pointer)
 
 
@@ -27,11 +27,21 @@ add_library(
     source/mandelbrot/mandelbrot_window.cpp
     source/graphics/color_conversions/color_conversions.cpp
     source/graphics/aspect_ratio/aspect_ratio.cpp
-    source/mandelbrot/equations_simd.cpp
-    source/mandelbrot/equations.cpp
     source/units/coordinates.cpp
 )
 
+include(CheckCXXCompilerFlag)
+check_cxx_compiler_flag("-mavx512f -mavx512dq -mavx512vl -mavx512bf16" HAS_AVX512)
+
+if (HAS_ALL_AVX512)
+    message(STATUS "AVX-512 is supported by the compiler.")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx512f -mavx512dq -mavx512vl -mavx512bf16")
+	target_sources(fractal-generator_lib PRIVATE source/mandelbrot/equations_simd.cpp)
+else()
+    message(STATUS "AVX-512 is not fully supported by the compiler. AVX-512 will not be enabled.")
+	target_sources(fractal-generator_lib PRIVATE source/mandelbrot/equations_compat.cpp)
+endif()
+
 target_include_directories(
     fractal-generator_lib ${warning_guard}
     PUBLIC

Taskfile.yml

@@ -2,8 +2,8 @@ version: '3'
 
 vars:
   NAME: fractal-generator
-  RELEASE_BUILD: "false"
-  RELEASE_PRESET: "ci-ubuntu"
+  RELEASE_BUILD: "true"
+  RELEASE_PRESET: "ci-macos"
 
 tasks:
   deps:
@@ -18,7 +18,7 @@ tasks:
       - test -f CMakeUserPresets.json
     cmds:
       - cmake --preset=dev
-      - cmake --preset={{.RELEASE_PRESET}}
+      - cmake --preset={{.RELEASE_PRESET}} -DCMAKE_BUILD_TYPE=Release
 
 
   build:

benchmark/source/bench.cpp

@@ -2,34 +2,13 @@
 #include "units/coordinates.hpp"
 #include "graphics/display_to_complex.hpp"
 #include "mandelbrot/equations.hpp"
-#include "mandelbrot/equations_simd.hpp"
+#include "mandelbrot/equations.hpp"
 #include "units/units.hpp"
 
 #include <benchmark/benchmark.h>
 
 using namespace fractal;
 
-static void BM_GenerateMandelbrot(benchmark::State& state)
-{
-    DisplayDomain display = {
-        {0,   0  },
-        {800, 800}
-    };
-    complex_domain complex = START_COMPLEX_DOMAIN;
-    DisplayToComplexCoordinates t{display, complex};
-
-    std::int64_t prox = 0;
-    for (auto _ : state) {
-        for (auto it = display.begin(); it != display.end(); it += 1) {
-            benchmark::DoNotOptimize(
-                compute_iterations({}, t.to_complex_projection(*it), 100)
-            );
-        }
-        prox += display.size();
-    }
-    state.SetItemsProcessed(prox);
-}
-
 static void BM_GenerateMandelbrotSimd(benchmark::State& state)
 {
     DisplayDomain display = {
@@ -52,6 +31,5 @@ static void BM_GenerateMandelbrotSimd(benchmark::State& state)
     state.SetItemsProcessed(prox);
 }
 
-BENCHMARK(BM_GenerateMandelbrot)->Arg(0);
 BENCHMARK(BM_GenerateMandelbrotSimd)->Arg(0);
 // BENCHMARK(BM_GenerateMandelbrotSimd)->Arg(100000);

source/config.hpp

@@ -7,8 +7,8 @@
 
 namespace fractal {
 
-constexpr std::size_t WINDOW_WIDTH = 800UZ * 2;
-constexpr std::size_t WINDOW_HEIGHT = 600UZ * 2;
+constexpr std::size_t WINDOW_WIDTH = 800UZ;
+constexpr std::size_t WINDOW_HEIGHT = 600UZ;
 constexpr std::size_t FRAME_RATE = 60UZ;
 
 constexpr complex_domain START_COMPLEX_DOMAIN{

source/mandelbrot/equations.cpp

@@ -1,16 +1,10 @@
 #pragma once
 
-#include "units/units.hpp"
-
-#include <complex>
+#include "units/units_avx.hpp"
 
 namespace fractal {
-// https://en.wikipedia.org/wiki/Mandelbrot_set#Formal_definition
-std::complex<complex_underlying>
-step(std::complex<complex_underlying> z_n, std::complex<complex_underlying> constant);
 
-iteration_count compute_iterations(
-    std::complex<complex_underlying> z_0, std::complex<complex_underlying> constant,
-    iteration_count max_iters
+std::array<iteration_count, 8> compute_iterations(
+    const avx512_complex& z_0, const avx512_complex& constant, iteration_count max_iters
 );
 } // namespace fractal

source/mandelbrot/equations.hpp

@@ -0,0 +1,32 @@
+#include "config.hpp"
+#include "equations.hpp"
+
+namespace fractal {
+std::complex<complex_underlying>
+step(std::complex<complex_underlying> z_n, std::complex<complex_underlying> constant)
+{
+    return z_n * z_n + constant;
+}
+
+std::array<iteration_count, 8> compute_iterations(
+    const avx512_complex& z_0, const avx512_complex& constant, iteration_count max_iters
+)
+{
+    std::array<iteration_count, 8> ret{};
+
+    for (uint8_t i = 0; i < 8; i++) {
+        iteration_count iterations = 0;
+        std::complex<complex_underlying> z_n = {z_0.real[i], z_0.imaginary[i]};
+        std::complex<complex_underlying> constant_n = {
+            constant.real[i], constant.imaginary[i]
+        };
+        while (iterations < max_iters && std::norm(z_n) < MANDELBROT_DIVERGENCE_NORM) {
+            z_n = step(z_n, constant_n);
+            ++iterations;
+        }
+        ret[i] = iterations;
+    }
+
+    return ret;
+}
+} // namespace fractal

source/mandelbrot/equations_compat.cpp

@@ -1,4 +1,5 @@
 #include "config.hpp"
+#include "equations.hpp"
 #include "units/units.hpp"
 #include "units/units_avx.hpp"
 

source/mandelbrot/equations_simd.cpp

@@ -1,13 +1,12 @@
 #include "mandelbrot_window.hpp"
 
 #include "config.hpp"
-#include "equations_simd.hpp"
+#include "equations.hpp"
 #include "graphics/display_to_complex.hpp"
 #include "units/coordinates.hpp"
 #include "units/units.hpp"
 
 #include <fmt/format.h>
-#include <immintrin.h>
 #include <SFML/Graphics/Drawable.hpp>
 #include <SFML/Graphics/Image.hpp>
 #include <SFML/Graphics/Sprite.hpp>
@@ -90,7 +89,8 @@ MandelbrotWindow::arr MandelbrotWindow::calculate_(
 
 MandelbrotWindow::MandelbrotWindow(
     const DisplayDomain& display_domain, const complex_domain& complex_domain
-) : to_complex_{display_domain, complex_domain}
+) :
+    to_complex_{display_domain, complex_domain}
 {}
 
 } // namespace fractal