CogVM source as per VMMaker.oscog-eem.3047

Fix the performance regression for compilation performance introduced by VMMaker.oscog-eem.2994 (primitiveFlushCacheByMethod).
OpenSmalltalk · Aug 22, 2021 · 12b0d50 · 12b0d50 · marceltaeumel · Aug 23, 2021
1 parent 33013a9
commit 12b0d50
Show file tree

Hide file tree

Showing 51 changed files with 1,192 additions and 5,272 deletions.
diff --git a/spur64src/vm/cogit.h b/spur64src/vm/cogit.h
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3041 uuid: d49739b7-03f7-49a6-817b-f6f232342ad7
+	CCodeGenerator VMMaker.oscog-eem.3047 uuid: 548d0a5b-eb23-4df6-bbb1-0b431cc840b3
  */
 
 

diff --git a/spur64src/vm/cogitARMv8.c b/spur64src/vm/cogitARMv8.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3041 uuid: d49739b7-03f7-49a6-817b-f6f232342ad7
+	CCodeGenerator VMMaker.oscog-eem.3047 uuid: 548d0a5b-eb23-4df6-bbb1-0b431cc840b3
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.3041 uuid: d49739b7-03f7-49a6-817b-f6f232342ad7
+	StackToRegisterMappingCogit VMMaker.oscog-eem.3047 uuid: 548d0a5b-eb23-4df6-bbb1-0b431cc840b3
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3041 uuid: d49739b7-03f7-49a6-817b-f6f232342ad7 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3047 uuid: 548d0a5b-eb23-4df6-bbb1-0b431cc840b3 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -2704,6 +2704,7 @@ void (*realCEEnterCogCodePopReceiverReg)(void);
 #define halt() warning("halt")
 #define haltmsg(msg) warning("halt: " msg)
 #define interpretOffset() missOffset
+#define mapPerMethodProfile() 0
 #define maxCogCodeSize() (16*1024*1024)
 #define maybeBreakGeneratingFromto(address,end) 0
 #define maybeBreakGeneratingInstructionWithIndex(i) 0
@@ -2712,6 +2713,7 @@ void (*realCEEnterCogCodePopReceiverReg)(void);
 #define methodZoneBase() methodZoneBase
 #define minCallAddress() minValidCallAddress
 #define minCogMethodAddress() methodZoneBase
+#define moveProfileToMethods() 0
 #define noCheckEntryOffset() cmNoCheckEntryOffset
 #define noContextSwitchBlockEntryOffset() blockNoContextSwitchOffset
 #define notYetImplemented() warning("not yet implemented")
@@ -7270,7 +7272,7 @@ rewriteImm19JumpBeforetarget(AbstractInstruction * self_in_rewriteImm19JumpBefor
 static sqInt NoDbgRegParms
 rewriteImm26JumpBeforetarget(AbstractInstruction * self_in_rewriteImm26JumpBeforetarget, sqInt followingAddress, sqInt targetAddress)
 {
-    sqInt instrOpcode;
+    usqInt instrOpcode;
     sqInt mcpc;
     sqInt offset;
 
@@ -7280,7 +7282,7 @@ rewriteImm26JumpBeforetarget(AbstractInstruction * self_in_rewriteImm26JumpBefor
 	instrOpcode = ((instructionBeforeAddress(self_in_rewriteImm26JumpBeforetarget, followingAddress))) >> 26;
 	assert((instrOpcode == 5)
 	 || (instrOpcode == 37));
-	codeLong32Atput(mcpc, (((sqInt)((usqInt)(instrOpcode) << 26))) + (((offset) >> 2) & (0x3FFFFFF)));
+	codeLong32Atput(mcpc, (instrOpcode << 26) + (((offset) >> 2) & (0x3FFFFFF)));
 	return 4;
 }
 
@@ -10116,6 +10118,7 @@ compactCogCompiledCode(void)
 
 	assertValidDualZone();
 	assert(noCogMethodsMaximallyMarked());
+	moveProfileToMethods();
 	/* begin ensureWritableCodeZone */
 #  if !DUAL_MAPPED_CODE_ZONE
 	/* begin makeCodeZoneWritable */
@@ -11774,6 +11777,7 @@ void
 freeCogMethod(CogMethod *cogMethod)
 {
 
+	moveProfileToMethods();
 	freeMethod(cogMethod);
 	/* begin ensureExecutableCodeZone */
 #  if !DUAL_MAPPED_CODE_ZONE
@@ -11793,9 +11797,10 @@ freeCogMethod(CogMethod *cogMethod)
 void
 freeUnmarkedMachineCode(void)
 {
-    CogMethod *cogMethod;
+    CogMethod * cogMethod;
     sqInt freedMethod;
 
+	moveProfileToMethods();
 	freedMethod = 0;
 	cogMethod = ((CogMethod *) methodZoneBase);
 	while (cogMethod < (limitZony())) {
@@ -14155,6 +14160,7 @@ mapObjectReferencesInMachineCode(sqInt gcMode)
 	default:
 		error("Case not found and no otherwise clause");
 	}
+	mapPerMethodProfile();
 	if (!(asserta((freeStart()) <= (youngReferrers())))) {
 		error("youngReferrers list overflowed");
 	}

diff --git a/spur64src/vm/cogitX64SysV.c b/spur64src/vm/cogitX64SysV.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3041 uuid: d49739b7-03f7-49a6-817b-f6f232342ad7
+	CCodeGenerator VMMaker.oscog-eem.3047 uuid: 548d0a5b-eb23-4df6-bbb1-0b431cc840b3
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.3041 uuid: d49739b7-03f7-49a6-817b-f6f232342ad7
+	StackToRegisterMappingCogit VMMaker.oscog-eem.3047 uuid: 548d0a5b-eb23-4df6-bbb1-0b431cc840b3
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3041 uuid: d49739b7-03f7-49a6-817b-f6f232342ad7 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3047 uuid: 548d0a5b-eb23-4df6-bbb1-0b431cc840b3 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -2626,6 +2626,7 @@ void (*realCEEnterCogCodePopReceiverReg)(void);
 #define halt() warning("halt")
 #define haltmsg(msg) warning("halt: " msg)
 #define interpretOffset() missOffset
+#define mapPerMethodProfile() 0
 #define maxCogCodeSize() (16*1024*1024)
 #define maybeBreakGeneratingFromto(address,end) 0
 #define maybeBreakGeneratingInstructionWithIndex(i) 0
@@ -2634,6 +2635,7 @@ void (*realCEEnterCogCodePopReceiverReg)(void);
 #define methodZoneBase() methodZoneBase
 #define minCallAddress() minValidCallAddress
 #define minCogMethodAddress() methodZoneBase
+#define moveProfileToMethods() 0
 #define noCheckEntryOffset() cmNoCheckEntryOffset
 #define noContextSwitchBlockEntryOffset() blockNoContextSwitchOffset
 #define notYetImplemented() warning("not yet implemented")
@@ -5487,6 +5489,7 @@ compactCogCompiledCode(void)
 {
 	assertValidDualZone();
 	assert(noCogMethodsMaximallyMarked());
+	moveProfileToMethods();
 	/* begin ensureWritableCodeZone */
 #  if !DUAL_MAPPED_CODE_ZONE
 
@@ -7128,6 +7131,7 @@ followMovableLiteralsAndUpdateYoungReferrers(void)
 void
 freeCogMethod(CogMethod *cogMethod)
 {
+	moveProfileToMethods();
 	freeMethod(cogMethod);
 	/* begin ensureExecutableCodeZone */
 #  if !DUAL_MAPPED_CODE_ZONE
@@ -7144,9 +7148,10 @@ freeCogMethod(CogMethod *cogMethod)
 void
 freeUnmarkedMachineCode(void)
 {
-    CogMethod *cogMethod;
+    CogMethod * cogMethod;
     sqInt freedMethod;
 
+	moveProfileToMethods();
 	freedMethod = 0;
 	cogMethod = ((CogMethod *) methodZoneBase);
 	while (cogMethod < (limitZony())) {
@@ -9205,6 +9210,7 @@ mapObjectReferencesInMachineCode(sqInt gcMode)
 	default:
 		error("Case not found and no otherwise clause");
 	}
+	mapPerMethodProfile();
 	if (!(asserta((freeStart()) <= (youngReferrers())))) {
 		error("youngReferrers list overflowed");
 	}

diff --git a/spur64src/vm/cogitX64WIN64.c b/spur64src/vm/cogitX64WIN64.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3041 uuid: d49739b7-03f7-49a6-817b-f6f232342ad7
+	CCodeGenerator VMMaker.oscog-eem.3047 uuid: 548d0a5b-eb23-4df6-bbb1-0b431cc840b3
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.3041 uuid: d49739b7-03f7-49a6-817b-f6f232342ad7
+	StackToRegisterMappingCogit VMMaker.oscog-eem.3047 uuid: 548d0a5b-eb23-4df6-bbb1-0b431cc840b3
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3041 uuid: d49739b7-03f7-49a6-817b-f6f232342ad7 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3047 uuid: 548d0a5b-eb23-4df6-bbb1-0b431cc840b3 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -2626,6 +2626,7 @@ void (*realCEEnterCogCodePopReceiverReg)(void);
 #define halt() warning("halt")
 #define haltmsg(msg) warning("halt: " msg)
 #define interpretOffset() missOffset
+#define mapPerMethodProfile() 0
 #define maxCogCodeSize() (16*1024*1024)
 #define maybeBreakGeneratingFromto(address,end) 0
 #define maybeBreakGeneratingInstructionWithIndex(i) 0
@@ -2634,6 +2635,7 @@ void (*realCEEnterCogCodePopReceiverReg)(void);
 #define methodZoneBase() methodZoneBase
 #define minCallAddress() minValidCallAddress
 #define minCogMethodAddress() methodZoneBase
+#define moveProfileToMethods() 0
 #define noCheckEntryOffset() cmNoCheckEntryOffset
 #define noContextSwitchBlockEntryOffset() blockNoContextSwitchOffset
 #define notYetImplemented() warning("not yet implemented")
@@ -5487,6 +5489,7 @@ compactCogCompiledCode(void)
 {
 	assertValidDualZone();
 	assert(noCogMethodsMaximallyMarked());
+	moveProfileToMethods();
 	/* begin ensureWritableCodeZone */
 #  if !DUAL_MAPPED_CODE_ZONE
 
@@ -7136,6 +7139,7 @@ followMovableLiteralsAndUpdateYoungReferrers(void)
 void
 freeCogMethod(CogMethod *cogMethod)
 {
+	moveProfileToMethods();
 	freeMethod(cogMethod);
 	/* begin ensureExecutableCodeZone */
 #  if !DUAL_MAPPED_CODE_ZONE
@@ -7152,9 +7156,10 @@ freeCogMethod(CogMethod *cogMethod)
 void
 freeUnmarkedMachineCode(void)
 {
-    CogMethod *cogMethod;
+    CogMethod * cogMethod;
     sqInt freedMethod;
 
+	moveProfileToMethods();
 	freedMethod = 0;
 	cogMethod = ((CogMethod *) methodZoneBase);
 	while (cogMethod < (limitZony())) {
@@ -9223,6 +9228,7 @@ mapObjectReferencesInMachineCode(sqInt gcMode)
 	default:
 		error("Case not found and no otherwise clause");
 	}
+	mapPerMethodProfile();
 	if (!(asserta((freeStart()) <= (youngReferrers())))) {
 		error("youngReferrers list overflowed");
 	}