From 34b797d7f238f6950a5f8efddb1cd193fc71b675 Mon Sep 17 00:00:00 2001 From: Evgeny Mankov Date: Tue, 23 Jan 2018 21:43:18 +0300 Subject: [PATCH 1/2] [HIPIFY][tests][win] Fix run_test.bat All checks should not occur in input file for FileCheck. The issue found on CHECK-NOT. Change removes all lit checks in the hipified file based on regexp, and the resulted stdout is fed as stdin for FileCheck. [ROCm/clr commit: 8fae5663d279bfe420aa8968a43b2f812b5bda7a] --- projects/clr/hipamd/tests/hipify-clang/run_test.bat | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/clr/hipamd/tests/hipify-clang/run_test.bat b/projects/clr/hipamd/tests/hipify-clang/run_test.bat index 6eefb7e46e..b4858db807 100644 --- a/projects/clr/hipamd/tests/hipify-clang/run_test.bat +++ b/projects/clr/hipamd/tests/hipify-clang/run_test.bat @@ -1,4 +1,4 @@ -@echo off +rem @echo off setlocal for %%i in (FileCheck.exe) do set FILE_CHECK=%%~$PATH:i @@ -14,5 +14,6 @@ set clang_args=%4%clang_args% %HIPIFY% -o=%TMP_FILE% %IN_FILE% -- %clang_args% if errorlevel 1 (echo Error: hipify-clang.exe failed with exit code: %errorlevel% && exit /b %errorlevel%) -%FILE_CHECK% %IN_FILE% -input-file=%TMP_FILE% + +findstr /v /r /c:"[ ]*//[ ]*[CHECK*|RUN]" %TMP_FILE% | %FILE_CHECK% %IN_FILE% if errorlevel 1 (echo Error: FileCheck.exe failed with exit code: %errorlevel% && exit /b %errorlevel%) From f78369ce58e13bd33642f692a6995ebef7e37d2e Mon Sep 17 00:00:00 2001 From: Evgeny Mankov Date: Tue, 23 Jan 2018 21:46:27 +0300 Subject: [PATCH 2/2] [HIPIFY][tests][win] Uncomment @echo off [ROCm/clr commit: 35bd23fb07a1bd48f09749473827de782aa6eda1] --- projects/clr/hipamd/tests/hipify-clang/run_test.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/clr/hipamd/tests/hipify-clang/run_test.bat b/projects/clr/hipamd/tests/hipify-clang/run_test.bat index b4858db807..d8c8d74cf0 100644 --- a/projects/clr/hipamd/tests/hipify-clang/run_test.bat +++ b/projects/clr/hipamd/tests/hipify-clang/run_test.bat @@ -1,4 +1,4 @@ -rem @echo off +@echo off setlocal for %%i in (FileCheck.exe) do set FILE_CHECK=%%~$PATH:i