feat: 显示cpu的L4缓存信息

 D3000适配L4

Log: New cpu D3000适配

Task: https://pms.uniontech.com/task-view-358933.html

Author: shuaijie

deepin-devicemanager-server/deepin-deviceinfo/src/loadinfo/cpu/corecpu.cpp

@@ -62,6 +62,7 @@ void CoreCpu::getInfo(QString &info)
         appendKeyValue(info, "L1i cache", logical.l1iCache());
         appendKeyValue(info, "L2 cache", logical.l2Cache());
         appendKeyValue(info, "L3 cache", logical.l3Cache());
+        appendKeyValue(info, "L4 cache", logical.l4Cache());
         appendKeyValue(info, "CPU MHz", logical.curFreq());
         appendKeyValue(info, "CPU max MHz", logical.maxFreq());
         appendKeyValue(info, "CPU min MHz", logical.minFreq());

deepin-devicemanager-server/deepin-deviceinfo/src/loadinfo/cpu/cpuinfo.cpp

@@ -368,6 +368,8 @@ void CpuInfo::readCpuCacheIndex(const QString &path, LogicalCpu &lcpu)
         lcpu.setL2Cache(value);
     } else if (level == 3) {
         lcpu.setL3Cache(value);
+    } else if (level == 4) {
+        lcpu.setL4Cache(value);
     } else if (level == 1) {
         if (type.contains("Data", Qt::CaseInsensitive))
             lcpu.setL1dCache(value);

deepin-devicemanager-server/deepin-deviceinfo/src/loadinfo/cpu/logicalcpu.cpp

@@ -49,6 +49,11 @@ void LogicalCpu::setL3Cache(const QString &value)
     Q_D(LogicalCpu);
     d->l3_cache = value;
 }
+void LogicalCpu::setL4Cache(const QString &value)
+{
+    Q_D(LogicalCpu);
+    d->l4_cache = value;
+}
 void LogicalCpu::setMinFreq(const QString &value)
 {
     Q_D(LogicalCpu);
@@ -141,6 +146,11 @@ const QString &LogicalCpu::l3Cache()
     Q_D(LogicalCpu);
     return d->l3_cache;
 }
+const QString &LogicalCpu::l4Cache()
+{
+    Q_D(LogicalCpu);
+    return d->l4_cache;
+}
 const QString &LogicalCpu::minFreq()
 {
     Q_D(LogicalCpu);
@@ -208,6 +218,7 @@ void LogicalCpu::diagPrintInfo()
     qCInfo(appLog) << "l1i_cache  : " << d->l1i_cache;
     qCInfo(appLog) << "l2_cache   : " << d->l2_cache;
     qCInfo(appLog) << "l3_cache   : " << d->l3_cache;
+    qCInfo(appLog) << "l4_cache   : " << d->l4_cache;
     qCInfo(appLog) << "max_freq   : " << d->max_freq;
     qCInfo(appLog) << "min_freq   : " << d->min_freq;
     qCInfo(appLog) << "cur_freq   : " << d->cur_freq;

deepin-devicemanager-server/deepin-deviceinfo/src/loadinfo/cpu/logicalcpu.h

@@ -55,6 +55,12 @@ class LogicalCpu
      */
     void setL3Cache(const QString &value);
 
+    /**
+     * @brief setL4Cache : set l4 cache
+     * @param value cache
+     */
+    void setL4Cache(const QString &value);
+
     /**
      * @brief setMinFreq : set min freq
      * @param value : freq
@@ -168,6 +174,12 @@ class LogicalCpu
      */
     const QString &l3Cache();
 
+    /**
+     * @brief l4Cache
+     * @return : value
+     */
+    const QString &l4Cache();
+
     /**
      * @brief minFreq
      * @return : value
@@ -253,6 +265,7 @@ class LogicalCpuPrivate
         , l1i_cache("")
         , l2_cache("")
         , l3_cache("")
+        , l4_cache("")
         , max_freq("")
         , min_freq("")
         , cur_freq("")
@@ -275,6 +288,7 @@ class LogicalCpuPrivate
     QString     l1i_cache;             // l1i cache
     QString     l2_cache;              // l2 cache
     QString     l3_cache;              // l3 cache
+    QString     l4_cache;              // l4 cache
     QString     max_freq;              // max freq
     QString     min_freq;              // min freq
     QString     cur_freq;              // cur freq

deepin-devicemanager/src/DeviceManager/DeviceCpu.cpp

@@ -23,6 +23,7 @@ DeviceCpu::DeviceCpu()
     , m_CacheL1Order("")
     , m_CacheL2("")
     , m_CacheL3("")
+    , m_CacheL4("")
     , m_Extensions("")
     , m_Flags("")
     , m_HardwareVirtual("")
@@ -137,6 +138,7 @@ void DeviceCpu::setInfoFromLscpu(const QMap<QString, QString> &mapInfo)
     setAttribute(mapInfo, "L1i cache", m_CacheL1Order);
     setAttribute(mapInfo, "L2 cache", m_CacheL2);
     setAttribute(mapInfo, "L3 cache", m_CacheL3);
+    setAttribute(mapInfo, "L4 cache", m_CacheL4);
     setAttribute(mapInfo, "flags", m_Flags);
     setAttribute(mapInfo, "Virtualization", m_HardwareVirtual);
 
@@ -228,6 +230,7 @@ TomlFixMethod DeviceCpu::setInfoFromTomlOneByOne(const QMap<QString, QString> &m
     ret = setTomlAttribute(mapInfo, "Virtualization", m_HardwareVirtual);
     ret = setTomlAttribute(mapInfo, "Flags", m_Flags);
     ret = setTomlAttribute(mapInfo, "Extensions", m_Extensions);
+    ret = setTomlAttribute(mapInfo, "L4 Cache", m_CacheL4);
     ret = setTomlAttribute(mapInfo, "L3 Cache", m_CacheL3);
     ret = setTomlAttribute(mapInfo, "L2 Cache", m_CacheL2);
     ret = setTomlAttribute(mapInfo, "L1i Cache", m_CacheL1Order);
@@ -272,6 +275,7 @@ void DeviceCpu::loadOtherDeviceInfo()
     addOtherDeviceInfo(tr("L1i Cache"), m_CacheL1Order);
     addOtherDeviceInfo(tr("L1d Cache"), m_CacheL1Data);
     addOtherDeviceInfo(tr("Stepping"), m_Step);
+    addOtherDeviceInfo(tr("L4 Cache"), m_CacheL4);
 
     // 将QMap<QString, QString>内容转存为QList<QPair<QString, QString>>
     mapInfoToList();

deepin-devicemanager/src/DeviceManager/DeviceCpu.h

@@ -159,6 +159,7 @@ class DeviceCpu : public DeviceBaseInfo
     QString           m_CacheL1Order;       //<! L1缓存（指令）
     QString           m_CacheL2;            //<! L2缓存
     QString           m_CacheL3;            //<! L3缓存
+    QString           m_CacheL4;            //<! L4缓存
     QString           m_Extensions;         //<! 扩展指令集
     QString           m_Flags;              //<! 特性
     QString           m_HardwareVirtual;    //<! 硬件虚拟化

deepin-devicemanager/translations/deepin-devicemanager_zh_CN.ts

@@ -447,6 +447,11 @@
         <source>L3 Cache</source>
         <translation>L3缓存</translation>
     </message>
+    <message>
+        <location filename="../src/DeviceManager/DeviceCpu.cpp" line="275"/>
+        <source>L4 Cache</source>
+        <translation>L4缓存</translation>
+    </message>
     <message>
         <location filename="../src/DeviceManager/DeviceCpu.cpp" line="271"/>
         <source>L2 Cache</source>