From 8b496a1a12078b5e211dc68ba872df13e39d935c Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Thu, 18 Nov 2021 16:54:17 -0800 Subject: [PATCH] stdlib: Fix enum comparison in 'requires' Change-Id: Iff8e6edcbb553e8180c21c583d79b689f9a40bce Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/53003 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- src/python/gem5/utils/requires.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/python/gem5/utils/requires.py b/src/python/gem5/utils/requires.py index 76a8b41393..778925431a 100644 --- a/src/python/gem5/utils/requires.py +++ b/src/python/gem5/utils/requires.py @@ -72,7 +72,7 @@ def requires( runtime_coherence_protocol = get_runtime_coherence_protocol() kvm_available = os.access("/dev/kvm", mode=os.R_OK | os.W_OK) - if isa_required != None and isa_required != runtime_isa: + if isa_required != None and isa_required.value != runtime_isa.value: raise Exception( _get_exception_str( msg="The current ISA is '{}'. Required: '{}'".format( @@ -83,7 +83,8 @@ def requires( if ( coherence_protocol_required != None - and coherence_protocol_required != runtime_coherence_protocol + and coherence_protocol_required.value + != runtime_coherence_protocol.value ): raise Exception( _get_exception_str(