Changeset 90140 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Jul 9, 2021 10:29:54 PM (4 years ago)

Author:

vboxsync

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

145642

Message:

DevHda: Aligned the codec state more along cache lines. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHda.h (modified) (1 diff)
• DevHdaCodec.h (modified) (1 diff)

trunk/src/VBox/Devices/Audio/DevHda.h

@@ -754 +754 @@
         R3PTRTYPE(char *)       pszOutPath;
     } Dbg;
-
+    /** Align the codec state on a cache line. */
+    uint64_t                au64Padding[3];
     /** The HDA codec state. */
     HDACODECR3              Codec;
 } HDASTATER3;
+AssertCompileMemberAlignment(HDASTATER3, Codec, 64);
 
 

trunk/src/VBox/Devices/Audio/DevHdaCodec.h

@@ -796 +796 @@
 {
     /** Codec implementation type. */
-    CODECTYPE  enmType;
+    CODECTYPE   enmType;
     /** Codec ID. */
-    uint16_t   id;
-    uint16_t   u16VendorId;
-    uint16_t   u16DeviceId;
-    uint8_t    u8BSKU;
-    uint8_t    u8AssemblyId;
-
-    CODECNODE  aNodes[CODEC_NODES_MAX];
-    uint32_t   cNodes;
-
-    bool       fInReset;
-    uint8_t    abPadding1[3]; /**< @todo r=bird: Merge with bPadding2 and eliminate both */
-
-    uint8_t    cTotalNodes;
-    uint8_t    u8AdcVolsLineIn;
-    uint8_t    u8DacLineOut;
-    uint8_t    bPadding2;
-
-    uint8_t    au8Ports[CODEC_NODES_MAX];
-    uint8_t    au8Dacs[CODEC_NODES_MAX];
-    uint8_t    au8AdcVols[CODEC_NODES_MAX];
-    uint8_t    au8Adcs[CODEC_NODES_MAX];
-    uint8_t    au8AdcMuxs[CODEC_NODES_MAX];
-    uint8_t    au8Pcbeeps[CODEC_NODES_MAX];
-    uint8_t    au8SpdifIns[CODEC_NODES_MAX];
-    uint8_t    au8SpdifOuts[CODEC_NODES_MAX];
-    uint8_t    au8DigInPins[CODEC_NODES_MAX];
-    uint8_t    au8DigOutPins[CODEC_NODES_MAX];
-    uint8_t    au8Cds[CODEC_NODES_MAX];
-    uint8_t    au8VolKnobs[CODEC_NODES_MAX];
-    uint8_t    au8Reserveds[CODEC_NODES_MAX];
+    uint16_t    id;
+    uint16_t    u16VendorId;
+    uint16_t    u16DeviceId;
+    uint8_t     u8BSKU;
+    uint8_t     u8AssemblyId;
+
+    bool        fInReset;
+
+    uint8_t     cTotalNodes;
+    uint8_t     u8AdcVolsLineIn;
+    uint8_t     u8DacLineOut;
+
+    uint32_t    cNodes;
+
+    /** Align the lists below so they don't cross cache lines (assumes
+     *  CODEC_NODES_MAX is 32). */
+    uint8_t     abPadding1[CODEC_NODES_MAX - 20];
+
+    uint8_t     au8Ports[CODEC_NODES_MAX];
+    uint8_t     au8Dacs[CODEC_NODES_MAX];
+    uint8_t     au8AdcVols[CODEC_NODES_MAX];
+    uint8_t     au8Adcs[CODEC_NODES_MAX];
+    uint8_t     au8AdcMuxs[CODEC_NODES_MAX];
+    uint8_t     au8Pcbeeps[CODEC_NODES_MAX];
+    uint8_t     au8SpdifIns[CODEC_NODES_MAX];
+    uint8_t     au8SpdifOuts[CODEC_NODES_MAX];
+    uint8_t     au8DigInPins[CODEC_NODES_MAX];
+    uint8_t     au8DigOutPins[CODEC_NODES_MAX];
+    uint8_t     au8Cds[CODEC_NODES_MAX];
+    uint8_t     au8VolKnobs[CODEC_NODES_MAX];
+    uint8_t     au8Reserveds[CODEC_NODES_MAX];
+
+    /** Safty zero padding before the nodes start. */
+    uint8_t     abSaftyPadding2[CODEC_NODES_MAX * 2];
+
+    CODECNODE   aNodes[CODEC_NODES_MAX];
 
     STAMCOUNTER StatLookupsR3;
+    uint64_t    au64Padding3[7];
 } HDACODECR3;
+AssertCompile(RT_IS_POWER_OF_TWO(CODEC_NODES_MAX));
+AssertCompileMemberAlignment(HDACODECR3, au8Ports, CODEC_NODES_MAX);
+AssertCompileMemberAlignment(HDACODECR3, aNodes, 64);
+AssertCompileSizeAlignment(HDACODECR3, 8);
+AssertCompileSizeAlignment(HDACODECR3, 16);
+AssertCompileSizeAlignment(HDACODECR3, 32);
+AssertCompileSizeAlignment(HDACODECR3, 64);