derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arch-arm: Replace CRYPTO extension with canonical names (#810)

Browse Source 
These are:

FEAT_AES,
FEAT_PMULL,
FEAT_SHA256,
FEAT_SHA1,
FEAT_CRC32

With this patch we are also enabling them by default by adding them to
the Armv8 release object. Some of them are mandatory anyway since
Armv8.1

Change-Id: I221ae8646d91151fdfaf97a4815168a4fe3d8c5a

Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
This commit is contained in:
Giacomo Travaglini
2024-01-26 19:39:35 +00:00
committed by GitHub
parent 8a6804231c
commit ce32d7c523
3 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/arch/arm/ArmISA.py
View File

@@ -1,4 +1,4 @@
# Copyright (c) 2012-2013, 2015-2022 ARM Limited
# Copyright (c) 2012-2013, 2015-2022, 2024 Arm Limited
# All rights reserved.
#
# The license below extends only to copyright in the software and shall
@@ -52,7 +52,11 @@ class DecoderFlavor(Enum):
class ArmDefaultSERelease(ArmRelease):
extensions = [
"CRYPTO",
"FEAT_AES",
"FEAT_PMULL",
"FEAT_SHA1",
"FEAT_SHA256",
"FEAT_CRC32",
# Armv8.1
"FEAT_LSE",
"FEAT_RDM",

19
src/arch/arm/ArmSystem.py
View File

@@ -1,4 +1,4 @@
# Copyright (c) 2009, 2012-2013, 2015-2023 Arm Limited
# Copyright (c) 2009, 2012-2013, 2015-2024 Arm Limited
# All rights reserved.
#
# The license below extends only to copyright in the software and shall
@@ -65,6 +65,11 @@ class SmeVectorLength(UInt8):
class ArmExtension(ScopedEnum):
vals = [
"FEAT_AES",
"FEAT_PMULL",
"FEAT_SHA1",
"FEAT_SHA256",
"FEAT_CRC32",
# Armv8.1
"FEAT_VHE",
"FEAT_PAN",
@@ -109,7 +114,6 @@ class ArmExtension(ScopedEnum):
"SECURITY",
"LPAE",
"VIRTUALIZATION",
"CRYPTO",
"TME",
]
@@ -159,7 +163,16 @@ class ArmRelease(SimObject):
class Armv8(ArmRelease):
extensions = ["LPAE", "VIRTUALIZATION", "SECURITY"]
extensions = [
"LPAE",
"VIRTUALIZATION",
"SECURITY",
"FEAT_AES",
"FEAT_PMULL",
"FEAT_SHA1",
"FEAT_SHA256",
"FEAT_CRC32",
]
class ArmDefaultRelease(Armv8):

36
src/arch/arm/regs/misc.cc
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010-2013, 2015-2023 Arm Limited
* Copyright (c) 2010-2013, 2015-2024 Arm Limited
* All rights reserved
*
* The license below extends only to copyright in the software and shall
@@ -3181,17 +3181,12 @@ ISA::initializeMiscRegMetadata()
InitReg(MISCREG_ID_ISAR5)
.reset([p,release=release] () {
ISAR5 isar5 = p.id_isar5;
if (release->has(ArmExtension::CRYPTO)) {
isar5.crc32 = 1;
isar5.sha2 = 1;
isar5.sha1 = 1;
isar5.aes = 2;
} else {
isar5.crc32 = 0;
isar5.sha2 = 0;
isar5.sha1 = 0;
isar5.aes = 0;
}
isar5.crc32 = release->has(ArmExtension::FEAT_CRC32) ? 0x1 : 0x0;
isar5.sha2 = release->has(ArmExtension::FEAT_SHA256) ? 0x1 : 0x0;
isar5.sha1 = release->has(ArmExtension::FEAT_SHA1) ? 0x1 : 0x0;
isar5.aes = release->has(ArmExtension::FEAT_PMULL) ?
0x2 : release->has(ArmExtension::FEAT_AES) ?
0x1 : 0x0;
isar5.rdm = release->has(ArmExtension::FEAT_RDM) ? 0x1 : 0x0;
isar5.vcma = release->has(ArmExtension::FEAT_FCMA) ? 0x1 : 0x0;
return isar5;
@@ -4451,17 +4446,12 @@ ISA::initializeMiscRegMetadata()
InitReg(MISCREG_ID_AA64ISAR0_EL1)
.reset([p,release=release](){
AA64ISAR0 isar0_el1 = p.id_aa64isar0_el1;
if (release->has(ArmExtension::CRYPTO)) {
isar0_el1.crc32 = 1;
isar0_el1.sha2 = 1;
isar0_el1.sha1 = 1;
isar0_el1.aes = 2;
} else {
isar0_el1.crc32 = 0;
isar0_el1.sha2 = 0;
isar0_el1.sha1 = 0;
isar0_el1.aes = 0;
}
isar0_el1.crc32 = release->has(ArmExtension::FEAT_CRC32) ? 0x1 : 0x0;
isar0_el1.sha2 = release->has(ArmExtension::FEAT_SHA256) ? 0x1 : 0x0;
isar0_el1.sha1 = release->has(ArmExtension::FEAT_SHA1) ? 0x1 : 0x0;
isar0_el1.aes = release->has(ArmExtension::FEAT_PMULL) ?
0x2 : release->has(ArmExtension::FEAT_AES) ?
0x1 : 0x0;
isar0_el1.dp = release->has(ArmExtension::FEAT_DOTPROD) ? 0x1 : 0x0;
isar0_el1.atomic = release->has(ArmExtension::FEAT_LSE) ? 0x2 : 0x0;
isar0_el1.rdm = release->has(ArmExtension::FEAT_RDM) ? 0x1 : 0x0;