From: Bobby R. Bruce <bbruce@ucdavis.edu>
Date: Mon, 25 May 2020 23:32:56 +0000 (-0700)
Subject: scons,python: Update makeTheGPUISA to Python3
X-Git-Tag: v20.0.0.0~10
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=77482d59a511d1e741185c9d5a6c87edead7e8bb;p=gem5.git

scons,python: Update makeTheGPUISA to Python3

This function was causing an error to occur when trying to compile HSAIL
and GCN in a Python3 environment. It has now been upgraded to work in
both Python2 and Python3.

Change-Id: If8d6ee1e08c47d5a36182afc10cf86a8e905bda0
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/29410
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/src/SConscript b/src/SConscript
index 1de8a2d75..7cd628a7c 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -666,7 +666,7 @@ env.Command('config/the_isa.hh', list(map(Value, all_isa_list)),
             MakeAction(makeTheISA, Transform("CFG ISA", 0)))
 
 def makeTheGPUISA(source, target, env):
-    isas = [ src.get_contents() for src in source ]
+    isas = [ src.get_contents().decode('utf-8') for src in source ]
     target_gpu_isa = env['TARGET_GPU_ISA']
     def define(isa):
         return str(isa.upper()) + '_ISA'