This is an archive of the discontinued LLVM Phabricator instance.

Differential D52259

[CUDA] Fix two failed test cases using --cuda-path-ignore-env
ClosedPublic

Authored by gaijiading on Sep 18 2018, 9:46 PM.
Tokens
"Cup of Joe" token, awarded by gaijiading.

Details

Reviewers
jlebar
Hahnfeld
dlj
tra
echristo
Commits
rG664dd75b4270: [CUDA] Fix two failed test cases using --cuda-path-ignore-env
rL343075: [CUDA] Fix two failed test cases using --cuda-path-ignore-env
rC343075: [CUDA] Fix two failed test cases using --cuda-path-ignore-env
Summary

Add --cuda-path-ignore-env option to those test cases to ensure the clang driver always pick the CUDA path specified by --sysroot.

Diff Detail

Repository
rC Clang

Event Timeline

gaijiading created this revision.Sep 18 2018, 9:46 PM
Herald added a subscriber: cfe-commits. · View Herald TranscriptSep 18 2018, 9:46 PM
tra added a comment.Sep 19 2018, 1:08 PM

The patch does not seem to match the description and appears to have nothing to do with rearranging include paths. Could you check if these are the changes you intended to send for review.

gaijiading updated this revision to Diff 166206.Sep 19 2018, 5:51 PM

Apologies for having uploaded the wrong patch in my original review request. Please help review this version instead. Thanks.

gaijiading added a reviewer: echristo.Sep 20 2018, 12:45 PM
Hahnfeld added a comment.Sep 21 2018, 6:07 AM

IMO the current logic makes sense for the end user, prioritizing the environment guess over default paths. I think the tests should be fixed using --cuda-path-ignore-env, I remember I added this parameter to fix the failing tests when I wrote the code.

gaijiading updated this revision to Diff 166811.Sep 24 2018, 10:52 PM
gaijiading retitled this revision from [CUDA] Rearrange search path ordering to fix two test case failures to [CUDA] Fix two failed test cases using --cuda-path-ignore-env.
gaijiading edited the summary of this revision. (Show Details)

Thanks for the comments. Revised the patch to fix them using --cuda-path-ignore-env.

tra accepted this revision.Sep 25 2018, 9:36 AM

It's unfortunate that lit does not scrub the environment in order to make tests hermetic.

This revision is now accepted and ready to land.Sep 25 2018, 9:36 AM
Closed by commit rC343075: [CUDA] Fix two failed test cases using --cuda-path-ignore-env (authored by jiadinggai). · Explain WhySep 26 2018, 12:09 AM
This revision was automatically updated to reflect the committed changes.
gaijiading awarded a token.Sep 26 2018, 12:29 AM

Revision Contents

PathSize
test/
Driver/
4 lines
2 lines

Diff 167053

test/Driver/cuda-detect.cu

// REQUIRES: clang-driver // REQUIRES: clang-driver
// REQUIRES: x86-registered-target // REQUIRES: x86-registered-target
// REQUIRES: nvptx-registered-target // REQUIRES: nvptx-registered-target
// //
// Check that we properly detect CUDA installation. // Check that we properly detect CUDA installation.
// RUN: %clang -v --target=i386-unknown-linux \ // RUN: %clang -v --target=i386-unknown-linux \
// RUN: --sysroot=%S/no-cuda-there --cuda-path-ignore-env 2>&1 | FileCheck %s -check-prefix NOCUDA // RUN: --sysroot=%S/no-cuda-there --cuda-path-ignore-env 2>&1 | FileCheck %s -check-prefix NOCUDA
// RUN: %clang -v --target=i386-apple-macosx \ // RUN: %clang -v --target=i386-apple-macosx \
// RUN: --sysroot=%S/no-cuda-there --cuda-path-ignore-env 2>&1 | FileCheck %s -check-prefix NOCUDA // RUN: --sysroot=%S/no-cuda-there --cuda-path-ignore-env 2>&1 | FileCheck %s -check-prefix NOCUDA
// RUN: %clang -v --target=x86_64-unknown-linux \ // RUN: %clang -v --target=x86_64-unknown-linux \
// RUN: --sysroot=%S/no-cuda-there --cuda-path-ignore-env 2>&1 | FileCheck %s -check-prefix NOCUDA // RUN: --sysroot=%S/no-cuda-there --cuda-path-ignore-env 2>&1 | FileCheck %s -check-prefix NOCUDA
// RUN: %clang -v --target=x86_64-apple-macosx \ // RUN: %clang -v --target=x86_64-apple-macosx \
// RUN: --sysroot=%S/no-cuda-there --cuda-path-ignore-env 2>&1 | FileCheck %s -check-prefix NOCUDA // RUN: --sysroot=%S/no-cuda-there --cuda-path-ignore-env 2>&1 | FileCheck %s -check-prefix NOCUDA
// RUN: %clang -v --target=i386-unknown-linux \ // RUN: %clang -v --target=i386-unknown-linux \
// RUN: --sysroot=%S/Inputs/CUDA 2>&1 | FileCheck %s // RUN: --sysroot=%S/Inputs/CUDA --cuda-path-ignore-env 2>&1 | FileCheck %s
// RUN: %clang -v --target=i386-apple-macosx \ // RUN: %clang -v --target=i386-apple-macosx \
// RUN: --sysroot=%S/Inputs/CUDA 2>&1 | FileCheck %s // RUN: --sysroot=%S/Inputs/CUDA --cuda-path-ignore-env 2>&1 | FileCheck %s
// RUN: %clang -v --target=i386-unknown-linux \ // RUN: %clang -v --target=i386-unknown-linux \
// RUN: --cuda-path=%S/Inputs/CUDA/usr/local/cuda 2>&1 | FileCheck %s // RUN: --cuda-path=%S/Inputs/CUDA/usr/local/cuda 2>&1 | FileCheck %s
// RUN: %clang -v --target=i386-apple-macosx \ // RUN: %clang -v --target=i386-apple-macosx \
// RUN: --cuda-path=%S/Inputs/CUDA/usr/local/cuda 2>&1 | FileCheck %s // RUN: --cuda-path=%S/Inputs/CUDA/usr/local/cuda 2>&1 | FileCheck %s
// Check that we don't find a CUDA installation without libdevice ... // Check that we don't find a CUDA installation without libdevice ...
// RUN: %clang -v --target=i386-unknown-linux \ // RUN: %clang -v --target=i386-unknown-linux \
▲ Show 20 Lines • Show All 142 Lines • Show Last 20 Lines

test/Driver/cuda-macosx.cu

// REQUIRES: clang-driver // REQUIRES: clang-driver
// REQUIRES: x86-registered-target // REQUIRES: x86-registered-target
// REQUIRES: nvptx-registered-target // REQUIRES: nvptx-registered-target
// //
// RUN: %clang -v --target=i386-apple-macosx \ // RUN: %clang -v --target=i386-apple-macosx \
// RUN: --sysroot=%S/Inputs/CUDA-macosx 2>&1 | FileCheck %s // RUN: --sysroot=%S/Inputs/CUDA-macosx --cuda-path-ignore-env 2>&1 | FileCheck %s
// CHECK: Found CUDA installation: {{.*}}/Inputs/CUDA-macosx/usr/local/cuda // CHECK: Found CUDA installation: {{.*}}/Inputs/CUDA-macosx/usr/local/cuda