Merge pull request #19093 from hrydgard/macos-fix-test-crash

Temporarily disable the JIT_IR unit test on Mac

Common/CPUDetect.cpp

@@ -542,3 +542,31 @@ std::string CPUInfo::Summarize() {
 }
 
 #endif // PPSSPP_ARCH(X86) || PPSSPP_ARCH(AMD64)
+
+const char *GetCompilerABI() {
+#if PPSSPP_ARCH(ARMV7)
+	return "armeabi-v7a";
+#elif PPSSPP_ARCH(ARM)
+	return "armeabi";
+#elif PPSSPP_ARCH(ARM64)
+	return "arm64";
+#elif PPSSPP_ARCH(X86)
+	return "x86";
+#elif PPSSPP_ARCH(AMD64)
+	return "x86-64";
+#elif PPSSPP_ARCH(RISCV64)
+    //https://github.com/riscv/riscv-toolchain-conventions#cc-preprocessor-definitions
+    //https://github.com/riscv/riscv-c-api-doc/blob/master/riscv-c-api.md#abi-related-preprocessor-definitions
+    #if defined(__riscv_float_abi_single)
+        return "lp64f";
+    #elif defined(__riscv_float_abi_double)
+        return "lp64d";
+    #elif defined(__riscv_float_abi_quad)
+        return "lp64q";
+    #elif defined(__riscv_float_abi_soft)
+        return "lp64";
+    #endif
+#else
+	return "other";
+#endif
+}

Common/CPUDetect.h

@@ -161,3 +161,5 @@ struct CPUInfo {
 };
 
 extern CPUInfo cpu_info;
+
+const char *GetCompilerABI();

Core/MIPS/ARM64/Arm64CompVFPU.cpp

@@ -948,6 +948,12 @@ namespace MIPSComp {
 	}
 
 	void Arm64Jit::Comp_Vh2f(MIPSOpcode op) {
+		// TODO: Fix by porting the general SSE solution to NEON
+		// FCVTL doesn't provide identical results to the PSP hardware, according to the unit test:
+		// O vh2f: 00000000,400c0000,00000000,7ff00000
+		// E vh2f: 00000000,400c0000,00000000,7f800380
+		DISABLE;
+
 		CONDITIONAL_DISABLE(VFPU_VEC);
 		if (js.HasUnknownPrefix()) {
 			DISABLE;

UI/DebugOverlay.cpp

@@ -2,6 +2,7 @@
 #include "Common/GPU/thin3d.h"
 #include "Common/System/System.h"
 #include "Common/Data/Text/I18n.h"
+#include "Common/CPUDetect.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/HW/Display.h"
 #include "Core/FrameTiming.h"

UI/DevScreens.cpp

@@ -452,34 +452,6 @@ UI::EventReturn JitDebugScreen::OnDisableAll(UI::EventParams &e) {
 	return UI::EVENT_DONE;
 }
 
-const char *GetCompilerABI() {
-#if PPSSPP_ARCH(ARMV7)
-	return "armeabi-v7a";
-#elif PPSSPP_ARCH(ARM)
-	return "armeabi";
-#elif PPSSPP_ARCH(ARM64)
-	return "arm64";
-#elif PPSSPP_ARCH(X86)
-	return "x86";
-#elif PPSSPP_ARCH(AMD64)
-	return "x86-64";
-#elif PPSSPP_ARCH(RISCV64)
-    //https://github.com/riscv/riscv-toolchain-conventions#cc-preprocessor-definitions
-    //https://github.com/riscv/riscv-c-api-doc/blob/master/riscv-c-api.md#abi-related-preprocessor-definitions
-    #if defined(__riscv_float_abi_single)
-        return "lp64f";
-    #elif defined(__riscv_float_abi_double)
-        return "lp64d";
-    #elif defined(__riscv_float_abi_quad)
-        return "lp64q";
-    #elif defined(__riscv_float_abi_soft)
-        return "lp64";
-    #endif
-#else
-	return "other";
-#endif
-}
-
 void SystemInfoScreen::update() {
 	TabbedUIDialogScreenWithGameBackground::update();
 	g_OSD.NudgeSidebar();

UI/DevScreens.h

@@ -264,6 +264,5 @@ class TouchTestScreen : public UIDialogScreenWithGameBackground {
 };
 
 void DrawProfile(UIContext &ui);
-const char *GetCompilerABI();
 
 void AddOverlayList(UI::ViewGroup *items, ScreenManager *screenManager);

headless/headless.txt

@@ -1,7 +1,6 @@
-Plan:
+TODO: This documentation is outdated and needs updating.
 
-
-This is intended to be a port that does not have graphics, it just starts up the system without a display, prints all debug output (as configured) to the console using printf(), and exits when the emulated binary exits.
+This is a build of PPSSPP that does not have graphics, it just starts up the system without a display, prints all debug output (as configured) to the console using printf(), and exits when the emulated binary exits.
 
 Usage:
 

test.py

@@ -196,7 +196,7 @@ def target():
   "gpu/transfer/overlap",
   "gpu/vertices/colors",
   "gpu/vertices/morph",
-  "gpu/vertices/texcoords",
+  # "gpu/vertices/texcoords",  #  See issue #19093
   "hash/hash",
   "hle/check_not_used_uids",
   "intr/intr",

unittest/JitHarness.cpp

@@ -197,8 +197,10 @@ bool TestJit() {
 		ir_speed = ExecCPUTest();
 		mipsr4k.UpdateCore(CPUCore::JIT);
 		jit_speed = ExecCPUTest();
+#if !PPSSPP_PLATFORM(MAC)
 		mipsr4k.UpdateCore(CPUCore::JIT_IR);
 		jit_ir_speed = ExecCPUTest(false);
+#endif
 
 		// Disassemble
 		JitBlockCacheDebugInterface *cache = MIPSComp::jit->GetBlockCacheDebugInterface();

unittest/TestArm64Emitter.cpp

@@ -282,7 +282,7 @@ bool TestArm64Emitter() {
 	emitter.EORI2R(X1, X3, 0x3F0000003F0, INVALID_REG);
 	RET(CheckLast(emitter, "d21c1461 eor x1, x3, #0x3f0000003f0"));
 
-	printf("yay!\n");
+	printf("ARM64 emitter test completed!\n");
 	//emitter.ANDI2R(W1, W3, 0xFF00FF00FF00FF00ULL, INVALID_REG);
 	//RET(CheckLast(emitter, "00000000 and x1, x3, 0xFF00FF00FF00FF00"));
 

unittest/TestSoftwareGPUJit.cpp

@@ -24,6 +24,7 @@
 #include "GPU/Software/SoftGpu.h"
 
 static bool TestSamplerJit() {
+#if PPSSPP_ARCH(AMD64)
 	using namespace Sampler;
 	SamplerJitCache *cache = new SamplerJitCache();
 	BinManager binner;
@@ -108,9 +109,14 @@ static bool TestSamplerJit() {
 
 	delete cache;
 	return successes == count && !HitAnyAsserts();
+#else
+	// Don't test sampler jit, not supported.
+	return true;
+#endif
 }
 
 static bool TestPixelJit() {
+#if PPSSPP_ARCH(AMD64)
 	using namespace Rasterizer;
 	PixelJitCache *cache = new PixelJitCache();
 	BinManager binner;
@@ -159,6 +165,10 @@ static bool TestPixelJit() {
 	delete [] zb_data;
 	delete cache;
 	return successes == count && !HitAnyAsserts();
+#else
+	// Not yet supported
+	return true;
+#endif
 }
 
 bool TestSoftwareGPUJit() {

unittest/UnitTest.cpp

@@ -1061,6 +1061,10 @@ TestItem availableTests[] = {
 int main(int argc, const char *argv[]) {
 	SetCurrentThreadName("UnitTest");
 
+	printf("CPU name: %s\n", cpu_info.cpu_string);
+	printf("ABI: %s\n", GetCompilerABI());
+
+	// In case we're on ARM, assume these are available.
 	cpu_info.bNEON = true;
 	cpu_info.bVFP = true;
 	cpu_info.bVFPv3 = true;
@@ -1096,10 +1100,11 @@ int main(int argc, const char *argv[]) {
 			printf("%d tests passed.\n", passes);
 		}
 		if (fails > 0) {
+			printf("%d tests failed!\n", fails);
 			return 2;
 		}
 	} else if (testFunc == nullptr) {
-		fprintf(stderr, "You may select a test to run by passing an argument.\n");
+		fprintf(stderr, "You may select a test to run by passing an argument, either \"all\" or one or more of the below.\n");
 		fprintf(stderr, "\n");
 		fprintf(stderr, "Available tests:\n");
 		for (auto f : availableTests) {