[cmake] Add M1 to BUILD_PRESET, more proper tuning

Signed-off-by: lizzie <lizzie@eden-emu.dev>

CMakeLists.txt

@@ -322,47 +322,42 @@ endif()
 
 # Build/optimization presets
 if (CXX_GCC OR CXX_CLANG)
-    if (ARCHITECTURE_x86_64)
+    # GCC/clang will -mtune=generic by default
+    if ("${YUZU_BUILD_PRESET}" STREQUAL "native")
+        add_compile_options(
+            $<$<COMPILE_LANGUAGE:C,CXX>:-march=native>
+            $<$<COMPILE_LANGUAGE:C,CXX>:-mtune=native>)
+    elseif (ARCHITECTURE_x86_64)
         # See https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html
         # Generic supports Pentium Pro instruction set and above
         # TODO: if a value is unknown, pass that as march and mtune
         set(YUZU_BUILD_PRESET "custom" CACHE STRING "Build preset to use. One of: custom, generic, v3, zen2, zen4, native")
-
         if (${YUZU_BUILD_PRESET} STREQUAL "generic")
-            set(march x86-64)
-            set(mtune generic)
+            add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-march=x86-64>)
         elseif (${YUZU_BUILD_PRESET} STREQUAL "v3")
-            set(march x86-64-v3)
-            set(mtune generic)
+            add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-march=x86-64-v3>)
         elseif (${YUZU_BUILD_PRESET} STREQUAL "zen2")
-            set(march znver2)
-            set(mtune znver2)
+            add_compile_options(
+                $<$<COMPILE_LANGUAGE:C,CXX>:-march=znver2>
+                $<$<COMPILE_LANGUAGE:C,CXX>:-mtune=znver4>)
         elseif (${YUZU_BUILD_PRESET} STREQUAL "zen4")
-            set(march znver4)
-            set(mtune znver4)
+            add_compile_options(
+                $<$<COMPILE_LANGUAGE:C,CXX>:-march=znver4>
+                $<$<COMPILE_LANGUAGE:C,CXX>:-mtune=znver4>)
         endif()
     elseif(ARCHITECTURE_arm64)
         # See https://gcc.gnu.org/onlinedocs/gcc/AArch64-Options.html
-        set(YUZU_BUILD_PRESET "custom" CACHE STRING "Build preset to use. One of: custom, generic, optimized, armv9, native")
-        set(mtune generic)
+        set(YUZU_BUILD_PRESET "custom" CACHE STRING "Build preset to use. One of: custom, generic, optimized, armv9, m1, native")
         if (${YUZU_BUILD_PRESET} STREQUAL "generic")
-            set(march armv8-a)
+            add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-march=armv8-a>)
         elseif (${YUZU_BUILD_PRESET} STREQUAL "optimized")
-            set(march armv8.2-a+lse+rcpc)
+            add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-march=armv8.2-a+lse+rcpc>)
         elseif (${YUZU_BUILD_PRESET} STREQUAL "armv9")
-            set(march armv9-a)
+            add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-march=armv9-a>)
+        elseif (${YUZU_BUILD_PRESET} STREQUAL "m1")
+            add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-mcpu=apple-m1>)
         endif()
     endif()
-
-    if ("${YUZU_BUILD_PRESET}" STREQUAL "native")
-        set(march native)
-        set(mtune native)
-    endif()
-
-    if (DEFINED march AND DEFINED mtune)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${march} -mtune=${mtune}")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=${march} -mtune=${mtune}")
-    endif()
 endif()
 
 # Configure C++ standard

src/dynarmic/tests/A64/a64.cpp

@@ -2632,66 +2632,3 @@ TEST_CASE("A64: Rounding", "[a64]") {
     CHECK(jit.GetVector(5) == Vector{0x4000000040000000, 0x4000000040000000});
     CHECK(jit.GetVector(6) == Vector{0x4000000040000000, 0x4000000040000000});
 }
-
-TEST_CASE("A64: SM4", "[a64]") {
-    A64TestEnv env;
-    A64::UserConfig jit_user_config{};
-    jit_user_config.callbacks = &env;
-    A64::Jit jit{jit_user_config};
-
-    oaknut::VectorCodeGenerator code{env.code_mem, nullptr};
-
-    code.SM4EKEY(V4.S4(), V0.S4(), V1.S4());
-    code.SM4E(V5.S4(), V0.S4(), V1.S4());
-
-    jit.SetPC(0);
-    jit.SetVector(0, {0xefcdab8967452301, 0x1032547698badcfe});
-    jit.SetVector(1, {0xefcdab8967452301, 0x1032547698badcfe});
-    env.ticks_left = env.code_mem.size();
-    CheckedRun([&]() { jit.Run(); });
-
-    CHECK(jit.GetVector(4) == Vector{0x486a0c2e00224466, 0x5c7e183a62402604});
-    CHECK(jit.GetVector(5) == Vector{0xc2e086a43c1e785a, 0xd7f593b104264062});
-}
-
-TEST_CASE("A64: SM3", "[a64]") {
-    A64TestEnv env;
-    A64::UserConfig jit_user_config{};
-    jit_user_config.callbacks = &env;
-    SECTION("SM3SS1") {
-        A64::Jit jit{jit_user_config};
-        oaknut::VectorCodeGenerator code{env.code_mem, nullptr};
-        code.SM3SS1(V0.S4(), V0.S4(), V1.S4(), V2.S4());
-        jit.SetPC(0);
-        jit.SetVector(0, {0xec4aff517369c667, 0x46e3fbf2abbacd29});
-        jit.SetVector(1, {0x8de7e81bf854c27c, 0x9ac99f33632e5a76});
-        jit.SetVector(2, {0x5aa35831b70d3266, 0xd45ee95817055d25});
-        env.ticks_left = env.code_mem.size();
-        CheckedRun([&]() { jit.Run(); });
-        CHECK(jit.GetVector(0) == Vector{0x0000000000000000, 0x73d67cd700000000});
-    }
-    SECTION("SM3PARTW1") {
-        A64::Jit jit{jit_user_config};
-        oaknut::VectorCodeGenerator code{env.code_mem, nullptr};
-        code.SM3PARTW1(V0.S4(), V0.S4(), V1.S4(), V2.S4());
-        jit.SetPC(0);
-        jit.SetVector(0, {0xec4aff517369c667, 0x46e3fbf2abbacd29});
-        jit.SetVector(1, {0x8de7e81bf854c27c, 0x9ac99f33632e5a76});
-        jit.SetVector(2, {0x5aa35831b70d3266, 0xd45ee95817055d25});
-        env.ticks_left = env.code_mem.size();
-        CheckedRun([&]() { jit.Run(); });
-        CHECK(jit.GetVector(0) == Vector{0x653c64995693280c, 0xabcc7db97adebf12});
-    }
-    SECTION("SM3PARTW2") {
-        A64::Jit jit{jit_user_config};
-        oaknut::VectorCodeGenerator code{env.code_mem, nullptr};
-        code.SM3PARTW2(V0.S4(), V0.S4(), V1.S4(), V2.S4());
-        jit.SetPC(0);
-        jit.SetVector(0, {0xec4aff517369c667, 0x46e3fbf2abbacd29});
-        jit.SetVector(1, {0x8de7e81bf854c27c, 0x9ac99f33632e5a76});
-        jit.SetVector(2, {0x5aa35831b70d3266, 0xd45ee95817055d25});
-        env.ticks_left = env.code_mem.size();
-        CheckedRun([&]() { jit.Run(); });
-        CHECK(jit.GetVector(0) == Vector{0x30010fe70da43740, 0x6702425b4a3a05d4});
-    }
-}