COMPMID-3618 Add support for export_to_cl_image_rhs in GEMMTuner.py
* Add export_to_cl_image_rhs flag to reshaped and reshaped_only_rhs
configs definitions
* Exit with error when output directory is not correctly created
* Add start and end timestamps to each output directory
Signed-off-by: SiCong Li <sicong.li@arm.com>
Change-Id: Ief5e8f454e7c6d97b18bbdace877db4e9ffc124c
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/c/VisualCompute/ComputeLibrary/+/252934
Tested-by: bsgcomp <bsgcomp@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3651
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
diff --git a/examples/gemm_tuner/GemmTuner.py b/examples/gemm_tuner/GemmTuner.py
index 1361f90..3e75051 100644
--- a/examples/gemm_tuner/GemmTuner.py
+++ b/examples/gemm_tuner/GemmTuner.py
@@ -50,9 +50,9 @@
B: int # Batch size
data_type: str # Data type
- @staticmethod
- def parse_from_strs(*M_N_K_B, data_type):
- return GEMMParam(*map(int, M_N_K_B),str(data_type))
+ @classmethod
+ def parse_from_strs(cls, *M_N_K_B, data_type):
+ return cls(*map(int, M_N_K_B), str(data_type))
def __str__(self):
return ",".join(map(str, self))
@@ -64,10 +64,10 @@
n0: int # Number of columns processed by the matrix multiplication
k0: int # Number of partial accumulations performed by the matrix multiplication
- @staticmethod
- def parse_from_strs(*args):
+ @classmethod
+ def parse_from_strs(cls, *args):
(*mnk,) = map(int, args)
- return NativeGEMMConfig(*mnk)
+ return cls(*mnk)
def __str__(self):
return ",".join(map(str, self))
@@ -84,13 +84,16 @@
interleave_rhs: bool
# Transpose rhs matrix but not lhs matrix (1) / Do not transpose rhs matrix but do transpose lhs matrix (0)
transpose_rhs: bool
+ # Export rhs matrix to cl_image (1) / Do not export rhs matrix to cl_image (0)
+ export_to_cl_image_rhs: bool
- @staticmethod
- def parse_from_strs(*args):
- *mnkh, interleave_rhs, transpose_rhs = map(int, args)
+ @classmethod
+ def parse_from_strs(cls, *args):
+ (*mnkh, interleave_rhs, transpose_rhs, export_to_cl_image_rhs,) = map(int, args)
interleave_rhs = interleave_rhs == 1
transpose_rhs = transpose_rhs == 1
- return ReshapedOnlyRHSGEMMConfig(*mnkh, interleave_rhs, transpose_rhs)
+ export_to_cl_image_rhs = export_to_cl_image_rhs == 1
+ return cls(*mnkh, interleave_rhs, transpose_rhs, export_to_cl_image_rhs)
def __str__(self):
return ",".join(map(str, self))
@@ -111,14 +114,17 @@
interleave_rhs: bool
# Transpose rhs matrix but not lhs matrix (1) / Do not transpose rhs matrix but do transpose lhs matrix (0)
transpose_rhs: bool
+ # Export rhs matrix to cl_image (1) / Do not export rhs matrix to cl_image (0)
+ export_to_cl_image_rhs: bool
- @staticmethod
- def parse_from_strs(*args):
- *mnkvh, interleave_lhs, interleave_rhs, transpose_rhs = map(int, args)
+ @classmethod
+ def parse_from_strs(cls, *args):
+ (*mnkvh, interleave_lhs, interleave_rhs, transpose_rhs, export_to_cl_image_rhs,) = map(int, args)
interleave_lhs = interleave_lhs == 1
interleave_rhs = interleave_rhs == 1
transpose_rhs = transpose_rhs == 1
- return ReshapedGEMMConfig(*mnkvh, interleave_lhs, interleave_rhs, transpose_rhs)
+ export_to_cl_image_rhs = export_to_cl_image_rhs == 1
+ return cls(*mnkvh, interleave_lhs, interleave_rhs, transpose_rhs, export_to_cl_image_rhs)
def __str__(self):
return ",".join(map(str, self))
@@ -437,9 +443,9 @@
# GEMMParam + GEMMConfig
# in that order.
# For example, the example args of running a reshaped rhs only example could be:
-# 100,100,100,1, 4, 4, 4, 1, 1, 1
-# M ,N ,K, B,m0,n0,k0,h0,interleave_rhs,transpose_rhs
-# <-GEMMParam-><-------------GEMMConfig-------------->
+# 100,100,100,1, 4, 4, 4, 1, 1, 1, 0
+# M ,N ,K, B,m0,n0,k0,h0,interleave_rhs,transpose_rhs,export_to_cl_image_rhs
+# <-GEMMParam-><-------------GEMMConfig--------------------------------------->
# Note that the test strategy_name == strategy.name is in place to avoid unwanted enum aliases
GEMM_EXAMPLE_ARGS_FACTORY = {
# We ignore the data type field from GEMMParam as that is extracted separately
@@ -460,7 +466,7 @@
def parse_benchmark_commandline(commandline: str) -> Dict[str, str]:
- """ Parse the benchmark example command-line string into a dictionary of command-line agruments
+ """ Parse the benchmark example command-line string into a dictionary of command-line arguments
"""
# Separate the data type option from the example_args portion of the string
commandline = commandline.replace(",--type=", " --type=")
diff --git a/examples/gemm_tuner/benchmark_gemm_examples.sh b/examples/gemm_tuner/benchmark_gemm_examples.sh
index 159b161..bb9ec0f 100755
--- a/examples/gemm_tuner/benchmark_gemm_examples.sh
+++ b/examples/gemm_tuner/benchmark_gemm_examples.sh
@@ -482,7 +482,9 @@
error_msg "Output directory ${OUT_DIR} already exists!"
# Make output directory
-mkdir ${OUT_DIR}
+echo "Making output directory ${OUT_DIR}" 1>&2
+mkdir -p ${OUT_DIR} || error_msg "Failed to make output directory ${OUT_DIR}"
+date +%s > ${OUT_DIR}/start_time_unix_seconds
# Run selected strategy with all configurations
# Restart the built-in timer
@@ -490,4 +492,6 @@
[ "${STRATEGY_OPTION}" == "native" ] && run $EXAMPLE_BIN_NATIVE
[ "${STRATEGY_OPTION}" == "reshaped_rhs_only" ] && run $EXAMPLE_BIN_RESHAPED_RHS_ONLY
[ "${STRATEGY_OPTION}" == "reshaped" ] && run $EXAMPLE_BIN_RESHAPED
+
+date +%s > ${OUT_DIR}/end_time_unix_seconds
# Main: Main script }}}