From 3b0513a57c341a9ad42c5f2b3e77e9935a253710 Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Fri, 22 Dec 2023 19:47:20 +1000
Subject: [PATCH] Misc: Purge _M_AMD64 define

---
 common/Pcsx2Defs.h    |  4 ---
 pcsx2/GS/GSVector4i.h | 62 -------------------------------------------
 pcsx2/GS/GSVector8i.h |  8 ------
 3 files changed, 74 deletions(-)

diff --git a/common/Pcsx2Defs.h b/common/Pcsx2Defs.h
index 75e58e0b21..af3940eb70 100644
--- a/common/Pcsx2Defs.h
+++ b/common/Pcsx2Defs.h
@@ -121,10 +121,6 @@ static constexpr unsigned int __pagemask = __pagesize - 1;
 	#define __ri __fi
 #endif
 
-#if defined(__x86_64__) && !defined(_M_AMD64)
-	#define _M_AMD64
-#endif
-
 #ifndef RESTRICT
 	#if defined(_MSC_VER)
 		#define RESTRICT __restrict
diff --git a/pcsx2/GS/GSVector4i.h b/pcsx2/GS/GSVector4i.h
index 4c9a120852..0944c64681 100644
--- a/pcsx2/GS/GSVector4i.h
+++ b/pcsx2/GS/GSVector4i.h
@@ -1107,8 +1107,6 @@ public:
 		return _mm_extract_epi32(m, i);
 	}
 
-#ifdef _M_AMD64
-
 	template <int i>
 	__forceinline GSVector4i insert64(s64 a) const
 	{
@@ -1124,8 +1122,6 @@ public:
 		return _mm_extract_epi64(m, i);
 	}
 
-#endif
-
 	template <int src, class T>
 	__forceinline GSVector4i gather8_4(const T* ptr) const
 	{
@@ -1351,8 +1347,6 @@ public:
 		return v;
 	}
 
-#if defined(_M_AMD64)
-
 	template <int src, class T>
 	__forceinline GSVector4i gather64_4(const T* ptr) const
 	{
@@ -1408,50 +1402,6 @@ public:
 		return v;
 	}
 
-#else
-
-	template <int src, class T>
-	__forceinline GSVector4i gather64_4(const T* ptr) const
-	{
-		GSVector4i v;
-
-		v = loadu(&ptr[extract8<src + 0>() & 0xf], &ptr[extract8<src + 0>() >> 4]);
-
-		return v;
-	}
-
-	template <int src, class T>
-	__forceinline GSVector4i gather64_8(const T* ptr) const
-	{
-		GSVector4i v;
-
-		v = load(&ptr[extract8<src + 0>()], &ptr[extract8<src + 1>()]);
-
-		return v;
-	}
-
-	template <int src, class T>
-	__forceinline GSVector4i gather64_16(const T* ptr) const
-	{
-		GSVector4i v;
-
-		v = load(&ptr[extract16<src + 0>()], &ptr[extract16<src + 1>()]);
-
-		return v;
-	}
-
-	template <int src, class T>
-	__forceinline GSVector4i gather64_32(const T* ptr) const
-	{
-		GSVector4i v;
-
-		v = load(&ptr[extract32<src + 0>()], &ptr[extract32<src + 1>()]);
-
-		return v;
-	}
-
-#endif
-
 	template <class T>
 	__forceinline void gather8_4(const T* RESTRICT ptr, GSVector4i* RESTRICT dst) const
 	{
@@ -1571,16 +1521,12 @@ public:
 		dst[1] = gather64_32<2>(ptr);
 	}
 
-#ifdef _M_AMD64
-
 	template <class T>
 	__forceinline void gather64_64(const T* RESTRICT ptr, GSVector4i* RESTRICT dst) const
 	{
 		dst[0] = gather64_64<>(ptr);
 	}
 
-#endif
-
 	__forceinline static GSVector4i loadnt(const void* p)
 	{
 		return GSVector4i(_mm_stream_load_si128((__m128i*)p));
@@ -1630,15 +1576,11 @@ public:
 		return GSVector4i(_mm_cvtsi32_si128(i));
 	}
 
-#ifdef _M_AMD64
-
 	__forceinline static GSVector4i loadq(s64 i)
 	{
 		return GSVector4i(_mm_cvtsi64_si128(i));
 	}
 
-#endif
-
 	__forceinline static void storent(void* p, const GSVector4i& v)
 	{
 		_mm_stream_si128((__m128i*)p, v.m);
@@ -1674,15 +1616,11 @@ public:
 		return _mm_cvtsi128_si32(v.m);
 	}
 
-#ifdef _M_AMD64
-
 	__forceinline static s64 storeq(const GSVector4i& v)
 	{
 		return _mm_cvtsi128_si64(v.m);
 	}
 
-#endif
-
 	__forceinline static void storent(void* RESTRICT dst, const void* RESTRICT src, size_t size)
 	{
 		const GSVector4i* s = (const GSVector4i*)src;
diff --git a/pcsx2/GS/GSVector8i.h b/pcsx2/GS/GSVector8i.h
index 2cd2032f13..add578f4e3 100644
--- a/pcsx2/GS/GSVector8i.h
+++ b/pcsx2/GS/GSVector8i.h
@@ -1171,15 +1171,11 @@ public:
 		return cast(GSVector4i::load(i));
 	}
 
-#ifdef _M_AMD64
-
 	__forceinline static GSVector8i loadq(s64 i)
 	{
 		return cast(GSVector4i::loadq(i));
 	}
 
-#endif
-
 	__forceinline static void storent(void* p, const GSVector8i& v)
 	{
 		_mm256_stream_si256((__m256i*)p, v.m);
@@ -1215,15 +1211,11 @@ public:
 		return GSVector4i::store(GSVector4i::cast(v));
 	}
 
-#ifdef _M_AMD64
-
 	__forceinline static s64 storeq(const GSVector8i& v)
 	{
 		return GSVector4i::storeq(GSVector4i::cast(v));
 	}
 
-#endif
-
 	__forceinline static void storent(void* RESTRICT dst, const void* RESTRICT src, size_t size)
 	{
 		const GSVector8i* s = (const GSVector8i*)src;