RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-05-18 19:36:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[sanitizer-coverage] rename sanitizer-coverage-create-pc-table into sanitizer-coverage-pc-table and add plumbing for a clang flag

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@309337 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Kostya Serebryany 2017-07-28 00:09:29 +00:00
parent f6b0182327
commit be07cfbcbd
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/llvm/Transforms/Instrumentation.h
View File

@ -183,6 +183,7 @@ struct SanitizerCoverageOptions {
bool TracePC = false; bool TracePC = false;
bool TracePCGuard = false; bool TracePCGuard = false;
bool Inline8bitCounters = false; bool Inline8bitCounters = false;
bool PCTable = false;
bool NoPrune = false; bool NoPrune = false;
SanitizerCoverageOptions() = default; SanitizerCoverageOptions() = default;

9
lib/Transforms/Instrumentation/SanitizerCoverage.cpp
View File

@ -84,7 +84,7 @@ static cl::opt<bool> ClTracePCGuard("sanitizer-coverage-trace-pc-guard",
// to __sanitizer_cov_pcs_init. // to __sanitizer_cov_pcs_init.
// This way the coverage instrumentation does not need to acquire the PCs // This way the coverage instrumentation does not need to acquire the PCs
// at run-time. Works with trace-pc-guard and inline-8bit-counters. // at run-time. Works with trace-pc-guard and inline-8bit-counters.
static cl::opt<bool> ClCreatePCTable("sanitizer-coverage-create-pc-table", static cl::opt<bool> ClCreatePCTable("sanitizer-coverage-pc-table",
cl::desc("create a static PC table"), cl::desc("create a static PC table"),
cl::Hidden, cl::init(false)); cl::Hidden, cl::init(false));
@ -147,6 +147,7 @@ SanitizerCoverageOptions OverrideFromCL(SanitizerCoverageOptions Options) {
Options.TracePC |= ClTracePC; Options.TracePC |= ClTracePC;
Options.TracePCGuard |= ClTracePCGuard; Options.TracePCGuard |= ClTracePCGuard;
Options.Inline8bitCounters |= ClInline8bitCounters; Options.Inline8bitCounters |= ClInline8bitCounters;
Options.PCTable |= ClCreatePCTable;
if (!Options.TracePCGuard && !Options.TracePC && !Options.Inline8bitCounters) if (!Options.TracePCGuard && !Options.TracePC && !Options.Inline8bitCounters)
Options.TracePCGuard = true; // TracePCGuard is default. Options.TracePCGuard = true; // TracePCGuard is default.
Options.NoPrune |= !ClPruneBlocks; Options.NoPrune |= !ClPruneBlocks;
@ -216,7 +217,7 @@ private:
GlobalVariable *FunctionGuardArray; // for trace-pc-guard. GlobalVariable *FunctionGuardArray; // for trace-pc-guard.
GlobalVariable *Function8bitCounterArray; // for inline-8bit-counters. GlobalVariable *Function8bitCounterArray; // for inline-8bit-counters.
GlobalVariable *FunctionPCsArray; // for create-pc-table. GlobalVariable *FunctionPCsArray; // for pc-table.
SanitizerCoverageOptions Options; SanitizerCoverageOptions Options;
}; };
@ -341,7 +342,7 @@ bool SanitizerCoverageModule::runOnModule(Module &M) {
if (Function8bitCounterArray) if (Function8bitCounterArray)
Ctor = CreateInitCallsForSections(M, SanCov8bitCountersInitName, Int8PtrTy, Ctor = CreateInitCallsForSections(M, SanCov8bitCountersInitName, Int8PtrTy,
SanCovCountersSectionName); SanCovCountersSectionName);
if (Ctor && ClCreatePCTable) { if (Ctor && Options.PCTable) {
auto SecStartEnd = CreateSecStartEnd(M, SanCovPCsSectionName, Int8PtrTy); auto SecStartEnd = CreateSecStartEnd(M, SanCovPCsSectionName, Int8PtrTy);
Function *InitFunction = declareSanitizerInitFunction( Function *InitFunction = declareSanitizerInitFunction(
M, SanCovPCsInitName, {Int8PtrTy, Int8PtrTy}); M, SanCovPCsInitName, {Int8PtrTy, Int8PtrTy});
@ -515,7 +516,7 @@ void SanitizerCoverageModule::CreateFunctionLocalArrays(
if (Options.Inline8bitCounters) if (Options.Inline8bitCounters)
Function8bitCounterArray = CreateFunctionLocalArrayInSection( Function8bitCounterArray = CreateFunctionLocalArrayInSection(
AllBlocks.size(), F, Int8Ty, SanCovCountersSectionName); AllBlocks.size(), F, Int8Ty, SanCovCountersSectionName);
if (ClCreatePCTable) if (Options.PCTable)
CreatePCArray(F, AllBlocks); CreatePCArray(F, AllBlocks);
} }

6
test/Instrumentation/SanitizerCoverage/pc-table.ll
View File

@ -1,6 +1,6 @@
; Test -sanitizer-coverage-create-pc-table=1 ; Test -sanitizer-coverage-pc-table=1
; RUN: opt < %s -sancov -sanitizer-coverage-level=3 -sanitizer-coverage-trace-pc-guard -sanitizer-coverage-create-pc-table=1 -S | FileCheck %s ; RUN: opt < %s -sancov -sanitizer-coverage-level=3 -sanitizer-coverage-trace-pc-guard -sanitizer-coverage-pc-table=1 -S | FileCheck %s
; RUN: opt < %s -sancov -sanitizer-coverage-level=3 -sanitizer-coverage-inline-8bit-counters -sanitizer-coverage-create-pc-table=1 -S | FileCheck %s ; RUN: opt < %s -sancov -sanitizer-coverage-level=3 -sanitizer-coverage-inline-8bit-counters -sanitizer-coverage-pc-table=1 -S | FileCheck %s
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64" target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
target triple = "x86_64-unknown-linux-gnu" target triple = "x86_64-unknown-linux-gnu"