From 42281171eae0a451429be34d56677a756316b306 Mon Sep 17 00:00:00 2001 From: Kyle Roarty Date: Fri, 24 May 2019 13:40:04 -0500 Subject: [PATCH] configs: Change env defaults in apu_se.py for ROCm This change simplifies the setup process for running ROCm-based programs by adding the libraries that are needed to LD_LIBRARY_PATH by default, using preexisting environment variables that should be set on the host. HOME also gets set, as MIOpen-based programs can fail without it set. Change-Id: Ic599674babeaebb52de8a55981d04454cdc96cd8 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/30275 Tested-by: kokoro Reviewed-by: Matt Sinclair Reviewed-by: Anthony Gutierrez Reviewed-by: Bradford Beckmann Maintainer: Anthony Gutierrez Maintainer: Jason Lowe-Power --- configs/example/apu_se.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/configs/example/apu_se.py b/configs/example/apu_se.py index 4e9c75fd6..82e40226f 100644 --- a/configs/example/apu_se.py +++ b/configs/example/apu_se.py @@ -456,11 +456,18 @@ if options.env: env = [line.rstrip() for line in f] else: env = ['LD_LIBRARY_PATH=%s' % ':'.join([ - "/proj/radl_tools/rocm-1.6/lib", - "/proj/radl_tools/rocm-1.6/hcc/lib64", - "/tool/pandora64/.package/libunwind-1.1/lib", - "/tool/pandora64/.package/gcc-6.4.0/lib64" + os.getenv('ROCM_PATH','/opt/rocm')+'/lib', + os.getenv('HCC_HOME','/opt/rocm/hcc')+'/lib', + os.getenv('HSA_PATH','/opt/rocm/hsa')+'/lib', + os.getenv('HIP_PATH','/opt/rocm/hip')+'/lib', + os.getenv('ROCM_PATH','/opt/rocm')+'/libhsakmt/lib', + os.getenv('ROCM_PATH','/opt/rocm')+'/miopen/lib', + os.getenv('ROCM_PATH','/opt/rocm')+'/miopengemm/lib', + os.getenv('ROCM_PATH','/opt/rocm')+'/hipblas/lib', + os.getenv('ROCM_PATH','/opt/rocm')+'/rocblas/lib', + "/usr/lib/x86_64-linux-gnu" ]), + 'HOME=%s' % os.getenv('HOME','/'), "HSA_ENABLE_INTERRUPT=0"] process = Process(executable = executable, cmd = [options.cmd] -- 2.30.2