This is an archive of the discontinued LLVM Phabricator instance.

Differential D105861

[llvm-exegesis] Fix missing-headers build errors.
ClosedPublic

Authored by oontvoo on Jul 12 2021, 5:33 PM.

Details

Reviewers
courbet
ondrasej
Commits
rGa35480f85960: [llvm-exegesis] Fix missing-headers build errors.
Summary

Switch all #includes to use <> because that is consistent with what happens in the cmake checks.
Otherwise, we could be in the situation where cmake checks see that headers exist at <perfmon/...>
but in llvm-exegesis code, we use "perfmon/...", which may not exist.

Related PR/revisions: D84076, PR51017+D105615

Diff Detail

Event Timeline

oontvoo created this revision.Jul 12 2021, 5:33 PM
Herald added subscribers: mstojanovic, mgorny. · View Herald TranscriptJul 12 2021, 5:33 PM
oontvoo requested review of this revision.Jul 12 2021, 5:33 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 12 2021, 5:33 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B113623: Diff 358110.Jul 12 2021, 6:07 PM
courbet added inline comments.Jul 12 2021, 11:19 PM
llvm/cmake/modules/FindLibpfm.cmake
18 ↗(On Diff #358110)

I just looked at the code for check_include_file[1]: They are using #include <> and not #include "" - can we try that before giving up ? Because there should really be no difference between CHECK_CXX_SOURCE_COMPILES and this.

[1] https://gitlab.kitware.com/cmake/cmake/-/blob/master/Modules/CheckIncludeFile.c.in

oontvoo updated this revision to Diff 358332.Jul 13 2021, 10:30 AM

updated code to use <> #include everywhere

oontvoo marked an inline comment as done.Jul 13 2021, 10:30 AM
oontvoo added inline comments.
llvm/cmake/modules/FindLibpfm.cmake
18 ↗(On Diff #358110)

Done

oontvoo retitled this revision from [llvm-exegesis] Rework cmake variables around LIBPFM checking. to [llvm-exegesis] Fix missing-headers build errors..Jul 13 2021, 10:31 AM
oontvoo edited the summary of this revision. (Show Details)
Harbormaster completed remote builds in B113784: Diff 358332.Jul 13 2021, 11:47 AM
oontvoo updated this revision to Diff 358386.Jul 13 2021, 12:33 PM
oontvoo marked an inline comment as done.
oontvoo edited the summary of this revision. (Show Details)

clean up #ifdefs

Herald added a subscriber: krytarowski. · View Herald TranscriptJul 13 2021, 12:33 PM
Harbormaster completed remote builds in B113820: Diff 358386.Jul 13 2021, 1:46 PM
courbet accepted this revision.Jul 14 2021, 11:14 PM
This revision is now accepted and ready to land.Jul 14 2021, 11:14 PM
oontvoo updated this revision to Diff 359040.Jul 15 2021, 10:20 AM

rebase

This revision was landed with ongoing or failed builds.Jul 15 2021, 10:21 AM
Closed by commit rGa35480f85960: [llvm-exegesis] Fix missing-headers build errors. (authored by oontvoo). · Explain Why
This revision was automatically updated to reflect the committed changes.
oontvoo added a commit: rGa35480f85960: [llvm-exegesis] Fix missing-headers build errors..
Harbormaster completed remote builds in B114290: Diff 359040.Jul 15 2021, 12:28 PM

Revision Contents

PathSize
llvm/
tools/
llvm-exegesis/
lib/
6 lines
X86/
17 lines

Diff 359041

llvm/tools/llvm-exegesis/lib/PerfHelper.cpp

//===-- PerfHelper.cpp ------------------------------------------*- C++ -*-===// //===-- PerfHelper.cpp ------------------------------------------*- C++ -*-===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "PerfHelper.h" #include "PerfHelper.h"
#include "llvm/Config/config.h" #include "llvm/Config/config.h"
#include "llvm/Support/Errc.h" #include "llvm/Support/Errc.h"
#include "llvm/Support/Error.h" #include "llvm/Support/Error.h"
#include "llvm/Support/raw_ostream.h" #include "llvm/Support/raw_ostream.h"
#ifdef HAVE_LIBPFM #ifdef HAVE_LIBPFM
#include "perfmon/perf_event.h" #include <perfmon/perf_event.h>
#include "perfmon/pfmlib.h" #include <perfmon/pfmlib.h>
#include "perfmon/pfmlib_perf_event.h" #include <perfmon/pfmlib_perf_event.h>
#endif #endif
#include <cassert> #include <cassert>
#include <cstddef> #include <cstddef>
#include <errno.h> // for erno #include <errno.h> // for erno
#include <string.h> // for strerror() #include <string.h> // for strerror()
namespace llvm { namespace llvm {
▲ Show 20 Lines • Show All 143 Lines • Show Last 20 Lines

llvm/tools/llvm-exegesis/lib/X86/X86Counter.cpp

//===-- X86Counter.cpp ------------------------------------------*- C++ -*-===// //===-- X86Counter.cpp ------------------------------------------*- C++ -*-===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "X86Counter.h" #include "X86Counter.h"
#if defined(HAVE_LIBPFM) && defined(LIBPFM_HAS_FIELD_CYCLES) #if defined(__linux__) && defined(HAVE_LIBPFM) && \
defined(LIBPFM_HAS_FIELD_CYCLES)
// FIXME: Use appropriate wrappers for poll.h and mman.h // FIXME: Use appropriate wrappers for poll.h and mman.h
// to support Windows and remove this linux-only guard. // to support Windows and remove this linux-only guard.
#ifdef __linux__
#include "llvm/Support/Endian.h" #include "llvm/Support/Endian.h"
#include "llvm/Support/Errc.h" #include "llvm/Support/Errc.h"
#ifdef HAVE_LIBPFM #include <perfmon/perf_event.h>
#include "perfmon/perf_event.h" #include <perfmon/pfmlib.h>
#include "perfmon/pfmlib.h" #include <perfmon/pfmlib_perf_event.h>
#include "perfmon/pfmlib_perf_event.h"
#endif // HAVE_LIBPFM
#include <atomic> #include <atomic>
#include <chrono> #include <chrono>
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
#include <limits> #include <limits>
#include <memory> #include <memory>
#include <vector> #include <vector>
▲ Show 20 Lines • Show All 221 Lines • ▼ Show 20 LinesX86LbrCounter::doReadCounter(const void *From, const void *To) const {
if (!error) if (!error)
return CycleArray; return CycleArray;
return std::move(error); return std::move(error);
} }
} // namespace exegesis } // namespace exegesis
} // namespace llvm } // namespace llvm
#endif // defined(HAVE_LIBPFM) && defined(LIBPFM_HAS_FIELD_CYCLES) #endif // defined(__linux__) && defined(HAVE_LIBPFM) &&
#endif // __linux__ // defined(LIBPFM_HAS_FIELD_CYCLES)