Re: [hatari-devel] Separate --cpu-caches option

[ Thread Index | Date Index | More lists.tuxfamily.org/hatari-devel Archives ] 

Hi,

On 17.3.2024 11.30, Nicolas Pomarède wrote:

Le 16/03/2024 à 23:53, Eero Tamminen a écrit :
As WinUAE CPU core supports it, attached is patch to enable CPU caches separately from cycle exact and prefetch/compatible options.
It should help in identifying compatibility issues better, and having more control over Hatari performance. 
....
I think variable should be bCpuCacheData instead of just bCpuCaches because it's not the same thing as the instruction cache.
Ok. I changed it to --data-cache / bCpuDataCache option (after checking WinUAE CPU core code). New version attached.
Also, doing just a true/false that removes  the whole other tests in m68000.c is not good, because it can leave cache=true for 68000 cpu and have side effect later. so it should be something like : 

         if ( ( changed_prefs.cpu_model < 68020 )
         ||  ( ( changed_prefs.cpu_compatible == false ) && ( changed_prefs.cpu_cycle_exact == false ) ) 
          || ( ConfigureParams.System.bCpuCaches == false )
  )
                 changed_prefs.cpu_data_cache = false;
         else
                 changed_prefs.cpu_data_cache = true;
But this check I changed to be against 030 as 020 does not have d-cache, only i-cache. 


	- Eero
From 6af8373db76a42fbb23cc8392b21902e5e46f747 Mon Sep 17 00:00:00 2001
From: Eero Tamminen <oak@xxxxxxxxxxxxxx>
Date: Mon, 22 Apr 2024 00:19:00 +0300
Subject: [PATCH 2/3] Document CPU data cache option

---
 doc/hatari.1          |   5 ++++-
 doc/images/cpu.png    | Bin 3256 -> 6951 bytes
 doc/manual.html       |  31 +++++++++++++++++++++----------
 doc/release-notes.txt |   2 ++
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/doc/hatari.1 b/doc/hatari.1
index 4969d91a..07ec2cff 100644
--- a/doc/hatari.1
+++ b/doc/hatari.1
@@ -480,7 +480,10 @@ Use a more compatible 68000 CPU mode with better prefetch accuracy and
 cycle counting
 .TP
 .B \-\-cpu\-exact <bool>
-Use cycle exact CPU emulation (cache emulation)
+Use cycle exact CPU emulation
+.TP
+.B \-\-data\-cache <bool>
+Emulate >= 030 CPU data cache
 .TP
 .B \-\-addr24 <bool>
 Use 24-bit instead of 32-bit addressing mode
diff --git a/doc/images/cpu.png b/doc/images/cpu.png
index ea2d9588fae7dea5296644709e42785a47140e32..97a3b2ef05209f045eaf4f5ccd1bac8bcbcce272 100644
GIT binary patch
literal 6951
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
bWh8UBzc}I<@wWJt7QoWf)&zIyM*M#P#&FQ+

literal 3256
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
K<wQIap79^vTWQ?@

diff --git a/doc/manual.html b/doc/manual.html
index e5acbe32..01138965 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -990,7 +990,9 @@ disabled)</p>
 <p class="paramdesc">Use a more compatible 68000 CPU mode
 with better prefetch accuracy and cycle counting</p>
 <p class="parameter">--cpu-exact &lt;bool&gt;</p>
-<p class="paramdesc">Use cycle exact CPU emulation (cache emulation)</p>
+<p class="paramdesc">Use cycle exact CPU emulation</p>
+<p class="parameter">--data-cache &lt;bool&gt;</p>
+<p class="paramdesc">Emulate &gt;=030 CPU data cache</p>
 <p class="parameter">--addr24 &lt;bool&gt;</p>
 <p class="paramdesc">Use 24-bit instead of 32-bit addressing mode (24-bit is enabled by default)</p>
 <p class="parameter">--fpu &lt;x&gt;</p>
@@ -1382,7 +1384,7 @@ changes that you have made.
 <h4 class="gui">The CPU Dialog</h4>
 
 <div class="floatimage">
-  <img src="images/cpu.png" width="439" height="384"
+  <img src="images/cpu.png" width="440" height="399"
        alt="Hatari's GUI - the CPU dialog" />
 </div>
 
@@ -1404,7 +1406,7 @@ changes that you have made.
   If you are going to use TOS 1.0x, you also have to select the 68000 CPU,
   since these TOS versions are not aware of the higher CPU levels yet.
   If you want to use a higher CPU level with the ST or STE machine type,
-  you have to use TOS 2.0x instead.
+  you have to use TOS 2.0x (or EmuTOS) instead.
  </li>
  <li>
   Atari TT and Falcon computers were using the 68030 CPU, so you should select
@@ -1446,8 +1448,8 @@ changes that you have made.
  if you don't need it and if you have a slow host system.
 </p>
 <p>
- The &quot;Cycle exact&quot;, the &quot;MMU emulation&quot; and
- &quot;24-bit addressing&quot; options are considered as experimental and
+ The &quot;Cycle exact&quot;, &quot;Data cache&quot;, &quot;MMU emulation&quot;
+ and &quot;24-bit addressing&quot; options are considered as experimental and
  should only be changed if you know what you are doing.
 </p>
 
@@ -3041,13 +3043,22 @@ that do use DSP, many use it only for background music and work
 fine without the real DSP emulation.
 </p>
 
-<h4>CPU: cycle exact (030/TT/Falcon)</h4>
+<h4>CPU: data cache emulation (030/TT/Falcon)</h4>
 
 <p>
-CPU core supports 030 cache emulation for cycle accuracy. This
-is very heavy.  Unless program needs cycle accuracy to work correctly,
-you can disable it.  Many Falcon demos need it, applications and games
-normally don't.
+CPU core supports &gt;=030 data cache emulation for better m68k
+performance and cycle accuracy. This is very heavy.  Unless program
+needs cycle accuracy to work correctly, you can disable it.  Many
+Falcon demos need it, applications and games normally don't.
+</p>
+
+<h4>CPU: cycle exact</h4>
+
+<p>
+CPU core cycle supports CPU instruction cache emulation for cycle
+accuracy. This is heavy for &gt;= 020 m68k CPUs.  Unless program needs
+cycle accuracy to work correctly, you can disable it.  Many Falcon
+demos need it, applications and games normally don't.
 </p>
 
 <h4>Timer-D</h4>
diff --git a/doc/release-notes.txt b/doc/release-notes.txt
index d5ba65eb..5837369f 100644
--- a/doc/release-notes.txt
+++ b/doc/release-notes.txt
@@ -23,6 +23,8 @@ Following features are deprecated and will be removed in a future release:
  -------------------
 
 Emulator improvements:
+- Config options / SDL-GUI:
+  - Add separate option for enabling/disabling >=030 CPU data cache
 - GEMDOS HD:
   - Fix: Fattrib() call on a directory
 
-- 
2.39.2


From 17e894abe76d2e3e3eede26f2f9aa6aa43b50b59 Mon Sep 17 00:00:00 2001
From: Eero Tamminen <oak@xxxxxxxxxxxxxx>
Date: Sat, 16 Mar 2024 20:28:40 +0200
Subject: [PATCH 1/3] Add config & SDL-GUI option for CPU cache emulation

---
 src/change.c                 |  4 ++++
 src/configuration.c          |  3 +++
 src/gui-sdl/dlgCpu.c         | 41 ++++++++++++++++++++++--------------
 src/includes/configuration.h |  1 +
 src/m68000.c                 | 11 +++++-----
 src/options.c                | 10 ++++++++-
 src/statusbar.c              | 15 ++++++++-----
 7 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/src/change.c b/src/change.c
index f4ab4673..f9ab2fa2 100644
--- a/src/change.c
+++ b/src/change.c
@@ -149,6 +149,10 @@ bool Change_DoNeedReset(CNF_PARAMS *current, CNF_PARAMS *changed)
 	if (changed->System.bCycleExactCpu != current->System.bCycleExactCpu)
 		return true;
 
+	/* Did change CPU data cache? */
+	if (changed->System.bCpuDataCache != current->System.bCpuDataCache)
+		return true;
+
 	/* Did change MMU? */
 	if (changed->System.bMMU != current->System.bMMU)
 		return true;
diff --git a/src/configuration.c b/src/configuration.c
index b10cf378..c3529c12 100644
--- a/src/configuration.c
+++ b/src/configuration.c
@@ -542,6 +542,7 @@ static const struct Config_Tag configs_System[] =
 	{ "bFastForward", Bool_Tag, &ConfigureParams.System.bFastForward },
 	{ "bAddressSpace24", Bool_Tag, &ConfigureParams.System.bAddressSpace24 },
 	{ "bCycleExactCpu", Bool_Tag, &ConfigureParams.System.bCycleExactCpu },
+	{ "bCpuDataCache", Bool_Tag, &ConfigureParams.System.bCpuDataCache },
 	{ "n_FPUType", Int_Tag, &ConfigureParams.System.n_FPUType },
 /* JIT	{ "bCompatibleFPU", Bool_Tag, &ConfigureParams.System.bCompatibleFPU }, */
 	{ "bSoftFloatFPU", Bool_Tag, &ConfigureParams.System.bSoftFloatFPU },
@@ -847,6 +848,7 @@ void Configuration_SetDefault(void)
 	ConfigureParams.System.bCompatibleFPU = true; /* JIT */
 	ConfigureParams.System.bSoftFloatFPU = false;
 	ConfigureParams.System.bMMU = false;
+	ConfigureParams.System.bCpuDataCache = true;
 	ConfigureParams.System.bCycleExactCpu = true;
 	ConfigureParams.System.VideoTimingMode = VIDEO_TIMING_MODE_WS3;
 	ConfigureParams.System.bCompatibleCpu = true;
@@ -1232,6 +1234,7 @@ void Configuration_MemorySnapShot_Capture(bool bSave)
 	MemorySnapShot_Store(&ConfigureParams.System.bPatchTimerD, sizeof(ConfigureParams.System.bPatchTimerD));
 	MemorySnapShot_Store(&ConfigureParams.System.bAddressSpace24, sizeof(ConfigureParams.System.bAddressSpace24));
 
+	MemorySnapShot_Store(&ConfigureParams.System.bCpuDataCache, sizeof(ConfigureParams.System.bCpuDataCache));
 	MemorySnapShot_Store(&ConfigureParams.System.bCycleExactCpu, sizeof(ConfigureParams.System.bCycleExactCpu));
 	MemorySnapShot_Store(&ConfigureParams.System.n_FPUType, sizeof(ConfigureParams.System.n_FPUType));
 	MemorySnapShot_Store(&ConfigureParams.System.bCompatibleFPU, sizeof(ConfigureParams.System.bCompatibleFPU));
diff --git a/src/gui-sdl/dlgCpu.c b/src/gui-sdl/dlgCpu.c
index 072af88b..77991e5e 100644
--- a/src/gui-sdl/dlgCpu.c
+++ b/src/gui-sdl/dlgCpu.c
@@ -28,13 +28,14 @@ const char DlgCpu_fileid[] = "Hatari dlgCpu.c";
 #define DLGCPU_FPU_CPU_IN 20
 #define DLGCPU_PREFETCH   23
 #define DLGCPU_CYC_EXACT  24
-#define DLGCPU_MMU_EMUL   25
-#define DLGCPU_24BITS     26
-#define DLGCPU_SOFTFLOAT  27
+#define DLGCPU_DATA_CACHE 25
+#define DLGCPU_MMU_EMUL   26
+#define DLGCPU_24BITS     27
+#define DLGCPU_SOFTFLOAT  28
 
 static SGOBJ cpudlg[] =
 {
-	{ SGBOX, 0, 0, 0,0, 44,24, NULL },
+	{ SGBOX, 0, 0, 0,0, 44,25, NULL },
 	{ SGTEXT, 0, 0, 17,1, 12,1, "CPU options" },
 
 	{ SGBOX, 0, 0, 2,3, 12,8, NULL },
@@ -49,26 +50,27 @@ static SGOBJ cpudlg[] =
 	{ SGBOX, 0, 0, 16,3, 12,8, NULL },
 	{ SGTEXT, 0, 0, 17,3, 10,1, "CPU clock:" },
 	{ SGRADIOBUT, 0, 0, 17,5, 8,1, " _8 Mhz" },
-	{ SGRADIOBUT, 0, 0, 17,6, 8,1, "1_6 Mhz" },
+	{ SGRADIOBUT, 0, 0, 17,6, 8,1, "16 M_hz" },
 	{ SGRADIOBUT, 0, 0, 17,7, 8,1, "32 Mh_z" },
 
 	{ SGBOX, 0, 0, 30,3, 12,8, NULL },
 	{ SGTEXT, 0, 0, 31,3, 4,1, "FPU:" },
 	{ SGRADIOBUT, 0, 0, 31,5, 6,1, "_None" },
 	{ SGRADIOBUT, 0, 0, 31,6, 7,1, "68881" },
-	{ SGRADIOBUT, 0, 0, 31,7, 7,1, "68882" },
+	{ SGRADIOBUT, 0, 0, 31,7, 7,1, "_68882" },
 	{ SGRADIOBUT, 0, 0, 31,8, 10,1, "_Internal" },
 
-	{ SGBOX, 0, 0, 2,12, 40,9, NULL },
+	{ SGBOX, 0, 0, 2,12, 40,10, NULL },
 	{ SGTEXT, 0, 0, 9,12, 24,1, "CPU emulation parameters" },
 	{ SGCHECKBOX, 0, 0, 3,14, 21,1, "_Prefetch emulation*" },
-	{ SGCHECKBOX, 0, 0, 3,15, 35,1, "_Cycle-exact with cache emulation*" },
-	{ SGCHECKBOX, 0, 0, 3,16, 16,1, "_MMU emulation*" },
-	{ SGCHECKBOX, 0, 0, 3,17, 20,1, "24-bit _addressing" },
-	{ SGCHECKBOX, 0, 0, 3,18, 26,1, "Accurate _FPU emulation*" },
-	{ SGTEXT, 0, 0, 3,20, 20,1, "* Uses more host CPU" },
-
-	{ SGBUTTON, SG_DEFAULT, 0, 13,22, 19,1, "Back to main menu" },
+	{ SGCHECKBOX, 0, 0, 3,15, 35,1, "_Cycle-exact emulation*" },
+	{ SGCHECKBOX, 0, 0, 3,16, 35,1, "_Data cache emulation* (>=030)" },
+	{ SGCHECKBOX, 0, 0, 3,17, 16,1, "_MMU emulation*" },
+	{ SGCHECKBOX, 0, 0, 3,18, 20,1, "24-bit _addressing" },
+	{ SGCHECKBOX, 0, 0, 3,19, 26,1, "Accurate _FPU emulation*" },
+	{ SGTEXT, 0, 0, 3,21, 20,1, "* Uses more host CPU" },
+
+	{ SGBUTTON, SG_DEFAULT, 0, 13,23, 19,1, "Back to main menu" },
 	{ SGSTOP, 0, 0, 0,0, 0,0, NULL }
 };
 
@@ -113,13 +115,19 @@ void DlgCpu_Main(void)
 		cpudlg[DLGCPU_24BITS].state |= SG_SELECTED;
 	else
 		cpudlg[DLGCPU_24BITS].state &= ~SG_SELECTED;
-		
+
 	/* Cycle exact CPU */
 	if (ConfigureParams.System.bCycleExactCpu)
 		cpudlg[DLGCPU_CYC_EXACT].state |= SG_SELECTED;
 	else
 		cpudlg[DLGCPU_CYC_EXACT].state &= ~SG_SELECTED;
 
+	/* CPU data cache */
+	if (ConfigureParams.System.bCpuDataCache)
+		cpudlg[DLGCPU_DATA_CACHE].state |= SG_SELECTED;
+	else
+		cpudlg[DLGCPU_DATA_CACHE].state &= ~SG_SELECTED;
+
 	/* FPU emulation */
 	for (i = DLGCPU_FPU_NONE; i <= DLGCPU_FPU_CPU_IN; i++)
 	{
@@ -168,8 +176,9 @@ void DlgCpu_Main(void)
 		Configuration_ChangeCpuFreq ( 8 );
 
 	ConfigureParams.System.bCompatibleCpu = (cpudlg[DLGCPU_PREFETCH].state & SG_SELECTED);
-
 	ConfigureParams.System.bCycleExactCpu = (cpudlg[DLGCPU_CYC_EXACT].state & SG_SELECTED);
+	ConfigureParams.System.bCpuDataCache = (cpudlg[DLGCPU_DATA_CACHE].state & SG_SELECTED);
+
 	ConfigureParams.System.bMMU = (cpudlg[DLGCPU_MMU_EMUL].state & SG_SELECTED);
 	ConfigureParams.System.bAddressSpace24 = (cpudlg[DLGCPU_24BITS].state & SG_SELECTED);
 	ConfigureParams.System.bSoftFloatFPU = (cpudlg[DLGCPU_SOFTFLOAT].state & SG_SELECTED);
diff --git a/src/includes/configuration.h b/src/includes/configuration.h
index 44d4ec06..0f91601c 100644
--- a/src/includes/configuration.h
+++ b/src/includes/configuration.h
@@ -403,6 +403,7 @@ typedef struct
   VIDEOTIMINGMODE VideoTimingMode;
 
   bool bCycleExactCpu;
+  bool bCpuDataCache;
   FPUTYPE n_FPUType;
   bool bCompatibleFPU;            /* More compatible FPU */
   bool bSoftFloatFPU;
diff --git a/src/m68000.c b/src/m68000.c
index e83f88de..a3889a4b 100644
--- a/src/m68000.c
+++ b/src/m68000.c
@@ -316,7 +316,7 @@ void M68000_Start(void)
  *	cpu_compatible : 0/false (no prefetch for 68000/20/30)  1/true (prefetch opcode for 68000/20/30)
  *	cpu_cycle_exact : 0/false   1/true (most accurate, implies cpu_compatible)
  *	cpu_memory_cycle_exact : 0/false   1/true (less accurate than cpu_cycle_exact)
- *	cpu_data_cache : 0/false (don't emulate caches)   1/true (emulate instr/data caches for 68020/30/40/60)
+ *	cpu_data_cache : 0/false (don't emulate data cache)   1/true (emulate data cache for 30/40/60)
  *	address_space_24 : 1 (68000/10 and 68030 LC for Falcon), 0 (68020/30/40/60)
  *	fpu_model : 0, 68881 (external), 68882 (external), 68040 (cpu) , 68060 (cpu)
  *	fpu_strict : true/false (more accurate rounding)
@@ -364,6 +364,7 @@ void M68000_CheckCpuSettings(void)
 
 	changed_prefs.int_no_unimplemented = true;
 	changed_prefs.fpu_no_unimplemented = true;
+	changed_prefs.cpu_data_cache = ConfigureParams.System.bCpuDataCache;
 	changed_prefs.cpu_compatible = ConfigureParams.System.bCompatibleCpu;
 	changed_prefs.cpu_cycle_exact = ConfigureParams.System.bCycleExactCpu;
 	changed_prefs.cpu_memory_cycle_exact = ConfigureParams.System.bCycleExactCpu;
@@ -386,10 +387,10 @@ void M68000_CheckCpuSettings(void)
 	/* We don't use JIT */
 	changed_prefs.cachesize = 0;
 
-	/* Always emulate instr/data caches for cpu >= 68020 */
-	/* Cache emulation requires cpu_compatible or cpu_cycle_exact mode */
-	if ( ( changed_prefs.cpu_model < 68020 ) ||
-	     ( ( changed_prefs.cpu_compatible == false ) && ( changed_prefs.cpu_cycle_exact == false ) ) )
+	/* while 020 had i-cache, only 030+ had also d-cache */
+	if (changed_prefs.cpu_model < 68030 ||
+	    !ConfigureParams.System.bCpuDataCache ||
+	    !(changed_prefs.cpu_compatible || changed_prefs.cpu_cycle_exact))
 		changed_prefs.cpu_data_cache = false;
 	else
 		changed_prefs.cpu_data_cache = true;
diff --git a/src/options.c b/src/options.c
index 6b4d7d36..695730f9 100644
--- a/src/options.c
+++ b/src/options.c
@@ -165,6 +165,7 @@ enum {
 	OPT_CPULEVEL,		/* CPU options */
 	OPT_CPUCLOCK,
 	OPT_COMPATIBLE,
+	OPT_CPU_DATA_CACHE,
 	OPT_CPU_CYCLE_EXACT,
 	OPT_CPU_ADDR24,
 	OPT_FPU_TYPE,
@@ -435,7 +436,9 @@ static const opt_t HatariOptions[] = {
 	{ OPT_CPUCLOCK,  NULL, "--cpuclock",
 	  "<x>", "Set the CPU clock (x = 8/16/32)" },
 	{ OPT_COMPATIBLE, NULL, "--compatible",
-	  "<bool>", "Use a more compatible (but slower) prefetch mode for CPU" },
+	  "<bool>", "Use (more compatible) prefetch mode for CPU" },
+	{ OPT_CPU_DATA_CACHE, NULL, "--data-cache",
+	  "<bool>", "Emulate (>=030) CPU data cache" },
 	{ OPT_CPU_CYCLE_EXACT, NULL, "--cpu-exact",
 	  "<bool>", "Use cycle exact CPU emulation" },
 	{ OPT_CPU_ADDR24, NULL, "--addr24",
@@ -1848,6 +1851,11 @@ bool Opt_ParseParameters(int argc, const char * const argv[])
 			bLoadAutoSave = false;
 			break;
 
+		case OPT_CPU_DATA_CACHE:
+			ok = Opt_Bool(argv[++i], OPT_CPU_DATA_CACHE, &ConfigureParams.System.bCpuDataCache);
+			bLoadAutoSave = false;
+			break;
+
 		case OPT_CPU_CYCLE_EXACT:
 			ok = Opt_Bool(argv[++i], OPT_CPU_CYCLE_EXACT, &ConfigureParams.System.bCycleExactCpu);
 			bLoadAutoSave = false;
diff --git a/src/statusbar.c b/src/statusbar.c
index fdb05e53..0b5bc17c 100644
--- a/src/statusbar.c
+++ b/src/statusbar.c
@@ -501,10 +501,10 @@ void Statusbar_AddMessage(const char *msg, Uint32 msecs)
  */
 static char *Statusbar_AddString(char *buffer, const char *more)
 {
+	if (!more)
+		return buffer;
 	while (*more)
-	{
 		*buffer++ = *more++;
-	}
 	return buffer;
 }
 
@@ -540,11 +540,16 @@ void Statusbar_UpdateInfo(void)
 		*end++ = '0';
 	}
 
-	/* Prefetch mode or cycle exact mode ? */
+	const char *mode = NULL;
+	bool cache = ConfigureParams.System.bCpuDataCache && ConfigureParams.System.nCpuLevel > 2;
+	/* Prefetch / cycle exact mode and data cache? */
 	if ( ConfigureParams.System.bCycleExactCpu )
-		end = Statusbar_AddString(end, "(CE)");
+		mode = cache ? "(CED)" : "(CE)";
 	else if ( ConfigureParams.System.bCompatibleCpu )
-		end = Statusbar_AddString(end, "(PF)");
+		mode = cache ? "(PFD)" : "(PF)";
+	else if (cache)
+		mode = "(D)";
+	end = Statusbar_AddString(end, mode);
 
 	/* additional WinUAE CPU/FPU info */
 	*end++ = '/';
-- 
2.39.2

Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/