resources, gpu-compute: Add gfx900 target to GPU tests
This adds the gfx900 ISA as a target for tests which is needed to run
the applications using the VEGA_X86 build option.
Change-Id: I1999eaed7c7593a1b1b7432e80621687b3c31dc0
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5-resources/+/54084
Reviewed-by: Matt Sinclair <mattdsinclair@gmail.com>
Maintainer: Matt Sinclair <mattdsinclair@gmail.com>
Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu>
Maintainer: Bobby Bruce <bbruce@ucdavis.edu>
Tested-by: Bobby Bruce <bbruce@ucdavis.edu>
diff --git a/src/gpu/DNNMark/generate_cachefiles.py b/src/gpu/DNNMark/generate_cachefiles.py
index dc151d0..de4a84a 100755
--- a/src/gpu/DNNMark/generate_cachefiles.py
+++ b/src/gpu/DNNMark/generate_cachefiles.py
@@ -20,7 +20,7 @@
parser.add_argument('--num-cus', default=4, type=int,
help='Number of CUs in simulated GPU')
parser.add_argument('--gfx-version', default='gfx801',
- choices=['gfx801', 'gfx803'],
+ choices=['gfx801', 'gfx803', 'gfx900'],
help='gfx version of simulated GPU')
return parser.parse_args()
@@ -57,6 +57,8 @@
extra_args = {'gfx801': '-Wno-everything -Xclang '
'-target-feature -Xclang +code-object-v3',
'gfx803': '-Wno-everything -Xclang '
+ '-target-feature -Xclang +code-object-v3',
+ 'gfx900': '-Wno-everything -Xclang '
'-target-feature -Xclang +code-object-v3'}
with tempfile.TemporaryDirectory() as tmpdir:
diff --git a/src/gpu/halo-finder/Dockerfile b/src/gpu/halo-finder/Dockerfile
index e3ddf6b..efc2437 100644
--- a/src/gpu/halo-finder/Dockerfile
+++ b/src/gpu/halo-finder/Dockerfile
@@ -1,7 +1,7 @@
FROM gcr.io/gem5-test/gcn-gpu:latest
RUN apt-get update && apt-get -y install libopenmpi-dev libomp-dev
-ENV HCC_AMDGPU_TARGET="gfx801,gfx803"
+ENV HCC_AMDGPU_TARGET="gfx801,gfx803,gfx900"
ENV HIPCC_BIN=/opt/rocm/bin
ENV MPI_INCLUDE=/usr/lib/x86_64-linux-gnu/openmpi/include
diff --git a/src/gpu/hip-samples/Makefile b/src/gpu/hip-samples/Makefile
index ee863b8..9518669 100644
--- a/src/gpu/hip-samples/Makefile
+++ b/src/gpu/hip-samples/Makefile
@@ -12,7 +12,7 @@
all: $(EXECUTABLES)
$(EXECUTABLES): %: $(SRC_DIR)/%.cpp | $(BIN_DIR)
- $(HIPCC) --amdgpu-target=gfx801,gfx803 $< -o $(BIN_DIR)/$@
+ $(HIPCC) --amdgpu-target=gfx801,gfx803,gfx900 $< -o $(BIN_DIR)/$@
$(BIN_DIR):
mkdir -p $@
diff --git a/src/gpu/lulesh/Makefile b/src/gpu/lulesh/Makefile
index 09bd0fb..56a30eb 100755
--- a/src/gpu/lulesh/Makefile
+++ b/src/gpu/lulesh/Makefile
@@ -2,7 +2,7 @@
HIP_PATH ?= /opt/rocm/hip
all: $(BIN_DIR)
- $(HIP_PATH)/bin/hipcc src/lulesh.hip.cc -o $(BIN_DIR)/lulesh --amdgpu-target=gfx801,gfx803
+ $(HIP_PATH)/bin/hipcc src/lulesh.hip.cc -o $(BIN_DIR)/lulesh --amdgpu-target=gfx801,gfx803,gfx900
$(BIN_DIR):
mkdir -p $(BIN_DIR)
diff --git a/src/gpu/pannotia/bc/Makefile.default b/src/gpu/pannotia/bc/Makefile.default
index e1053c0..5bf7e85 100644
--- a/src/gpu/pannotia/bc/Makefile.default
+++ b/src/gpu/pannotia/bc/Makefile.default
@@ -13,7 +13,7 @@
all: $(BIN_DIR)/$(EXECUTABLE)
$(BIN_DIR)/$(EXECUTABLE): $(CPPSRC) ../graph_parser/util.cpp $(BIN_DIR)
- $(HIPCC) $(OPTS) --amdgpu-target=gfx801,gfx803,gfx906 $(CXXFLAGS) ../graph_parser/util.cpp $(CPPSRC) -o $(BIN_DIR)/$(EXECUTABLE)
+ $(HIPCC) $(OPTS) --amdgpu-target=gfx801,gfx803,gfx900,gfx906 $(CXXFLAGS) ../graph_parser/util.cpp $(CPPSRC) -o $(BIN_DIR)/$(EXECUTABLE)
$(BIN_DIR):
mkdir -p $(BIN_DIR)
diff --git a/src/gpu/pannotia/bc/Makefile.gem5-fusion b/src/gpu/pannotia/bc/Makefile.gem5-fusion
index bd1bf14..95558a1 100644
--- a/src/gpu/pannotia/bc/Makefile.gem5-fusion
+++ b/src/gpu/pannotia/bc/Makefile.gem5-fusion
@@ -17,7 +17,7 @@
all: $(BIN_DIR)/$(EXECUTABLE)
$(BIN_DIR)/$(EXECUTABLE): $(CPPSRC) ../graph_parser/util.cpp $(BIN_DIR)
- $(HIPCC) $(OPTS) --amdgpu-target=gfx801,gfx803 $(CXXFLAGS) ../graph_parser/util.cpp $(CPPSRC) -DGEM5_FUSION -o $(BIN_DIR)/$(EXECUTABLE) $(CFLAGS) $(LDFLAGS)
+ $(HIPCC) $(OPTS) --amdgpu-target=gfx801,gfx803,gfx900 $(CXXFLAGS) ../graph_parser/util.cpp $(CPPSRC) -DGEM5_FUSION -o $(BIN_DIR)/$(EXECUTABLE) $(CFLAGS) $(LDFLAGS)
$(BIN_DIR):
mkdir -p $(BIN_DIR)
diff --git a/src/gpu/pannotia/color/Makefile.default b/src/gpu/pannotia/color/Makefile.default
index cdd6192..af86138 100644
--- a/src/gpu/pannotia/color/Makefile.default
+++ b/src/gpu/pannotia/color/Makefile.default
@@ -16,7 +16,7 @@
all: $(BIN_DIR)/$(EXECUTABLE)
$(BIN_DIR)/$(EXECUTABLE): $(CPPFILES) ../graph_parser/parse.cpp ../graph_parser/util.cpp $(BIN_DIR)
- $(HIPCC) -O3 --amdgpu-target=gfx801,gfx803,gfx906 $(CXXFLAGS) ../graph_parser/parse.cpp ../graph_parser/util.cpp $(CPPFILES) -o $(BIN_DIR)/$(EXECUTABLE)
+ $(HIPCC) -O3 --amdgpu-target=gfx801,gfx803,gfx900,gfx906 $(CXXFLAGS) ../graph_parser/parse.cpp ../graph_parser/util.cpp $(CPPFILES) -o $(BIN_DIR)/$(EXECUTABLE)
$(BIN_DIR):
mkdir -p $(BIN_DIR)
diff --git a/src/gpu/pannotia/color/Makefile.gem5-fusion b/src/gpu/pannotia/color/Makefile.gem5-fusion
index f8f4fcc..a68470c 100644
--- a/src/gpu/pannotia/color/Makefile.gem5-fusion
+++ b/src/gpu/pannotia/color/Makefile.gem5-fusion
@@ -21,7 +21,7 @@
all: $(BIN_DIR)/$(EXECUTABLE)
$(BIN_DIR)/$(EXECUTABLE): $(CPPFILES) ../graph_parser/parse.cpp ../graph_parser/util.cpp $(BIN_DIR)
- $(HIPCC) -O3 --amdgpu-target=gfx801,gfx803 $(CXXFLAGS) ../graph_parser/parse.cpp ../graph_parser/util.cpp $(CPPFILES) -DGEM5_FUSION -o $(BIN_DIR)/$(EXECUTABLE) $(CFLAGS) $(LDFLAGS)
+ $(HIPCC) -O3 --amdgpu-target=gfx801,gfx803,gfx900 $(CXXFLAGS) ../graph_parser/parse.cpp ../graph_parser/util.cpp $(CPPFILES) -DGEM5_FUSION -o $(BIN_DIR)/$(EXECUTABLE) $(CFLAGS) $(LDFLAGS)
$(BIN_DIR):
mkdir -p $(BIN_DIR)
diff --git a/src/gpu/pannotia/fw/Makefile.default b/src/gpu/pannotia/fw/Makefile.default
index 20c40e7..f50d87e 100644
--- a/src/gpu/pannotia/fw/Makefile.default
+++ b/src/gpu/pannotia/fw/Makefile.default
@@ -8,7 +8,7 @@
all: $(BIN_DIR)/$(EXECUTABLE)
$(BIN_DIR)/$(EXECUTABLE): Floyd-Warshall.cpp parse.cpp ../graph_parser/util.cpp $(BIN_DIR)
- $(HIPCC) $(OPTS) --amdgpu-target=gfx801,gfx803,gfx906 $(CXXFLAGS) parse.cpp ../graph_parser/util.cpp Floyd-Warshall.cpp -o $(BIN_DIR)/$(EXECUTABLE)
+ $(HIPCC) $(OPTS) --amdgpu-target=gfx801,gfx803,gfx900,gfx906 $(CXXFLAGS) parse.cpp ../graph_parser/util.cpp Floyd-Warshall.cpp -o $(BIN_DIR)/$(EXECUTABLE)
$(BIN_DIR):
mkdir -p $(BIN_DIR)
diff --git a/src/gpu/pannotia/fw/Makefile.gem5-fusion b/src/gpu/pannotia/fw/Makefile.gem5-fusion
index 801c46f..b9caa2a 100644
--- a/src/gpu/pannotia/fw/Makefile.gem5-fusion
+++ b/src/gpu/pannotia/fw/Makefile.gem5-fusion
@@ -12,7 +12,7 @@
all: $(BIN_DIR)/fw_hip.gem5
$(BIN_DIR)/fw_hip.gem5: Floyd-Warshall.cpp parse.cpp ../graph_parser/util.cpp $(BIN_DIR)
- $(HIPCC) -O3 --amdgpu-target=gfx801,gfx803 $(CXXFLAGS) parse.cpp ../graph_parser/util.cpp Floyd-Warshall.cpp -DGEM5_FUSION -o $(BIN_DIR)/fw_hip.gem5 $(CFLAGS) $(LDFLAGS)
+ $(HIPCC) -O3 --amdgpu-target=gfx801,gfx803,gfx900 $(CXXFLAGS) parse.cpp ../graph_parser/util.cpp Floyd-Warshall.cpp -DGEM5_FUSION -o $(BIN_DIR)/fw_hip.gem5 $(CFLAGS) $(LDFLAGS)
$(BIN_DIR):
mkdir -p $(BIN_DIR)
diff --git a/src/gpu/pannotia/mis/Makefile.default b/src/gpu/pannotia/mis/Makefile.default
index be38085..6a24c8b 100644
--- a/src/gpu/pannotia/mis/Makefile.default
+++ b/src/gpu/pannotia/mis/Makefile.default
@@ -9,7 +9,7 @@
all: $(BIN_DIR)/$(EXECUTABLE)
$(BIN_DIR)/$(EXECUTABLE): mis.cpp ../graph_parser/parse.cpp ../graph_parser/util.cpp $(BIN_DIR)
- $(HIPCC) $(OPTS) --amdgpu-target=gfx801,gfx803,gfx906 $(CXXFLAGS) mis.cpp ../graph_parser/parse.cpp ../graph_parser/util.cpp -o $(BIN_DIR)/$(EXECUTABLE)
+ $(HIPCC) $(OPTS) --amdgpu-target=gfx801,gfx803,gfx900,gfx906 $(CXXFLAGS) mis.cpp ../graph_parser/parse.cpp ../graph_parser/util.cpp -o $(BIN_DIR)/$(EXECUTABLE)
$(BIN_DIR):
mkdir -p $(BIN_DIR)
diff --git a/src/gpu/pannotia/mis/Makefile.gem5-fusion b/src/gpu/pannotia/mis/Makefile.gem5-fusion
index 70ea0ed..f9da635 100644
--- a/src/gpu/pannotia/mis/Makefile.gem5-fusion
+++ b/src/gpu/pannotia/mis/Makefile.gem5-fusion
@@ -15,7 +15,7 @@
all: $(BIN_DIR)/$(EXECUTABLE)
$(BIN_DIR)/$(EXECUTABLE): mis.cpp ../graph_parser/parse.cpp ../graph_parser/util.cpp $(BIN_DIR)
- $(HIPCC) $(OPTS) --amdgpu-target=gfx801,gfx803 $(CXXFLAGS) mis.cpp ../graph_parser/parse.cpp ../graph_parser/util.cpp -DGEM5_FUSION -o $(BIN_DIR)/$(EXECUTABLE) $(CFLAGS) $(LDFLAGS)
+ $(HIPCC) $(OPTS) --amdgpu-target=gfx801,gfx803,gfx900 $(CXXFLAGS) mis.cpp ../graph_parser/parse.cpp ../graph_parser/util.cpp -DGEM5_FUSION -o $(BIN_DIR)/$(EXECUTABLE) $(CFLAGS) $(LDFLAGS)
$(BIN_DIR):
mkdir -p $(BIN_DIR)
diff --git a/src/gpu/pannotia/pagerank/Makefile.default b/src/gpu/pannotia/pagerank/Makefile.default
index 486579b..5472ca4 100644
--- a/src/gpu/pannotia/pagerank/Makefile.default
+++ b/src/gpu/pannotia/pagerank/Makefile.default
@@ -17,7 +17,7 @@
all: $(BIN_DIR)/$(EXECUTABLE)
$(BIN_DIR)/$(EXECUTABLE): $(CPPFILES) ../graph_parser/parse.cpp ../graph_parser/util.cpp $(BIN_DIR)
- $(HIPCC) $(OPTS) --amdgpu-target=gfx801,gfx803,gfx906 $(CXXFLAGS) ../graph_parser/parse.cpp ../graph_parser/util.cpp $(CPPFILES) -o $(BIN_DIR)/$(EXECUTABLE)
+ $(HIPCC) $(OPTS) --amdgpu-target=gfx801,gfx803,gfx900,gfx906 $(CXXFLAGS) ../graph_parser/parse.cpp ../graph_parser/util.cpp $(CPPFILES) -o $(BIN_DIR)/$(EXECUTABLE)
$(BIN_DIR):
mkdir -p $(BIN_DIR)
diff --git a/src/gpu/pannotia/pagerank/Makefile.gem5-fusion b/src/gpu/pannotia/pagerank/Makefile.gem5-fusion
index f3e5f26..02f10e7 100644
--- a/src/gpu/pannotia/pagerank/Makefile.gem5-fusion
+++ b/src/gpu/pannotia/pagerank/Makefile.gem5-fusion
@@ -23,7 +23,7 @@
all: $(BIN_DIR)/$(EXECUTABLE)
$(BIN_DIR)/$(EXECUTABLE): $(CPPFILES) ../graph_parser/parse.cpp ../graph_parser/util.cpp $(BIN_DIR)
- $(HIPCC) $(OPTS) --amdgpu-target=gfx801,gfx803 $(CXXFLAGS) ../graph_parser/parse.cpp ../graph_parser/util.cpp $(CPPFILES) -DGEM5_FUSION -o $(BIN_DIR)/$(EXECUTABLE) $(CFLAGS) $(LDFLAGS)
+ $(HIPCC) $(OPTS) --amdgpu-target=gfx801,gfx803,gfx900 $(CXXFLAGS) ../graph_parser/parse.cpp ../graph_parser/util.cpp $(CPPFILES) -DGEM5_FUSION -o $(BIN_DIR)/$(EXECUTABLE) $(CFLAGS) $(LDFLAGS)
$(BIN_DIR):
mkdir -p $(BIN_DIR)
diff --git a/src/gpu/pannotia/sssp/Makefile.default b/src/gpu/pannotia/sssp/Makefile.default
index 6096b52..435da8e 100644
--- a/src/gpu/pannotia/sssp/Makefile.default
+++ b/src/gpu/pannotia/sssp/Makefile.default
@@ -18,7 +18,7 @@
all: $(BIN_DIR)/$(EXECUTABLE)
$(BIN_DIR)/$(EXECUTABLE): $(CPPFILES) ../graph_parser/parse.cpp ../graph_parser/util.cpp $(BIN_DIR)
- $(HIPCC) -O3 --amdgpu-target=gfx801,gfx803,gfx906 $(CXXFLAGS) ../graph_parser/parse.cpp ../graph_parser/util.cpp $(CPPFILES) -o $(BIN_DIR)/$(EXECUTABLE)
+ $(HIPCC) -O3 --amdgpu-target=gfx801,gfx803,gfx900,gfx906 $(CXXFLAGS) ../graph_parser/parse.cpp ../graph_parser/util.cpp $(CPPFILES) -o $(BIN_DIR)/$(EXECUTABLE)
$(BIN_DIR):
mkdir -p $(BIN_DIR)
diff --git a/src/gpu/pannotia/sssp/Makefile.gem5-fusion b/src/gpu/pannotia/sssp/Makefile.gem5-fusion
index 05b8167..2044e1a 100644
--- a/src/gpu/pannotia/sssp/Makefile.gem5-fusion
+++ b/src/gpu/pannotia/sssp/Makefile.gem5-fusion
@@ -24,7 +24,7 @@
all: $(BIN_DIR)/$(EXECUTABLE)
$(BIN_DIR)/$(EXECUTABLE): $(CPPFILES) ../graph_parser/parse.cpp ../graph_parser/util.cpp $(BIN_DIR)
- $(HIPCC) -O3 --amdgpu-target=gfx801,gfx803 $(CXXFLAGS) ../graph_parser/parse.cpp ../graph_parser/util.cpp $(CPPFILES) -DGEM5_FUSION -o $(BIN_DIR)/$(EXECUTABLE) $(CFLAGS) $(LDFLAGS)
+ $(HIPCC) -O3 --amdgpu-target=gfx801,gfx803,gfx900 $(CXXFLAGS) ../graph_parser/parse.cpp ../graph_parser/util.cpp $(CPPFILES) -DGEM5_FUSION -o $(BIN_DIR)/$(EXECUTABLE) $(CFLAGS) $(LDFLAGS)
$(BIN_DIR):
mkdir -p $(BIN_DIR)
diff --git a/src/gpu/pennant/Makefile b/src/gpu/pennant/Makefile
index 246e419..0936b36 100644
--- a/src/gpu/pennant/Makefile
+++ b/src/gpu/pennant/Makefile
@@ -64,6 +64,9 @@
#CXXFLAGS += $(CXXFLAGS_OPENMP)
#LDFLAGS += $(CXXFLAGS_OPENMP)
+# add amdgpu targets
+CXXFLAGS += --amdgpu-target=gfx801,gfx803,gfx900
+
all : $(BINARY)
-include $(DEPS)
diff --git a/src/gpu/square/Makefile b/src/gpu/square/Makefile
index 48164aa..c7f4b26 100644
--- a/src/gpu/square/Makefile
+++ b/src/gpu/square/Makefile
@@ -6,7 +6,7 @@
square: $(BIN_DIR)/square
$(BIN_DIR)/square: square.cpp $(BIN_DIR)
- $(HIPCC) --amdgpu-target=gfx801,gfx803 $(CXXFLAGS) square.cpp -o $(BIN_DIR)/square
+ $(HIPCC) --amdgpu-target=gfx801,gfx803,gfx900 $(CXXFLAGS) square.cpp -o $(BIN_DIR)/square
$(BIN_DIR):
mkdir -p $(BIN_DIR)
