Skip to content

Commit eae026c

Browse files
authored
ocl: final code cleanup (#923)
- Introduced OPENCL_LIBSMM_TODO. - Adjusted quick-option.
1 parent 121421d commit eae026c

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

src/acc/opencl/smm/opencl_libsmm.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
# if !defined(OPENCL_LIBSMM_CMEM) && 1
4141
# define OPENCL_LIBSMM_CMEM
4242
# endif
43+
# if !defined(OPENCL_LIBSMM_TODO) && 0
44+
# define OPENCL_LIBSMM_TODO
45+
# endif
4346
/* default: decompose C-matrix into column-vectors (BMxBN) */
4447
# if !defined(OPENCL_LIBSMM_DEFAULT_BM)
4548
# define OPENCL_LIBSMM_DEFAULT_BM INT_MAX
@@ -1006,15 +1009,20 @@ int opencl_libsmm_acc_process(const int* host_param_stack, const int* dev_param_
10061009
(NULL == env_wg || '\0' == *env_wg) ? (0 != defaults ? default_wg : config->wg) : atoi(env_wg), -2, 2);
10071010
new_config.nz = LIBXSMM_CLMP(
10081011
(NULL == env_nz || '\0' == *env_nz) ? (0 != defaults ? /*default*/ 0 : config->nz) : atoi(env_nz), 0, 1);
1009-
new_config.al = LIBXSMM_CLMP(/* bug with AL=1? */
1012+
# if defined(OPENCL_LIBSMM_TODO)
1013+
new_config.al = LIBXSMM_CLMP(/* bug with AL=1 and XF=1? */
10101014
(NULL == env_al || '\0' == *env_al) ? (0 != defaults ? /*default*/ 0 : config->al) : atoi(env_al), 0, 1);
1015+
# else
1016+
LIBXSMM_UNUSED(env_al);
1017+
new_config.al = 0;
1018+
# endif
10111019
new_config.tb = LIBXSMM_CLMP(
10121020
(NULL == env_tb || '\0' == *env_tb) ? (0 != defaults ? /*default*/ 0 : config->tb) : atoi(env_tb), 0, 1);
10131021
new_config.tc = LIBXSMM_CLMP(
10141022
(NULL == env_tc || '\0' == *env_tc) ? (0 != defaults ? /*default*/ 1 : config->tc) : atoi(env_tc), 0, 1);
10151023
new_config.ap = LIBXSMM_CLMP(
10161024
(NULL == env_ap || '\0' == *env_ap) ? (0 != defaults ? /*default*/ 0 : config->ap) : atoi(env_ap), 0, 1);
1017-
new_config.aa = LIBXSMM_CLMP(/* bug with AA=2 XF=1? */
1025+
new_config.aa = LIBXSMM_CLMP(/* bug with AA=2 and XF=1? */
10181026
(NULL == env_aa || '\0' == *env_aa) ? (0 != defaults ? default_aa : config->aa) : atoi(env_aa), 0, 2);
10191027
new_config.ab = LIBXSMM_CLMP(
10201028
(NULL == env_ab || '\0' == *env_ab) ? (0 != defaults ? default_ab : config->ab) : atoi(env_ab), 0, 2);

src/acc/opencl/smm/tune_multiply.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -936,6 +936,7 @@ def handle_sigint(self, signum, frame):
936936
if 1 <= args.tlevel or 0 > args.tlevel:
937937
os.environ["OPENCL_LIBSMM_SMM_BM"] = "{}".format(args.bm)
938938
os.environ["OPENCL_LIBSMM_SMM_BN"] = "{}".format(args.bn)
939+
os.environ["OPENCL_LIBSMM_SMM_AL"] = "{}".format(args.al)
939940
if 2 <= args.tlevel or 0 > args.tlevel:
940941
os.environ["OPENCL_LIBSMM_SMM_TB"] = "{}".format(args.tb)
941942
os.environ["OPENCL_LIBSMM_SMM_TC"] = "{}".format(args.tc)

0 commit comments

Comments
 (0)