Skip to content

[SYCL] Fix self build on windows. #3845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 1, 2021
Merged

[SYCL] Fix self build on windows. #3845

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e4e4ca9
Self build on windows needs the switch off too
zahiraam May 28, 2021
ec52e4d
Adding benchmark.h
zahiraam May 29, 2021
c1149de
Formatting
zahiraam May 29, 2021
dba4d5a
Formatting
zahiraam May 29, 2021
fe7ba7a
Merge remote-tracking branch 'remote/sycl' into win-selfbuild-err
zahiraam Jun 1, 2021
149d8a7
Removing benchmark.h changes
zahiraam Jun 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions llvm/utils/benchmark/include/benchmark/benchmark.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,10 +952,10 @@ class FunctionBenchmark : public Benchmark {
FunctionBenchmark(const char* name, Function* func)
: Benchmark(name), func_(func) {}

virtual void Run(State& st);
virtual void Run(State &st) override;

private:
Function* func_;
private:
Function *func_;
};

#ifdef BENCHMARK_HAS_CXX11
Expand Down Expand Up @@ -1013,7 +1013,7 @@ class Fixture : public internal::Benchmark {
public:
Fixture() : internal::Benchmark("") {}

virtual void Run(State& st) {
virtual void Run(State &st) override {
this->SetUp(st);
this->BenchmarkCase(st);
this->TearDown(st);
Expand Down Expand Up @@ -1399,10 +1399,10 @@ class ConsoleReporter : public BenchmarkReporter {
: output_options_(opts_), name_field_width_(0),
prev_counters_(), printed_header_(false) {}

virtual bool ReportContext(const Context& context);
virtual void ReportRuns(const std::vector<Run>& reports);
virtual bool ReportContext(const Context &context) override;
virtual void ReportRuns(const std::vector<Run> &reports) override;

protected:
protected:
virtual void PrintRunData(const Run& report);
virtual void PrintHeader(const Run& report);

Expand All @@ -1415,23 +1415,23 @@ class ConsoleReporter : public BenchmarkReporter {
class JSONReporter : public BenchmarkReporter {
public:
JSONReporter() : first_report_(true) {}
virtual bool ReportContext(const Context& context);
virtual void ReportRuns(const std::vector<Run>& reports);
virtual void Finalize();
virtual bool ReportContext(const Context &context) override;
virtual void ReportRuns(const std::vector<Run> &reports) override;
virtual void Finalize() override;

private:
void PrintRunData(const Run& report);
private:
void PrintRunData(const Run &report);

bool first_report_;
};

class CSVReporter : public BenchmarkReporter {
public:
CSVReporter() : printed_header_(false) {}
virtual bool ReportContext(const Context& context);
virtual void ReportRuns(const std::vector<Run>& reports);
virtual bool ReportContext(const Context &context) override;
virtual void ReportRuns(const std::vector<Run> &reports) override;

private:
private:
void PrintRunData(const Run& report);

bool printed_header_;
Expand Down
2 changes: 1 addition & 1 deletion sycl/plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)

if(NOT MSVC)
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-covered-switch-default")
endif()

Expand Down