Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
avocado
提交
24f7a3bc
A
avocado
项目概览
openeuler
/
avocado
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
avocado
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
24f7a3bc
编写于
5月 15, 2018
作者:
C
Cleber Rosa
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'utils_cpu_tests_v2'
Signed-off-by:
N
Cleber Rosa
<
crosa@redhat.com
>
上级
85175f00
74cd715b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
214 addition
and
3 deletion
+214
-3
avocado/utils/cpu.py
avocado/utils/cpu.py
+8
-1
selftests/unit/test_utils_cpu.py
selftests/unit/test_utils_cpu.py
+206
-2
未找到文件。
avocado/utils/cpu.py
浏览文件 @
24f7a3bc
...
...
@@ -129,10 +129,17 @@ def get_cpu_arch():
'|^bogomips per cpu|^max thread id)'
,
's390'
),
(
'^type'
,
'sparc64'
),
(
'^flags.*:.* lm .*'
,
'x86_64'
),
(
'^flags'
,
'i386'
)]
(
'^flags'
,
'i386'
),
(
'^hart
\\
s*: 1$'
,
'riscv'
)]
cpuinfo
=
_get_cpu_info
()
for
(
pattern
,
arch
)
in
cpu_table
:
if
_list_matches
(
cpuinfo
,
pattern
):
# ARM is a special situation, which matches both 32 bits
# (v7) and 64 bits (v8).
if
arch
==
'arm'
:
arm_v8_arch_name
=
'aarch64'
if
arm_v8_arch_name
==
platform
.
machine
():
return
arm_v8_arch_name
return
arch
return
platform
.
machine
()
...
...
selftests/unit/test_utils_cpu.py
浏览文件 @
24f7a3bc
...
...
@@ -26,7 +26,7 @@ class Cpu(unittest.TestCase):
@
unittest
.
skipUnless
(
recent_mock
(),
"mock library version cannot (easily) patch open()"
)
def
test_s390x
(
self
):
def
test_s390x
_cpu_online
(
self
):
s390x
=
u
"""vendor_id : IBM/S390
# processors : 2
bogomips per cpu: 2913.00
...
...
@@ -96,7 +96,7 @@ cpu MHz static : 5504
@
unittest
.
skipUnless
(
recent_mock
(),
"mock library version cannot (easily) patch open()"
)
def
test_x86_64
(
self
):
def
test_x86_64
_cpu_online
(
self
):
x86_64
=
u
"""processor : 0
vendor_id : GenuineIntel
cpu family : 6
...
...
@@ -319,6 +319,210 @@ power management:
return_value
=
self
.
_get_file_mock
(
x86_64
)):
self
.
assertEqual
(
len
(
cpu
.
cpu_online_list
()),
8
)
@
unittest
.
skipUnless
(
recent_mock
(),
"mock library version cannot (easily) patch open()"
)
def
test_cpu_arch_i386
(
self
):
cpu_output
=
u
"""processor : 0
vendor_id : GenuineIntel
cpu family : 6
model : 13
model name : Intel(R) Pentium(R) M processor 2.00GHz
stepping : 8
microcode : 0x20
cpu MHz : 2000.000
cache size : 2048 KB
physical id : 0
siblings : 1
core id : 0
cpu cores : 1
apicid : 0
initial apicid : 0
fdiv_bug : no
f00f_bug : no
coma_bug : no
fpu : yes
fpu_exception : yes
cpuid level : 2
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov clflush dts acpi mmx fxsr sse sse2 ss tm pbe nx bts cpuid est tm2
bugs : cpu_meltdown spectre_v1 spectre_v2
bogomips : 3990.09
clflush size : 64
cache_alignment : 64
address sizes : 32 bits physical, 32 bits virtual
power management:
"""
with
mock
.
patch
(
'avocado.utils.cpu.open'
,
return_value
=
self
.
_get_file_mock
(
cpu_output
)):
self
.
assertEqual
(
cpu
.
get_cpu_arch
(),
"i386"
)
@
unittest
.
skipUnless
(
recent_mock
(),
"mock library version cannot (easily) patch open()"
)
def
test_cpu_arch_x86_64
(
self
):
cpu_output
=
u
"""processor : 0
vendor_id : GenuineIntel
cpu family : 6
model : 60
model name : Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz
stepping : 3
microcode : 0x24
cpu MHz : 1766.058
cache size : 6144 KB
physical id : 0
siblings : 8
core id : 0
cpu cores : 4
apicid : 0
initial apicid : 0
fpu : yes
fpu_exception : yes
cpuid level : 13
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm cpuid_fault epb invpcid_single pti tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid xsaveopt ibpb ibrs stibp dtherm ida arat pln pts
bugs : cpu_meltdown spectre_v1 spectre_v2
bogomips : 5586.93
clflush size : 64
cache_alignment : 64
address sizes : 39 bits physical, 48 bits virtual
power management:
"""
with
mock
.
patch
(
'avocado.utils.cpu.open'
,
return_value
=
self
.
_get_file_mock
(
cpu_output
)):
self
.
assertEqual
(
cpu
.
get_cpu_arch
(),
"x86_64"
)
@
unittest
.
skipUnless
(
recent_mock
(),
"mock library version cannot (easily) patch open()"
)
def
test_cpu_arch_ppc64_power8
(
self
):
cpu_output
=
u
"""processor : 88
cpu : POWER8E (raw), altivec supported
clock : 3325.000000MHz
revision : 2.1 (pvr 004b 0201)
timebase : 512000000
platform : PowerNV
model : 8247-21L
machine : PowerNV 8247-21L
firmware : OPAL v3
"""
with
mock
.
patch
(
'avocado.utils.cpu.open'
,
return_value
=
self
.
_get_file_mock
(
cpu_output
)):
self
.
assertEqual
(
cpu
.
get_cpu_arch
(),
"power8"
)
@
unittest
.
skipUnless
(
recent_mock
(),
"mock library version cannot (easily) patch open()"
)
def
test_cpu_arch_ppc64_le_power8
(
self
):
cpu_output
=
u
"""processor : 88
cpu : POWER8E (raw), altivec supported
clock : 3325.000000MHz
revision : 2.1 (pvr 004b 0201)
timebase : 512000000
platform : PowerNV
model : 8247-21L
machine : PowerNV 8247-21L
firmware : OPAL v3
"""
with
mock
.
patch
(
'avocado.utils.cpu.open'
,
return_value
=
self
.
_get_file_mock
(
cpu_output
)):
self
.
assertEqual
(
cpu
.
get_cpu_arch
(),
"power8"
)
@
unittest
.
skipUnless
(
recent_mock
(),
"mock library version cannot (easily) patch open()"
)
def
test_cpu_arch_ppc64_le_power9
(
self
):
cpu_output
=
u
"""processor : 20
cpu : POWER9 (raw), altivec supported
clock : 2050.000000MHz
revision : 1.0 (pvr 004e 0100)
timebase : 512000000
platform : PowerNV
model : 8375-42A
machine : PowerNV 8375-42A
firmware : OPAL
"""
with
mock
.
patch
(
'avocado.utils.cpu.open'
,
return_value
=
self
.
_get_file_mock
(
cpu_output
)):
self
.
assertEqual
(
cpu
.
get_cpu_arch
(),
"power9"
)
@
unittest
.
skipUnless
(
recent_mock
(),
"mock library version cannot (easily) patch open()"
)
def
test_cpu_arch_s390
(
self
):
cpu_output
=
u
"""vendor_id : IBM/S390
# processors : 2
bogomips per cpu: 2913.00
max thread id : 0
features : esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs te sie
facilities : 0 1 2 3 4 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 30 31 32 33 34 35 36 37 40 41 42 43 44 45 46 47 48 49 50 51 52 57 64 65 66 67 68 69 70 71 72 73 75 76 77 78 81 82 131 132
cache0 : level=1 type=Data scope=Private size=96K line_size=256 associativity=6
cache1 : level=1 type=Instruction scope=Private size=64K line_size=256 associativity=4
cache2 : level=2 type=Data scope=Private size=1024K line_size=256 associativity=8
cache3 : level=2 type=Instruction scope=Private size=1024K line_size=256 associativity=8
cache4 : level=3 type=Unified scope=Shared size=49152K line_size=256 associativity=12
cache5 : level=4 type=Unified scope=Shared size=393216K line_size=256 associativity=24
processor 0: version = 00, identification = 3FC047, machine = 2827
processor 1: version = 00, identification = 3FC047, machine = 2827
cpu number : 0
cpu MHz dynamic : 5504
cpu MHz static : 5504
cpu number : 1
cpu MHz dynamic : 5504
cpu MHz static : 5504
"""
with
mock
.
patch
(
'avocado.utils.cpu.open'
,
return_value
=
self
.
_get_file_mock
(
cpu_output
)):
self
.
assertEqual
(
cpu
.
get_cpu_arch
(),
"s390"
)
@
unittest
.
skipUnless
(
recent_mock
(),
"mock library version cannot (easily) patch open()"
)
def
test_cpu_arch_arm_v7
(
self
):
cpu_output
=
u
"""Processor : ARMv7 Processor rev 2 (v7l)
BogoMIPS : 994.65
Features : swp half thumb fastmult vfp edsp thumbee neon vfpv3
CPU implementer : 0x41
CPU architecture: 7
CPU variant : 0x2
CPU part : 0xc08
CPU revision : 2
Hardware : herring
Revision : 0034
Serial : 3534268a5e0700ec
"""
with
mock
.
patch
(
'avocado.utils.cpu.open'
,
return_value
=
self
.
_get_file_mock
(
cpu_output
)):
self
.
assertEqual
(
cpu
.
get_cpu_arch
(),
"arm"
)
@
unittest
.
skipUnless
(
recent_mock
(),
"mock library version cannot (easily) patch open()"
)
def
test_cpu_arch_arm_v8
(
self
):
cpu_output
=
u
"""processor : 0
BogoMIPS : 200.00
Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 cpuid
CPU implementer : 0x43
CPU architecture: 8
CPU variant : 0x1
CPU part : 0x0a1
CPU revision : 1
"""
with
mock
.
patch
(
'avocado.utils.cpu.platform.machine'
,
return_value
=
'aarch64'
):
with
mock
.
patch
(
'avocado.utils.cpu.open'
,
return_value
=
self
.
_get_file_mock
(
cpu_output
)):
self
.
assertEqual
(
cpu
.
get_cpu_arch
(),
"aarch64"
)
@
unittest
.
skipUnless
(
recent_mock
(),
"mock library version cannot (easily) patch open()"
)
def
test_cpu_arch_risc_v
(
self
):
cpu_output
=
u
"""hart : 1
isa : rv64imafdc
mmu : sv39
uarch : sifive,rocket0
"""
with
mock
.
patch
(
'avocado.utils.cpu.open'
,
return_value
=
self
.
_get_file_mock
(
cpu_output
)):
self
.
assertEqual
(
cpu
.
get_cpu_arch
(),
"riscv"
)
if
__name__
==
"__main__"
:
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录