Changeset 101722 in vbox for trunk/src/VBox/VMM/VMMAll/IEMAllThrdPython.py

Timestamp:

Nov 3, 2023 12:36:45 AM (16 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

159818

Message:

VMM/IEM: Identify the different styles IEM_MC_CALL_XXX and mark these using new IEM_CIMPL_F_CALLS_XXX flags in the python scripts. This is necessary as IEM_MC_CALL_CIMPL_X, IEM_MC_CALL_FPU_AIMPL_X, IEM_MC_CALL_MMX_AIMPL_X, and IEM_MC_CALL_SSE_AIMPL_X all have hidden parameters that need to be accounted for when recompiling to native code (for more perfect register allocations for variables). Split up the different cmpxchg16b AIMPL/CIMPL variations into separate MC blocks, as we can't mix AIMPL and CIMPL calls in the same block (also, in the CIMPL case, there would be unused tail code after the call). bugref:10371

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllThrdPython.py (modified) (7 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllThrdPython.py

@@ -419 +419 @@
         'IEM_CIMPL_F_END_TB':                       True,
         'IEM_CIMPL_F_XCPT':                         True,
+        'IEM_CIMPL_F_CALLS_CIMPL':                  False,
+        'IEM_CIMPL_F_CALLS_AIMPL':                  False,
+        'IEM_CIMPL_F_CALLS_AIMPL_WITH_FXSTATE':     False,
     };
 
@@ -1331 +1334 @@
                     self.dsCImplFlags['IEM_CIMPL_F_BRANCH_CONDITIONAL'] = True;
 
+            # Check for CIMPL and AIMPL calls.
+            if oStmt.sName.startswith('IEM_MC_CALL_'):
+                if oStmt.sName.startswith('IEM_MC_CALL_CIMPL_'):
+                    self.dsCImplFlags['IEM_CIMPL_F_CALLS_CIMPL'] = True;
+                elif (   oStmt.sName.startswith('IEM_MC_CALL_VOID_AIMPL_')
+                      or oStmt.sName.startswith('IEM_MC_CALL_AIMPL_')
+                      or oStmt.sName.startswith('IEM_MC_CALL_AVX_AIMPL_')):
+                    self.dsCImplFlags['IEM_CIMPL_F_CALLS_AIMPL'] = True;
+                elif (   oStmt.sName.startswith('IEM_MC_CALL_SSE_AIMPL_')
+                      or oStmt.sName.startswith('IEM_MC_CALL_MMX_AIMPL_')
+                      or oStmt.sName.startswith('IEM_MC_CALL_FPU_AIMPL_')):
+                    self.dsCImplFlags['IEM_CIMPL_F_CALLS_AIMPL_WITH_FXSTATE'] = True;
+                else:
+                    raise Exception('Unknown IEM_MC_CALL_* statement: %s' % (oStmt.sName,));
+
             # Process branches of conditionals recursively.
             if isinstance(oStmt, iai.McStmtCond):
@@ -1361 +1379 @@
         self.dsCImplFlags = self.oMcBlock.dsCImplFlags.copy();
         self.analyzeCodeOperation(aoStmts);
+        if (   ('IEM_CIMPL_F_CALLS_CIMPL' in self.dsCImplFlags)
+             + ('IEM_CIMPL_F_CALLS_AIMPL' in self.dsCImplFlags)
+             + ('IEM_CIMPL_F_CALLS_AIMPL_WITH_FXSTATE' in self.dsCImplFlags) > 1):
+            self.raiseProblem('Mixing CIMPL/AIMPL/AIMPL_WITH_FXSTATE calls');
 
         # Create variations as needed.
@@ -1824 +1846 @@
             if ian.g_dUnsupportedMcStmtLastOneVarStats:
                 asTopKeys = sorted(ian.g_dUnsupportedMcStmtLastOneVarStats, reverse = True,
-                                   key = lambda sSortKey: len(ian.g_dUnsupportedMcStmtLastOneVarStats[sSortKey]))[:10];
+                                   key = lambda sSortKey: len(ian.g_dUnsupportedMcStmtLastOneVarStats[sSortKey]))[:16];
                 print('todo:', file = sys.stderr);
-                print('todo: Top %s variations with variables and one unsupported statement dependency:' % (len(asTopKeys),),
+                print('todo: Top %s variations with variables and 1-2 unsupported statement dependency:' % (len(asTopKeys),),
                       file = sys.stderr);
                 cchMaxKey = max([len(sKey) for sKey in asTopKeys]);
@@ -1861 +1883 @@
                 cbVars = 0;
                 for oVar in oThreadedFunction.oMcBlock.aoLocals:
-                     cbVars += (getTypeBitCount(oVar.sType) + 63) // 64 * 8;
+                    cbVars += (getTypeBitCount(oVar.sType) + 63) // 64 * 8;
                 cbMaxVars        = max(cbMaxVars, cbVars);
                 cbMaxArgs        = max(cbMaxArgs, cbArgs);
@@ -2366 +2388 @@
                 #
                 elif oThreadedFunction.oMcBlock.iBeginLine != oThreadedFunction.oMcBlock.iEndLine:
-                    assert sLine.count('IEM_MC_') - sLine.count('IEM_MC_F_') == 1, 'sLine="%s"' % (sLine,);
+                    assert (   (sLine.count('IEM_MC_') - sLine.count('IEM_MC_F_') == 1)
+                            or oThreadedFunction.oMcBlock.iMacroExp == iai.McBlock.kMacroExp_Partial), 'sLine="%s"' % (sLine,);
                     oOut.write(sLine[:oThreadedFunction.oMcBlock.offBeginLine]);
                     sModified = oThreadedFunction.generateInputCode().strip();
@@ -2373 +2396 @@
                     iLine = oThreadedFunction.oMcBlock.iEndLine;
                     sLine = oParser.asLines[iLine - 1];
-                    assert sLine.count('IEM_MC_') - sLine.count('IEM_MC_F_') == 1 or len(oThreadedFunction.oMcBlock.aoStmts) == 1;
+                    assert (   sLine.count('IEM_MC_') - sLine.count('IEM_MC_F_') == 1
+                            or len(oThreadedFunction.oMcBlock.aoStmts) == 1
+                            or oThreadedFunction.oMcBlock.iMacroExp == iai.McBlock.kMacroExp_Partial);
                     oOut.write(sLine[oThreadedFunction.oMcBlock.offAfterEnd : ]);