This is an archive of the discontinued LLVM Phabricator instance.

Differential D111311

[Clang][OpenMP] Fix fat archive tests for Mac and Windows
ClosedPublic

Authored by saiislam on Oct 7 2021, 6:35 AM.

Details

Reviewers
thakis
ye-luo
jdoerfert
JonChesterfield
Commits
rG2baf7ad6d27f: [Clang][OpenMP] Fix fat archive tests for Mac and Windows
Summary

Fixes missing libomptarget on Mac and Windows in check lines. Issue
was introduced by D105191.

Diff Detail

Event Timeline

saiislam created this revision.Oct 7 2021, 6:35 AM
Herald added subscribers: kerbowa, guansong, yaxunl and 2 others. · View Herald TranscriptOct 7 2021, 6:35 AM
saiislam requested review of this revision.Oct 7 2021, 6:35 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptOct 7 2021, 6:35 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: cfe-commits, sstefan1. · View Herald Transcript
saiislam mentioned this in D105191: [Clang][OpenMP] Add partial support for Static Device Libraries.Oct 7 2021, 6:36 AM
thakis accepted this revision.Oct 7 2021, 6:37 AM

lgtm

This revision is now accepted and ready to land.Oct 7 2021, 6:37 AM
saiislam added a reviewer: JonChesterfield.Oct 7 2021, 6:37 AM
JonChesterfield accepted this revision.Oct 7 2021, 6:38 AM

Looks plausible to me

This revision was landed with ongoing or failed builds.Oct 7 2021, 6:39 AM
Closed by commit rG2baf7ad6d27f: [Clang][OpenMP] Fix fat archive tests for Mac and Windows (authored by saiislam). · Explain Why
This revision was automatically updated to reflect the committed changes.
saiislam added a commit: rG2baf7ad6d27f: [Clang][OpenMP] Fix fat archive tests for Mac and Windows.
Harbormaster completed remote builds in B127507: Diff 377827.Oct 7 2021, 7:07 AM
saiislam added a reverting change: rG1097f48e3dc3: Revert "[Clang][OpenMP] Fix fat archive tests for Mac and Windows".Oct 7 2021, 7:13 AM

Revision Contents

PathSize
clang/
test/
Driver/
2 lines
2 lines

Diff 377829

clang/test/Driver/fat_archive_amdgpu.cpp

// REQUIRES: clang-driver // REQUIRES: clang-driver
// REQUIRES: x86-registered-target // REQUIRES: x86-registered-target
// REQUIRES: amdgpu-registered-target // REQUIRES: amdgpu-registered-target
// See the steps to create a fat archive are given at the end of the file. // See the steps to create a fat archive are given at the end of the file.
// Given a FatArchive, clang-offload-bundler should be called to create a // Given a FatArchive, clang-offload-bundler should be called to create a
// device specific archive, which should be passed to llvm-link. // device specific archive, which should be passed to llvm-link.
// RUN: %clang -O2 -### -fopenmp -fopenmp-targets=amdgcn-amd-amdhsa -Xopenmp-target=amdgcn-amd-amdhsa -march=gfx906 %s -L%S/Inputs/openmp_static_device_link -lFatArchive 2>&1 | FileCheck %s // RUN: %clang -O2 -### -fopenmp -fopenmp-targets=amdgcn-amd-amdhsa -Xopenmp-target=amdgcn-amd-amdhsa -march=gfx906 %s -L%S/Inputs/openmp_static_device_link -lFatArchive 2>&1 | FileCheck %s
// CHECK: clang{{.*}}"-cc1"{{.*}}"-triple" "amdgcn-amd-amdhsa"{{.*}}"-emit-llvm-bc"{{.*}}"-target-cpu" "[[GPU:gfx[0-9]+]]"{{.*}}"-o" "[[HOSTBC:.*.bc]]" "-x" "c++"{{.*}}.cpp // CHECK: clang{{.*}}"-cc1"{{.*}}"-triple" "amdgcn-amd-amdhsa"{{.*}}"-emit-llvm-bc"{{.*}}"-target-cpu" "[[GPU:gfx[0-9]+]]"{{.*}}"-o" "[[HOSTBC:.*.bc]]" "-x" "c++"{{.*}}.cpp
// CHECK: clang-offload-bundler" "-unbundle" "-type=a" "-inputs={{.*}}/Inputs/openmp_static_device_link/libFatArchive.a" "-targets=openmp-amdgcn-amd-amdhsa-[[GPU]]" "-outputs=[[DEVICESPECIFICARCHIVE:.*.a]]" "-allow-missing-bundles" // CHECK: clang-offload-bundler" "-unbundle" "-type=a" "-inputs={{.*}}/Inputs/openmp_static_device_link/libFatArchive.a" "-targets=openmp-amdgcn-amd-amdhsa-[[GPU]]" "-outputs=[[DEVICESPECIFICARCHIVE:.*.a]]" "-allow-missing-bundles"
// CHECK: llvm-link{{.*}}"[[HOSTBC]]" "[[DEVICESPECIFICARCHIVE]]" "-o" "{{.*}}-[[GPU]]-linked-{{.*}}.bc" // CHECK: llvm-link{{.*}}"[[HOSTBC]]" "[[DEVICESPECIFICARCHIVE]]" "-o" "{{.*}}-[[GPU]]-linked-{{.*}}.bc"
// CHECK: ld"{{.*}}" "-L{{.*}}/Inputs/openmp_static_device_link" "{{.*}} "-lFatArchive" "{{.*}}" "-lomp{{.*}}-lomptarget" // CHECK: ld"{{.*}}" "-L{{.*}}/Inputs/openmp_static_device_link" "{{.*}} "-lFatArchive" "{{.*}}" "-lomp"
// expected-no-diagnostics // expected-no-diagnostics
#ifndef HEADER #ifndef HEADER
#define HEADER #define HEADER
#define N 10 #define N 10
#pragma omp declare target #pragma omp declare target
▲ Show 20 Lines • Show All 60 Lines • Show Last 20 Lines

clang/test/Driver/fat_archive_nvptx.cpp

// REQUIRES: clang-driver // REQUIRES: clang-driver
// REQUIRES: x86-registered-target // REQUIRES: x86-registered-target
// REQUIRES: nvptx-registered-target // REQUIRES: nvptx-registered-target
// See the steps to create a fat archive are given at the end of the file. // See the steps to create a fat archive are given at the end of the file.
// Given a FatArchive, clang-offload-bundler should be called to create a // Given a FatArchive, clang-offload-bundler should be called to create a
// device specific archive, which should be passed to clang-nvlink-wrapper. // device specific archive, which should be passed to clang-nvlink-wrapper.
// RUN: %clang -O2 -### -fopenmp -fopenmp-targets=nvptx64 %s -L%S/Inputs/openmp_static_device_link -lFatArchive 2>&1 | FileCheck %s // RUN: %clang -O2 -### -fopenmp -fopenmp-targets=nvptx64 %s -L%S/Inputs/openmp_static_device_link -lFatArchive 2>&1 | FileCheck %s
// CHECK: clang{{.*}}"-cc1"{{.*}}"-triple" "nvptx64"{{.*}}"-target-cpu" "[[GPU:sm_[0-9]+]]"{{.*}}"-o" "[[HOSTBC:.*.s]]" "-x" "c++"{{.*}}.cpp // CHECK: clang{{.*}}"-cc1"{{.*}}"-triple" "nvptx64"{{.*}}"-target-cpu" "[[GPU:sm_[0-9]+]]"{{.*}}"-o" "[[HOSTBC:.*.s]]" "-x" "c++"{{.*}}.cpp
// CHECK: clang-offload-bundler" "-unbundle" "-type=a" "-inputs={{.*}}/Inputs/openmp_static_device_link/libFatArchive.a" "-targets=openmp-nvptx64-[[GPU]]" "-outputs=[[DEVICESPECIFICARCHIVE:.*.a]]" "-allow-missing-bundles" // CHECK: clang-offload-bundler" "-unbundle" "-type=a" "-inputs={{.*}}/Inputs/openmp_static_device_link/libFatArchive.a" "-targets=openmp-nvptx64-[[GPU]]" "-outputs=[[DEVICESPECIFICARCHIVE:.*.a]]" "-allow-missing-bundles"
// CHECK: clang-nvlink-wrapper{{.*}}"-o" "{{.*}}.out" "-arch" "[[GPU]]" "{{.*}}[[DEVICESPECIFICARCHIVE]]" // CHECK: clang-nvlink-wrapper{{.*}}"-o" "{{.*}}.out" "-arch" "[[GPU]]" "{{.*}}[[DEVICESPECIFICARCHIVE]]"
// CHECK: ld"{{.*}}" "-L{{.*}}/Inputs/openmp_static_device_link" "{{.*}} "-lFatArchive" "{{.*}}" "-lomp{{.*}}-lomptarget" // CHECK: ld"{{.*}}" "-L{{.*}}/Inputs/openmp_static_device_link" "{{.*}} "-lFatArchive" "{{.*}}" "-lomp{{.*}}"
// expected-no-diagnostics // expected-no-diagnostics
#ifndef HEADER #ifndef HEADER
#define HEADER #define HEADER
#define N 10 #define N 10
#pragma omp declare target #pragma omp declare target
▲ Show 20 Lines • Show All 60 Lines • Show Last 20 Lines