From 75ca79249be69b5b7770ca3d8262b2a2d7f7cb5e Mon Sep 17 00:00:00 2001 From: Artem Gindinson Date: Thu, 13 Jan 2022 16:55:58 +0300 Subject: [PATCH 1/3] [SYCL] Add negative checks for the variadic O0 printf LIT This is a follow-up to https://github.com/intel/llvm/pull/5286. Signed-off-by: Artem Gindinson --- .../printf_addrspace/generic_as_negative_checks.ll | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/llvm/test/SYCLLowerIR/printf_addrspace/generic_as_negative_checks.ll b/llvm/test/SYCLLowerIR/printf_addrspace/generic_as_negative_checks.ll index caf019f4ce52..55e84c2c01b5 100644 --- a/llvm/test/SYCLLowerIR/printf_addrspace/generic_as_negative_checks.ll +++ b/llvm/test/SYCLLowerIR/printf_addrspace/generic_as_negative_checks.ll @@ -10,6 +10,10 @@ ; RUN: opt < %S/generic_as_variadic.ll --SYCLMutatePrintfAddrspace -S | FileCheck %s --check-prefix=CHECK-BUILTIN ; RUN: opt < %S/generic_as_variadic.ll --SYCLMutatePrintfAddrspace -S --enable-new-pm=1 | FileCheck %s --check-prefix=CHECK-BUILTIN +; generic_as_variadic_no_opt.ll +; RUN: opt < %S/generic_as_variadic_no_opt.ll --SYCLMutatePrintfAddrspace -S | FileCheck %s --check-prefixes=CHECK-WRAPPER,CHECK-BUILTIN +; RUN: opt < %S/generic_as_variadic_no_opt.ll --SYCLMutatePrintfAddrspace -S --enable-new-pm=1 | FileCheck %s --check-prefixes=CHECK-WRAPPER,CHECK-BUILTIN + ; Check that the wrapper bodies have been deleted after call replacement ; CHECK-WRAPPER-NOT: spir_func i32 @{{.*}}sycl{{.*}}printf From bb9b948b10d55bdc680cae13d9f55d8dd945e69d Mon Sep 17 00:00:00 2001 From: Artem Gindinson Date: Fri, 14 Jan 2022 12:08:44 +0300 Subject: [PATCH 2/3] Switch the explicity of PM selection for the new checks Signed-off-by: Artem Gindinson --- .../printf_addrspace/generic_as_negative_checks.ll | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/llvm/test/SYCLLowerIR/printf_addrspace/generic_as_negative_checks.ll b/llvm/test/SYCLLowerIR/printf_addrspace/generic_as_negative_checks.ll index 55e84c2c01b5..d669ab3b795c 100644 --- a/llvm/test/SYCLLowerIR/printf_addrspace/generic_as_negative_checks.ll +++ b/llvm/test/SYCLLowerIR/printf_addrspace/generic_as_negative_checks.ll @@ -11,8 +11,8 @@ ; RUN: opt < %S/generic_as_variadic.ll --SYCLMutatePrintfAddrspace -S --enable-new-pm=1 | FileCheck %s --check-prefix=CHECK-BUILTIN ; generic_as_variadic_no_opt.ll -; RUN: opt < %S/generic_as_variadic_no_opt.ll --SYCLMutatePrintfAddrspace -S | FileCheck %s --check-prefixes=CHECK-WRAPPER,CHECK-BUILTIN -; RUN: opt < %S/generic_as_variadic_no_opt.ll --SYCLMutatePrintfAddrspace -S --enable-new-pm=1 | FileCheck %s --check-prefixes=CHECK-WRAPPER,CHECK-BUILTIN +; RUN: opt < %S/generic_as_variadic_no_opt.ll --SYCLMutatePrintfAddrspace -S --enable-new-pm=0 | FileCheck %s --check-prefixes=CHECK-WRAPPER,CHECK-BUILTIN +; RUN: opt < %S/generic_as_variadic_no_opt.ll --passes=SYCLMutatePrintfAddrspace -S | FileCheck %s --check-prefixes=CHECK-WRAPPER,CHECK-BUILTIN ; Check that the wrapper bodies have been deleted after call replacement ; CHECK-WRAPPER-NOT: spir_func i32 @{{.*}}sycl{{.*}}printf From 74d315364d4cc723425a0b29a301b80cfbebd8bd Mon Sep 17 00:00:00 2001 From: Artem Gindinson Date: Fri, 14 Jan 2022 12:18:18 +0300 Subject: [PATCH 3/3] Port the existing checks as well Signed-off-by: Artem Gindinson --- .../printf_addrspace/generic_as_negative_checks.ll | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/llvm/test/SYCLLowerIR/printf_addrspace/generic_as_negative_checks.ll b/llvm/test/SYCLLowerIR/printf_addrspace/generic_as_negative_checks.ll index d669ab3b795c..a832a21884c5 100644 --- a/llvm/test/SYCLLowerIR/printf_addrspace/generic_as_negative_checks.ll +++ b/llvm/test/SYCLLowerIR/printf_addrspace/generic_as_negative_checks.ll @@ -1,14 +1,14 @@ ; generic_as.ll -; RUN: opt < %S/generic_as.ll --SYCLMutatePrintfAddrspace -S | FileCheck %s --check-prefix=CHECK-BUILTIN -; RUN: opt < %S/generic_as.ll --SYCLMutatePrintfAddrspace -S --enable-new-pm=1 | FileCheck %s --check-prefix=CHECK-BUILTIN +; RUN: opt < %S/generic_as.ll --SYCLMutatePrintfAddrspace -S --enable-new-pm=0 | FileCheck %s --check-prefix=CHECK-BUILTIN +; RUN: opt < %S/generic_as.ll --passes=SYCLMutatePrintfAddrspace -S | FileCheck %s --check-prefix=CHECK-BUILTIN ; generic_as_no_opt.ll -; RUN: opt < %S/generic_as_no_opt.ll --SYCLMutatePrintfAddrspace -S | FileCheck %s --check-prefixes=CHECK-WRAPPER,CHECK-BUILTIN -; RUN: opt < %S/generic_as_no_opt.ll --SYCLMutatePrintfAddrspace -S --enable-new-pm=1 | FileCheck %s --check-prefixes=CHECK-WRAPPER,CHECK-BUILTIN +; RUN: opt < %S/generic_as_no_opt.ll --SYCLMutatePrintfAddrspace -S --enable-new-pm=0 | FileCheck %s --check-prefixes=CHECK-WRAPPER,CHECK-BUILTIN +; RUN: opt < %S/generic_as_no_opt.ll --passes=SYCLMutatePrintfAddrspace -S | FileCheck %s --check-prefixes=CHECK-WRAPPER,CHECK-BUILTIN ; generic_as_variadic.ll -; RUN: opt < %S/generic_as_variadic.ll --SYCLMutatePrintfAddrspace -S | FileCheck %s --check-prefix=CHECK-BUILTIN -; RUN: opt < %S/generic_as_variadic.ll --SYCLMutatePrintfAddrspace -S --enable-new-pm=1 | FileCheck %s --check-prefix=CHECK-BUILTIN +; RUN: opt < %S/generic_as_variadic.ll --SYCLMutatePrintfAddrspace -S --enable-new-pm=0 | FileCheck %s --check-prefix=CHECK-BUILTIN +; RUN: opt < %S/generic_as_variadic.ll --passes=SYCLMutatePrintfAddrspace -S | FileCheck %s --check-prefix=CHECK-BUILTIN ; generic_as_variadic_no_opt.ll ; RUN: opt < %S/generic_as_variadic_no_opt.ll --SYCLMutatePrintfAddrspace -S --enable-new-pm=0 | FileCheck %s --check-prefixes=CHECK-WRAPPER,CHECK-BUILTIN