From c06d4f477acbddcff34db5f3961c79746ee86ded Mon Sep 17 00:00:00 2001 From: rayanHappy Date: Thu, 27 Apr 2023 05:24:17 +0300 Subject: [PATCH] Misc: remove unneeded file and clean up a 32bit check --- cmake/ApiValidation.cmake | 113 ------------------------------------- cmake/FindVtune.cmake | 22 ++------ cmake/SearchForStuff.cmake | 13 +---- 3 files changed, 7 insertions(+), 141 deletions(-) delete mode 100644 cmake/ApiValidation.cmake diff --git a/cmake/ApiValidation.cmake b/cmake/ApiValidation.cmake deleted file mode 100644 index 69451b7db..000000000 --- a/cmake/ApiValidation.cmake +++ /dev/null @@ -1,113 +0,0 @@ -set(wx_sdl_c_code " -#include - -#if (wxUSE_LIBSDL == 0) -#error cmake_WX_SDL -#endif - -int main() -{ - return 0; -} -") - -set(gcc7_mmx_code " -#include -#include -#include -#include - -class alignas(16) GSVector4i -{ -public: - __m128i m; - - explicit GSVector4i(__m128i m) - { - this->m = m; - } - - static void storel(void* p, const GSVector4i& v) - { - _mm_storel_epi64((__m128i*)p, v.m); - } - - static GSVector4i loadl(const void* p) - { - return GSVector4i(_mm_loadl_epi64((__m128i*)p)); - } - - bool eq(const GSVector4i& v) const - { - return _mm_movemask_epi8(_mm_cmpeq_epi32(m, v.m)) == 0xffff; - } -}; - - -union GIFRegTRXPOS -{ - unsigned long long u64; - void operator = (const GSVector4i& v) {GSVector4i::storel(this, v);} - bool operator != (const union GIFRegTRXPOS& r) const {return !((GSVector4i)r).eq(*this);} - operator GSVector4i() const {return GSVector4i::loadl(this);} -}; - -extern GIFRegTRXPOS TRXPOS; -GIFRegTRXPOS TRXPOS = {}; - -void GIFRegHandlerTRXPOS(const GIFRegTRXPOS& p) -{ - if(p != TRXPOS) - { - printf(\"foo\"); - } - - TRXPOS = (GSVector4i)p; -} - -int main() -{ - GIFRegTRXPOS r = {}; - GIFRegHandlerTRXPOS(r); - - uint16_t fpu[16] = {0}; - __asm__ __volatile__(\"fstenv %0\" : \"=m\"(fpu)); - - bool ok = fpu[4] == 0xFFFF; - - if (!ok) { - printf(\"Wrong MMX state !\"); - exit(1); - } - - return 0; -} -") - -function(GCC7_BUG) - # try_run doesn't work when cross-compiling is enabled. It is completely silly in our case - # as i386 binaries are 100% fine on x64. - set(OLD_CMAKE_CROSSCOMPILING ${CMAKE_CROSSCOMPILING}) - set(CMAKE_CROSSCOMPILING 0) - - set(IN "${CMAKE_BINARY_DIR}/gcc7_mmx.cpp") - file(WRITE "${IN}" "${gcc7_mmx_code}") - - enable_language(CXX) - - try_run( - run_result - compile_result_unused - "${CMAKE_BINARY_DIR}" - "${IN}" - CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=-msse -msse2 -O2 -m32 -march=i686" - ) - - if (${run_result}) - message(FATAL_ERROR "GCC 7.0/7.1 generates invalid code => https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80799\n" - "You can either backport the fix or swith to another version of GCC.") - endif() - - set(CMAKE_CROSSCOMPILING ${OLD_CMAKE_CROSSCOMPILING}) - -endfunction() diff --git a/cmake/FindVtune.cmake b/cmake/FindVtune.cmake index 4d8a9ebf5..e3327f2cd 100644 --- a/cmake/FindVtune.cmake +++ b/cmake/FindVtune.cmake @@ -12,21 +12,12 @@ find_path(VTUNE_INCLUDE_DIRS NAMES jitprofiling.h PATHS /opt/intel/vtune_amplifier_xe_2016/include ) -if(${PCSX2_TARGET_ARCHITECTURES} MATCHES "i386") - find_library(VTUNE_LIBRARIES NAMES libjitprofiling.a PATHS - /opt/intel/oneapi/vtune/latest/lib32 - /opt/intel/vtune_amplifier_xe_2018/lib32 - /opt/intel/vtune_amplifier_xe_2017/lib32 - /opt/intel/vtune_amplifier_xe_2016/lib32 - ) -else() - find_library(VTUNE_LIBRARIES NAMES libjitprofiling.a PATHS - /opt/intel/oneapi/vtune/latest/lib64 - /opt/intel/vtune_amplifier_xe_2018/lib64 - /opt/intel/vtune_amplifier_xe_2017/lib64 - /opt/intel/vtune_amplifier_xe_2016/lib64 - ) -endif() +find_library(VTUNE_LIBRARIES NAMES libjitprofiling.a PATHS + /opt/intel/oneapi/vtune/latest/lib64 + /opt/intel/vtune_amplifier_xe_2018/lib64 + /opt/intel/vtune_amplifier_xe_2017/lib64 + /opt/intel/vtune_amplifier_xe_2016/lib64 +) # handle the QUIETLY and REQUIRED arguments and set VTUNE_FOUND to TRUE if # all listed variables are TRUE @@ -41,4 +32,3 @@ if(VTUNE_LIBRARIES AND NOT TARGET Vtune::Vtune) endif() mark_as_advanced(VTUNE_FOUND VTUNE_INCLUDE_DIRS VTUNE_LIBRARIES) - diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake index 260bc6d4a..d39696cc1 100644 --- a/cmake/SearchForStuff.cmake +++ b/cmake/SearchForStuff.cmake @@ -102,18 +102,7 @@ if(ENABLE_TESTS) endif() endif() -#---------------------------------------- -# Check correctness of the parameter -# Note: wxWidgets_INCLUDE_DIRS must be defined -#---------------------------------------- -include(ApiValidation) - -# Blacklist bad GCC -if(GCC_VERSION VERSION_EQUAL "7.0" OR GCC_VERSION VERSION_EQUAL "7.1") - GCC7_BUG() -endif() - -if((GCC_VERSION VERSION_EQUAL "9.0" OR GCC_VERSION VERSION_GREATER "9.0") AND GCC_VERSION LESS "9.2") +if(GCC_VERSION VERSION_GREATER_EQUAL "9.0" AND GCC_VERSION VERSION_LESS "9.2") message(WARNING " It looks like you are compiling with 9.0.x or 9.1.x. Using these versions is not recommended, as there is a bug known to cause the compiler to segfault while compiling. See patch