From 439c3a5ad188ff141fe2566461a602e61048c435 Mon Sep 17 00:00:00 2001
From: Lephenixnoir <sebastien.michelland@protonmail.com>
Date: Wed, 11 Aug 2021 01:35:34 +0200
Subject: [PATCH] perf/cpu: fx-9860G compatibility

---
 CMakeLists.txt                 |   1 +
 assets-fx/img/opt_perf_cpu.png | Bin 0 -> 1331 bytes
 include/gintctl/assets.h       |   1 +
 src/gint/ram.c                 |   1 +
 src/perf/cpu.S                 |   5 +++++
 src/perf/cpu.c                 |   5 +++++
 6 files changed, 13 insertions(+)
 create mode 100644 assets-fx/img/opt_perf_cpu.png

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fc8fbd..369e200 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,6 +86,7 @@ set(ASSETS_fx
   assets-fx/img/opt_libs_jui.png
   assets-fx/img/opt_main.png
   assets-fx/img/opt_mem.png
+  assets-fx/img/opt_perf_cpu.png
   assets-fx/img/opt_perf_libprof.png
   assets-fx/img/opt_perf_memory.png
   assets-fx/img/opt_perf_memory_sh3.png
diff --git a/assets-fx/img/opt_perf_cpu.png b/assets-fx/img/opt_perf_cpu.png
new file mode 100644
index 0000000000000000000000000000000000000000..416039f5605dcb85e9759231c46921f6639a2137
GIT binary patch
literal 1331
zcmV-31<d-1P)<h;3K|Lk000e1NJLTq004jh000OG0ssI2zQ158000DFdQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1V>vg9TV{Ld+J1SBB@#{nc&<pw!^8qa(4Hk+;N
zCKWRtYz+G7ZbXSce$Vn7F5)&yQyYEuUU9YACNDgU`gO%e{~Dv(p8wB_KK`kE`{Dha
z@hIr!^=j>7Tt3D>C-!#_LqGUH`rQI~`{!>R+j=|ZzeEH(t$urruRGI6X1uantpkSs
zO6ujJe44?;4LkBI>u82s@oZ0<Xrr!rs8z40ZnQ&_n4~5(@<NM}f*k#!gBTkJ8+zu$
z@{A2Jo_wSVNxO}bO{TaEVL2Qk(u(jq7JB^7$KRm=&rX=i1Y?9H|JcgUCj3gvJQWxb
zT`=i|72;yPJkW(v?mwo10?H5G^a1#@y|3~Ou>#KYfq5XoRrkxpR{GMGJOU8RQ}i#6
z$^5d$k4hSRD}o^b1+|kXb*jc}L``^rpoPd;8gDQ_s_Y1on@9&Y13H3ltTB4#vhr&j
zTLt{6bTM!<Wr3{L6#B6?prNIrO;x*^4xPG6m)^Se-mTv~w@j>=S~s&{)7FsDhK@dL
zj4{WWJOx`)XP-95oO3PsT&*l!SiLY~t<76@+q(O<J@(w|Kt87(J^k1jXP)Kk;?32&
zn-8D9f&x-1(L$q##fTXzp|zB3soB$V<jnPE?Ss|7wSU1HeXzz4Q+J-dS;MH=HT0OE
zTW9og2FAD%7`Mv+1kIPTI;b_i%w5jvWb6uM1gV!Br@9JtP}qW4liu8YG55>76=3}{
z-uPFTE0?<efjKTA-|_YX*8En&^Dy?>g%{H**nQw*H;Zkn3?DHPC2tDs)8=D9QFh>^
zAC>4fy90D%z|-qISzEX5D1O_5TGsAqr!<=xbYe=-&NzFA`9_Revd3J85J4K&N6?5G
zt@1qE2qSRR6LAH$T>(W)%$Ee{0yMfKH@VnBudwTIWzj*|nukE&yoIyMh|~d5?;OC`
zij9Q<IK}bCVLE*Vb#FUPW^d2KIu`ipT4&q{_JXdWc`}Db8xC*9P|YbUgP|)3YEurQ
zsM~e<^6Y?p;r@&d_|MRDNM*3y5)?A3Nb%TSMHS0;R3A`Rj-del7W3g9^0-m-o<6|>
zD%CNcb{w@Wff%0s*eC(ro@iYN69Q~Qb!L|?LhVmXwA6D=jb=M>4B>^l<>ofc0C++`
z90iFk<fd_aEdXiOBYZ3zA!@<Yrw0p6;#rTM1qt#^6AU}7DH2`kjxw_E=_o^S1S8iI
zvI2?RyrV)hd0`q&4&3`r=mGW6V>nVpY6<YnChC#3nc)9)UOrKg9l2%~&1QMny{F;`
zr93j64dCg*Zg5n5NkrS*-T>Z8_c<XIl%EQ9KpvzBuTKhj#5Q&l<dzlNQ2}5cM1UZ5
z<&?}T>^33d0={r)&jA=$E`iE>jJZIa0q@gq{fOm{QS6KuNIp@e9NQ8(wG&6Cax0Jw
zz7YZnobn4l?92bqmw&SW!kXnzBT95hBFITc00009a7bBm000XU000XU0RWnu7ytkO
z2XskIMF-^w3Kt<Ddk72a0001HNkl<ZNXPA#!3w}I3_^A6|9{yX%0d}kSOZ}f-^oia
zY9*8e002pB5^qhJV|HIR4}XW4?H;<2nOO%AkR<t5ZCAcMfSe>7Q{!BAJlPg!&^|$5
p{(+5aoS^9V5R&Y8AM_deFBi98IRbSu`d0t|002ovPDHLkV1iJ$YNP-F

literal 0
HcmV?d00001

diff --git a/include/gintctl/assets.h b/include/gintctl/assets.h
index ab7c429..358796e 100644
--- a/include/gintctl/assets.h
+++ b/include/gintctl/assets.h
@@ -40,6 +40,7 @@ extern bopti_image_t
 	img_opt_libs_jui,
 	img_opt_main,
 	img_opt_mem,
+	img_opt_perf_cpu,
 	img_opt_perf_libprof,
 	img_opt_perf_memory,
 	img_opt_perf_memory_sh3,
diff --git a/src/gint/ram.c b/src/gint/ram.c
index ba90d3b..ade99a5 100644
--- a/src/gint/ram.c
+++ b/src/gint/ram.c
@@ -3,6 +3,7 @@
 
 #include <gintctl/util.h>
 #include <gintctl/gint.h>
+#include <gintctl/assets.h>
 
 #include <stdio.h>
 #include <stdbool.h>
diff --git a/src/perf/cpu.S b/src/perf/cpu.S
index 67a97db..0e2ac3b 100644
--- a/src/perf/cpu.S
+++ b/src/perf/cpu.S
@@ -440,6 +440,7 @@ _perf_cpu_double_incr_read:
    This section is used to investigate the performance of the 2D texture shader
    of azur. */
 
+#ifdef FXCG50
 .global _perf_cpu_tex2d
 
 .align 4
@@ -451,15 +452,19 @@ _perf_cpu_tex2d:
 1:	movs.l	@r3+, x0
 2:	movs.l	x0, @r5+
 	EPILOGUE()
+#endif
 
 /* XRAM buffer */
 
 .align 4
 .buffer:
 	.long	_cpu_perf_xram_buffer
+
+#ifdef FXCG50
 .buffer2:
 	.long	_buffer2
 
 .section .data
 _buffer2:
 	.zero	2048
+#endif
diff --git a/src/perf/cpu.c b/src/perf/cpu.c
index c7565b7..28f012c 100644
--- a/src/perf/cpu.c
+++ b/src/perf/cpu.c
@@ -4,6 +4,7 @@
 
 #include <gintctl/perf.h>
 #include <gintctl/util.h>
+#include <gintctl/assets.h>
 
 #include <gintctl/widgets/gscreen.h>
 #include <gintctl/widgets/gtable.h>
@@ -76,7 +77,9 @@ struct results {
 	int raw_EX_LS_addr, raw_DSPLS_DSPLS;
 	int darken_1, darken_2, darken_3, darken_4;
 	int double_read, double_incr_read;
+	#ifdef FXCG50
 	int tex2d;
+	#endif
 };
 
 /* Number of Iphi cycles total, and number of iterations */
@@ -187,7 +190,9 @@ void gintctl_perf_cpu(void)
 			run(double_read, 1024);
 			run(double_incr_read, 1024);
 
+			#ifdef FXCG50
 			run(tex2d, 512);
+			#endif
 
 			table->widget.update = 1;
 		}