From 8cbb5318234aa7a4ed6f803ed6ffa5d577e28a68 Mon Sep 17 00:00:00 2001 From: Giacomo Travaglini Date: Mon, 14 May 2018 11:46:10 +0100 Subject: [PATCH] cpu: Fix MinorCPU executing Crypto Instructions Crypto instruction classes added to the MinorDefaultFloatSimdFU. Change-Id: I0cd4aa422bec74285595312a8cf01f5f425a82cd Signed-off-by: Giacomo Travaglini Reviewed-by: Andreas Sandberg Reviewed-on: https://gem5-review.googlesource.com/c/13251 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power --- src/cpu/minor/MinorCPU.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/cpu/minor/MinorCPU.py b/src/cpu/minor/MinorCPU.py index 87a30497c..9e285a4d1 100644 --- a/src/cpu/minor/MinorCPU.py +++ b/src/cpu/minor/MinorCPU.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012-2014 ARM Limited +# Copyright (c) 2012-2014,2018 ARM Limited # All rights reserved. # # The license below extends only to copyright in the software and shall @@ -150,7 +150,9 @@ class MinorDefaultFloatSimdFU(MinorFU): 'SimdMisc', 'SimdMult', 'SimdMultAcc', 'SimdShift', 'SimdShiftAcc', 'SimdSqrt', 'SimdFloatAdd', 'SimdFloatAlu', 'SimdFloatCmp', 'SimdFloatCvt', 'SimdFloatDiv', 'SimdFloatMisc', 'SimdFloatMult', - 'SimdFloatMultAcc', 'SimdFloatSqrt']) + 'SimdFloatMultAcc', 'SimdFloatSqrt', 'SimdAes', 'SimdAesMix', + 'SimdSha1Hash', 'SimdSha1Hash2', 'SimdSha256Hash', + 'SimdSha256Hash2', 'SimdShaSigma2', 'SimdShaSigma3']) timings = [MinorFUTiming(description='FloatSimd', srcRegsRelativeLats=[2])] opLat = 6 -- 2.30.2