Changeset 104947 in vbox for trunk/src/VBox/VMM/testcase/Makefile.kmk

Timestamp:

Jun 17, 2024 8:23:40 PM (7 months ago)

Author:

vboxsync

Message:

VMM/IEM,tstVMStructSize: Made the IEM TLB size more easily configurable. Include the IEM statistics in the tstVMStructSize testcase so it can be run to figure out the correct paddings. bugref:10687

File:

• trunk/src/VBox/VMM/testcase/Makefile.kmk (modified) (7 diffs)

trunk/src/VBox/VMM/testcase/Makefile.kmk

@@ -175 +175 @@
 tstVMStructSize_INCS    = \
         $(VBOX_PATH_VMM_SRC)/include \
-        $(VBOX_PATH_VMM_SRC)/PATM \
+        $(tstVMStructSize_0_OUTDIR) \
         $(VBOX_VMM_TESTCASE_OUT_DIR)
 tstVMStructSize_SOURCES = tstVMStructSize.cpp
@@ -184 +184 @@
  tstVMStructSize_DEFS  += VBOX_WITH_R0_LOGGING
 endif
+$(call KB_FN_DO_PASS0_ON_TARGET,tstVMStructSize)
+$(evalcall2 def_VBoxGenIEMInstructionStatisticsTmpl_Header,tstVMStructSize,$(tstVMStructSize_0_OUTDIR))
 
 tstAsmStructs_TEMPLATE  = VBoxR3AutoTest
@@ -239 +241 @@
 # Testcase for checking the C (IEMAllAImplC.cpp) and assembly (IEMAllAImpl.asm)
 # instruction emulation helpers.
-#
-# Note! The IN_TSTVMSTRUCT define is for avoiding IEMInstructionStatisticsTmpl.h.
 #
 TSTIEMAIMPL_TEST_DATA_DEPS := \
@@ -654 +654 @@
 
 tstIEMAImpl_TEMPLATE  = VBoxR3TstExe
-tstIEMAImpl_DEFS      = $(VMM_COMMON_DEFS) IEM_WITHOUT_ASSEMBLY IN_TSTVMSTRUCT
+tstIEMAImpl_DEFS      = $(VMM_COMMON_DEFS) IEM_WITHOUT_ASSEMBLY IEM_WITHOUT_INSTRUCTION_STATS
 tstIEMAImpl_SDKS      = VBoxSoftFloatR3Shared
 tstIEMAImpl_INCS      = ../include .
@@ -676 +676 @@
 tstIEMAImplAsm_TEMPLATE      := VBoxR3TstExe
 tstIEMAImplAsm_SDKS          := VBoxSoftFloatR3Shared
-tstIEMAImplAsm_DEFS           = $(VMM_COMMON_DEFS) IEM_WITH_ASSEMBLY IN_TSTVMSTRUCT TSTIEMAIMPL_WITH_GENERATOR
+tstIEMAImplAsm_DEFS           = $(VMM_COMMON_DEFS) IEM_WITH_ASSEMBLY IEM_WITHOUT_INSTRUCTION_STATS TSTIEMAIMPL_WITH_GENERATOR
 tstIEMAImplAsm_ASFLAGS.amd64 := -Werror
 tstIEMAImplAsm_ASFLAGS.x86   := -Werror
@@ -700 +700 @@
 tstIEMCheckMc_TEMPLATE  = VBoxR3TstExe
 tstIEMCheckMc_SOURCES   = tstIEMCheckMc.cpp
-tstIEMCheckMc_DEFS      = $(VMM_COMMON_DEFS)
+tstIEMCheckMc_DEFS      = $(VMM_COMMON_DEFS) IEM_WITHOUT_INSTRUCTION_STATS
 tstIEMCheckMc_LIBS      = $(LIB_RUNTIME)
 ifeq ($(KBUILD_TARGET),win)
@@ -974 +974 @@
   || defined(VBOX_WITH_DTRACE_RC))
  tstVMStructDTrace_TEMPLATE = VBoxR3AutoTest
- tstVMStructDTrace_DEFS    = VBOX_IN_VMM IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS)
+ tstVMStructDTrace_DEFS    = VBOX_IN_VMM IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS) IEM_WITHOUT_INSTRUCTION_STATS
  ifdef VBOX_WITH_RAW_MODE
   tstVMStructDTrace_DEFS  += VBOX_WITH_RAW_MODE