From: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
To: linux-sparse@vger.kernel.org
Cc: Christopher Li <sparse@chrisli.org>,
Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Subject: [PATCH v6 30/52] llvm: give a name to all values
Date: Mon, 27 Mar 2017 23:23:54 +0200 [thread overview]
Message-ID: <20170327212416.18536-31-luc.vanoostenryck@gmail.com> (raw)
In-Reply-To: <20170327212416.18536-1-luc.vanoostenryck@gmail.com>
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
---
sparse-llvm.c | 37 +++++++++++++++++++++++--------------
1 file changed, 23 insertions(+), 14 deletions(-)
diff --git a/sparse-llvm.c b/sparse-llvm.c
index 4e4fb2ea5..3c7b669fe 100644
--- a/sparse-llvm.c
+++ b/sparse-llvm.c
@@ -407,15 +407,18 @@ static LLVMValueRef pseudo_to_rvalue(struct function *fn, struct instruction *in
{
LLVMValueRef val = pseudo_to_value(fn, insn, pseudo);
LLVMTypeRef dtype = symbol_type(insn->type);
+ char name[MAX_PSEUDO_NAME];
- return LLVMBuildBitCast(fn->builder, val, dtype, "");
+ pseudo_name(pseudo, name);
+ return LLVMBuildBitCast(fn->builder, val, dtype, name);
}
static LLVMValueRef value_to_ivalue(struct function *fn, LLVMValueRef val)
{
if (LLVMGetTypeKind(LLVMTypeOf(val)) == LLVMPointerTypeKind) {
LLVMTypeRef dtype = LLVMIntType(bits_in_pointer);
- val = LLVMBuildPtrToInt(fn->builder, val, dtype, "");
+ const char *name = LLVMGetValueName(val);
+ val = LLVMBuildPtrToInt(fn->builder, val, dtype, name);
}
return val;
}
@@ -424,7 +427,8 @@ static LLVMValueRef value_to_pvalue(struct function *fn, struct symbol *ctype, L
{
if (LLVMGetTypeKind(LLVMTypeOf(val)) == LLVMIntegerTypeKind) {
LLVMTypeRef dtype = symbol_type(ctype);
- val = LLVMBuildIntToPtr(fn->builder, val, dtype, "");
+ const char *name = LLVMGetValueName(val);
+ val = LLVMBuildIntToPtr(fn->builder, val, dtype, name);
}
return val;
}
@@ -444,13 +448,14 @@ static LLVMValueRef calc_gep(LLVMBuilderRef builder, LLVMValueRef base, LLVMValu
unsigned int as = LLVMGetPointerAddressSpace(type);
LLVMTypeRef bytep = LLVMPointerType(LLVMInt8Type(), as);
LLVMValueRef addr;
+ const char *name = LLVMGetValueName(off);
/* convert base to char* type */
- base = LLVMBuildPointerCast(builder, base, bytep, "");
+ base = LLVMBuildPointerCast(builder, base, bytep, name);
/* addr = base + off */
- addr = LLVMBuildInBoundsGEP(builder, base, &off, 1, "");
+ addr = LLVMBuildInBoundsGEP(builder, base, &off, 1, name);
/* convert back to the actual pointer type */
- addr = LLVMBuildPointerCast(builder, addr, type, "");
+ addr = LLVMBuildPointerCast(builder, addr, type, name);
return addr;
}
@@ -576,8 +581,8 @@ static void output_op_binary(struct function *fn, struct instruction *insn)
LLVMValueRef lhs_nz, rhs_nz;
LLVMTypeRef dst_type;
- lhs_nz = LLVMBuildIsNotNull(fn->builder, lhs, "");
- rhs_nz = LLVMBuildIsNotNull(fn->builder, rhs, "");
+ lhs_nz = LLVMBuildIsNotNull(fn->builder, lhs, LLVMGetValueName(lhs));
+ rhs_nz = LLVMBuildIsNotNull(fn->builder, rhs, LLVMGetValueName(rhs));
target = LLVMBuildAnd(fn->builder, lhs_nz, rhs_nz, target_name);
dst_type = insn_symbol_type(insn);
@@ -588,8 +593,8 @@ static void output_op_binary(struct function *fn, struct instruction *insn)
LLVMValueRef lhs_nz, rhs_nz;
LLVMTypeRef dst_type;
- lhs_nz = LLVMBuildIsNotNull(fn->builder, lhs, "");
- rhs_nz = LLVMBuildIsNotNull(fn->builder, rhs, "");
+ lhs_nz = LLVMBuildIsNotNull(fn->builder, lhs, LLVMGetValueName(lhs));
+ rhs_nz = LLVMBuildIsNotNull(fn->builder, rhs, LLVMGetValueName(rhs));
target = LLVMBuildOr(fn->builder, lhs_nz, rhs_nz, target_name);
dst_type = insn_symbol_type(insn);
@@ -675,7 +680,7 @@ static LLVMValueRef calc_memop_addr(struct function *fn, struct instruction *ins
src = pseudo_to_value(fn, insn, insn->src);
as = LLVMGetPointerAddressSpace(LLVMTypeOf(src));
addr_type = LLVMPointerType(insn_symbol_type(insn), as);
- src = LLVMBuildPointerCast(fn->builder, src, addr_type, "");
+ src = LLVMBuildPointerCast(fn->builder, src, addr_type, LLVMGetValueName(src));
/* addr = src + off */
addr = calc_gep(fn->builder, src, off);
@@ -686,11 +691,13 @@ static LLVMValueRef calc_memop_addr(struct function *fn, struct instruction *ins
static void output_op_load(struct function *fn, struct instruction *insn)
{
LLVMValueRef addr, target;
+ char name[MAX_PSEUDO_NAME];
addr = calc_memop_addr(fn, insn);
/* perform load */
- target = LLVMBuildLoad(fn->builder, addr, "load_target");
+ pseudo_name(insn->target, name);
+ target = LLVMBuildLoad(fn->builder, addr, name);
insn->target->priv = target;
}
@@ -710,7 +717,7 @@ static void output_op_store(struct function *fn, struct instruction *insn)
static LLVMValueRef bool_value(struct function *fn, LLVMValueRef value)
{
if (LLVMTypeOf(value) != LLVMInt1Type())
- value = LLVMBuildIsNotNull(fn->builder, value, "cond");
+ value = LLVMBuildIsNotNull(fn->builder, value, LLVMGetValueName(value));
return value;
}
@@ -733,12 +740,14 @@ static void output_op_br(struct function *fn, struct instruction *br)
static void output_op_sel(struct function *fn, struct instruction *insn)
{
LLVMValueRef target, src1, src2, src3;
+ char name[MAX_PSEUDO_NAME];
src1 = bool_value(fn, pseudo_to_value(fn, insn, insn->src1));
src2 = pseudo_to_value(fn, insn, insn->src2);
src3 = pseudo_to_value(fn, insn, insn->src3);
- target = LLVMBuildSelect(fn->builder, src1, src2, src3, "select");
+ pseudo_name(insn->target, name);
+ target = LLVMBuildSelect(fn->builder, src1, src2, src3, name);
insn->target->priv = target;
}
--
2.12.0
next prev parent reply other threads:[~2017-03-27 21:26 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-27 21:23 [PATCH v6 00/52] LLVM fixes Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 01/52] llvm: remove unneeded arg 'module' Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 02/52] llvm: remove unneeded 'generation' Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 03/52] llvm: remove unneeded function::type Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 04/52] llvm: reduce scope of 'bb_nr' Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 05/52] llvm: use pseudo_list_size() instead of open coding it Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 06/52] llvm: give arguments a name Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 07/52] llvm: give a name to call's return values Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 08/52] llvm: avoid useless temp variable Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 09/52] llvm: extract get_sym_value() from pseudo_to_value() Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 10/52] llvm: fix test of floating-point type Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 11/52] llvm: fix translation of PSEUDO_VALs into a ValueRefs Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 12/52] llvm: fix output_op_store() which modify its operand Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 13/52] llvm: fix output_op_[ptr]cast() Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 14/52] llvm: take care of degenerated rvalues Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 15/52] llvm: add test cases for symbol's address Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 16/52] llvm: add test cases for pointers passed as argument Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 17/52] llvm: add test cases for arrays " Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 18/52] llvm: add test cases for degenerated pointers Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 19/52] llvm: add support for OP_NEG Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 20/52] llvm: add support for OP_SETVAL with floats Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 21/52] llvm: add support for OP_SETVAL with labels Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 22/52] llvm: ignore OP_INLINED_CALL Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 23/52] llvm: fix pointer/float mixup in comparisons Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 24/52] llvm: fix type in comparison with an address constant Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 25/52] llvm: give correct type to binops Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 26/52] llvm: adjust OP_RET's type Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 27/52] llvm: variadic functions are not being marked as such Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 28/52] llvm: fix type of switch constants Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 29/52] llvm: make pseudo_name() more flexible Luc Van Oostenryck
2017-03-27 21:23 ` Luc Van Oostenryck [this message]
2017-03-27 21:23 ` [PATCH v6 31/52] llvm: add support for OP_SWITCH with a range Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 32/52] llvm: fix OP_SWITCH has no target Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 33/52] llvm: make value_to_pvalue() more flexible Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 34/52] llvm: make value_to_ivalue() " Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 35/52] llvm: add test case pointer compare with cast Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 36/52] llvm: let pseudo_to_value() directly use the type Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 37/52] llvm: remove unneeded pseudo_to_value() unneeded argument Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 38/52] llvm: introduce get_ioperand() Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 39/52] llvm: fix mutating function pointer Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 40/52] llvm: fix mutated OP_RET Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 41/52] llvm: fix mutated OP_SEL Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 42/52] llvm: fix mutated OP_SWITCH Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 43/52] llvm: fix mutated OP_PHISOURCE Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 44/52] llvm: fix mutated OP_[PTR]CAST Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 45/52] llvm: add support for restricted types Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 46/52] llvm: fix get value from initialized symbol Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 47/52] llvm: fix get value from non-anonymous symbol Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 48/52] llvm: fix type of bitfields Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 49/52] llvm: add support for OP_FPCAST Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 50/52] llvm: add support for cast from floats Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 51/52] llvm: cleanup of output_[ptr]cast() Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 52/52] llvm: fix creation of sparsec's tmp files Luc Van Oostenryck
2017-03-31 5:28 ` [PATCH v6 00/52] LLVM fixes Christopher Li
2017-03-31 5:32 ` Christopher Li
2017-03-31 8:56 ` Luc Van Oostenryck
2017-04-01 10:53 ` [GIT PULL v6] " Luc Van Oostenryck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170327212416.18536-31-luc.vanoostenryck@gmail.com \
--to=luc.vanoostenryck@gmail.com \
--cc=linux-sparse@vger.kernel.org \
--cc=sparse@chrisli.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).