oota-llvm.git
8 years agoNFC. Fix some format issues in lib/CodeGen/MachineBasicBlock.cpp.
Cong Hou [Mon, 10 Aug 2015 22:27:10 +0000 (22:27 +0000)]
NFC. Fix some format issues in lib/CodeGen/MachineBasicBlock.cpp.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244518 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agocmake: Make CMAKE_BUILD_TYPE check case-insensitive
Justin Bogner [Mon, 10 Aug 2015 21:58:27 +0000 (21:58 +0000)]
cmake: Make CMAKE_BUILD_TYPE check case-insensitive

Juergen pointed out that this variable is treated in a case
insensitive way.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244516 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoMachineVerifier: Handle the optional def operand in a PATCHPOINT instruction.
Alex Lorenz [Mon, 10 Aug 2015 21:47:36 +0000 (21:47 +0000)]
MachineVerifier: Handle the optional def operand in a PATCHPOINT instruction.

The PATCHPOINT instructions have a single optional defined register operand,
but the machine verifier can't verify the optional defined register operands.
This commit makes sure that the machine verifier won't report an error when a
PATCHPOINT instruction doesn't have its optional defined register operand.
This change will allow us to enable the machine verifier for the code
generation tests for the patchpoint intrinsics.

Reviewers: Juergen Ributzka

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244513 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[llvm-symbolizer] Remove underscores and other C mangling on Windows
Reid Kleckner [Mon, 10 Aug 2015 21:47:11 +0000 (21:47 +0000)]
[llvm-symbolizer] Remove underscores and other C mangling on Windows

Summary:
This makes it so that reports symbolized after the fact with
llvm-symbolizer are more similar to the ones we generate at runtime with
in-process dbghelp.

Reviewers: samsonov

Subscribers: llvm-commits

Differential Revision: http://reviews.llvm.org/D11785

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244512 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoDon't iterate over all sections in the ELFFile constructor.
Rafael Espindola [Mon, 10 Aug 2015 21:29:35 +0000 (21:29 +0000)]
Don't iterate over all sections in the ELFFile constructor.

With this we finally have an ELFFile that is O(1) to construct. This is helpful
for programs like lld which have to do their own section walk.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244510 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoremove function names from comments; NFC
Sanjay Patel [Mon, 10 Aug 2015 21:28:16 +0000 (21:28 +0000)]
remove function names from comments; NFC

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244509 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoStackMap: FastISel: Add an appropriate number of immediate operands to the
Alex Lorenz [Mon, 10 Aug 2015 21:27:03 +0000 (21:27 +0000)]
StackMap: FastISel: Add an appropriate number of immediate operands to the
frame setup instruction.

This commit ensures that the stack map lowering code in FastISel adds an
appropriate number of immediate operands to the frame setup instruction.

The previous code added just one immediate operand, which was fine for a target
like AArch64, but on X86 the ADJCALLSTACKDOWN64 instruction needs two explicit
operands. This caused the machine verifier to report an error when the old code
added just one.

Reviewers: Juergen Ributzka

Differential Revision: http://reviews.llvm.org/D11853

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244508 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoRename improperly named variable. NFC.
Rafael Espindola [Mon, 10 Aug 2015 21:25:44 +0000 (21:25 +0000)]
Rename improperly named variable. NFC.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244507 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoMake fp vectorization test X86 specified to avoid cost-model related problems on...
Tyler Nowicki [Mon, 10 Aug 2015 21:14:38 +0000 (21:14 +0000)]
Make fp vectorization test X86 specified to avoid cost-model related problems on arm-thumb and hexagon.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244505 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoAdd a test showing that objdump (and so ObjectFIle) can handle shndx.
Rafael Espindola [Mon, 10 Aug 2015 21:00:15 +0000 (21:00 +0000)]
Add a test showing that objdump (and so ObjectFIle) can handle shndx.

It was already passing, we were just not testing the code.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244504 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agox86: Emit LAHF/SAHF instead of PUSHF/POPF
JF Bastien [Mon, 10 Aug 2015 20:59:36 +0000 (20:59 +0000)]
x86: Emit LAHF/SAHF instead of PUSHF/POPF

NaCl's sandbox doesn't allow PUSHF/POPF out of security concerns (priviledged emulators have forgotten to mask system bits in the past, and EFLAGS's DF bit is a constant source of hilarity). Commit r220529 fixed PR20376 by saving cmpxchg's flags result using EFLAGS, this commit now generated LAHF/SAHF instead, for all of x86 (not just NaCl) because it leads to an overall performance gain over PUSHF/POPF.

As with the previous patch this code generation is pretty bad because it occurs very later, after register allocation, and in many cases it rematerializes flags which were already available (e.g. already in a register through SETE). Fortunately it's somewhat rare that this code needs to fire.

I did [[ https://github.com/jfbastien/benchmark-x86-flags | a bit of benchmarking ]], the results on an Intel Haswell E5-2690 CPU at 2.9GHz are:

| Time per call (ms)  | Runtime (ms) | Benchmark                      |
| 0.000012514         |      6257    | sete.i386                      |
| 0.000012810         |      6405    | sete.i386-fast                 |
| 0.000010456         |      5228    | sete.x86-64                    |
| 0.000010496         |      5248    | sete.x86-64-fast               |
| 0.000012906         |      6453    | lahf-sahf.i386                 |
| 0.000013236         |      6618    | lahf-sahf.i386-fast            |
| 0.000010580         |      5290    | lahf-sahf.x86-64               |
| 0.000010304         |      5152    | lahf-sahf.x86-64-fast          |
| 0.000028056         |     14028    | pushf-popf.i386                |
| 0.000027160         |     13580    | pushf-popf.i386-fast           |
| 0.000023810         |     11905    | pushf-popf.x86-64              |
| 0.000026468         |     13234    | pushf-popf.x86-64-fast         |

Clearly `PUSHF`/`POPF` are suboptimal. It doesn't really seems to be worth teaching LLVM about individual flags, at least not for this purpose.

Reviewers: rnk, jvoung, t.p.northover

Subscribers: llvm-commits

Differential revision: http://reviews.llvm.org/D6629

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244503 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoUse higher level functions in llvm-objdump.
Rafael Espindola [Mon, 10 Aug 2015 20:50:40 +0000 (20:50 +0000)]
Use higher level functions in llvm-objdump.

This matches the rest of llvm-objdump better and isolates it from upcoming
changes to ELFFile.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244500 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agofix minsize detection: minsize attribute implies optimizing for size
Sanjay Patel [Mon, 10 Aug 2015 20:45:44 +0000 (20:45 +0000)]
fix minsize detection: minsize attribute implies optimizing for size

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244499 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[x86, SSE]]add missing tests for load folding with partial register update
Sanjay Patel [Mon, 10 Aug 2015 20:34:34 +0000 (20:34 +0000)]
[x86, SSE]]add missing tests for load folding with partial register update

The minsize case is wrong; that will be fixed in the next commit.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244498 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoDelete getDotSymtabSec.
Rafael Espindola [Mon, 10 Aug 2015 20:25:04 +0000 (20:25 +0000)]
Delete getDotSymtabSec.

Another step in avoiding iterating over all sections in the ELFFile constructor.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244496 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[InstCombine] Move SSE2/AVX2 arithmetic vector shift folding to instcombiner
Simon Pilgrim [Mon, 10 Aug 2015 20:21:15 +0000 (20:21 +0000)]
[InstCombine] Move SSE2/AVX2 arithmetic vector shift folding to instcombiner

As discussed in D11760, this patch moves the (V)PSRA(WD) arithmetic shift-by-constant folding to InstCombine to match the logical shift implementations.

Differential Revision: http://reviews.llvm.org/D11886

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244495 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoRemoved unused and incorrectly implemented classof() on Optimization Remark base...
Tyler Nowicki [Mon, 10 Aug 2015 20:13:32 +0000 (20:13 +0000)]
Removed unused and incorrectly implemented classof() on Optimization Remark base class.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244494 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[TableGen] NFC improving comments about what the tokenized identifiers will contain.
Colin LeMahieu [Mon, 10 Aug 2015 19:58:06 +0000 (19:58 +0000)]
[TableGen] NFC improving comments about what the tokenized identifiers will contain.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244493 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoFix a few more cases of 'CHECK[^:]*$'. NFCI
Jonathan Roelofs [Mon, 10 Aug 2015 19:56:39 +0000 (19:56 +0000)]
Fix a few more cases of 'CHECK[^:]*$'. NFCI

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244491 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoLate evaluation of the fast-math vectorization requirement.
Tyler Nowicki [Mon, 10 Aug 2015 19:51:46 +0000 (19:51 +0000)]
Late evaluation of the fast-math vectorization requirement.

This patch moves the verification of fast-math to just before vectorization is done. This way we can tell clang to append the command line options would that allow floating-point commutativity. Specifically those are enableing fast-math or specifying a loop hint.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244489 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoFix another case of 'CHECK[^:]*$'. NFCI
Jonathan Roelofs [Mon, 10 Aug 2015 19:22:55 +0000 (19:22 +0000)]
Fix another case of 'CHECK[^:]*$'. NFCI

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244486 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoModify diagnostic messages to clearly indicate the why interleaving wasn't done.
Tyler Nowicki [Mon, 10 Aug 2015 19:14:16 +0000 (19:14 +0000)]
Modify diagnostic messages to clearly indicate the why interleaving wasn't done.

Sometimes interleaving is not beneficial, as determined by the cost-model and sometimes it is disabled by a loop hint (by the user). This patch modifies the diagnostic messages to make it clear why interleaving wasn't done.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244485 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[Sparc] Implement i64 load/store support for 32-bit sparc.
James Y Knight [Mon, 10 Aug 2015 19:11:39 +0000 (19:11 +0000)]
[Sparc] Implement i64 load/store support for 32-bit sparc.

The LDD/STD instructions can load/store a 64bit quantity from/to
memory to/from a consecutive even/odd pair of (32-bit) registers. They
are part of SparcV8, and also present in SparcV9. (Although deprecated
there, as you can store 64bits in one register).

As recommended on llvmdev in the thread "How to enable use of 64bit
load/store for 32bit architecture" from Apr 2015, I've modeled the
64-bit load/store operations as working on a v2i32 type, rather than
making i64 a legal type, but with few legal operations. The latter
does not (currently) work, as there is much code in llvm which assumes
that if i64 is legal, operations like "add" will actually work on it.

The same assumption does not hold for v2i32 -- for vector types, it is
workable to support only load/store, and expand everything else.

This patch:
- Adds a new register class, IntPair, for even/odd pairs of registers.

- Modifies the list of reserved registers, the stack spilling code,
  and register copying code to support the IntPair register class.

- Adds support in AsmParser. (note that in asm text, you write the
  name of the first register of the pair only. So the parser has to
  morph the single register into the equivalent paired register).

- Adds the new instructions themselves (LDD/STD/LDDA/STDA).

- Hooks up the instructions and registers as a vector type v2i32. Adds
  custom legalizer to transform i64 load/stores into v2i32 load/stores
  and bitcasts, so that the new instructions can actually be
  generated, and marks all operations other than load/store on v2i32
  as needing to be expanded.

- Copies the unfortunate SelectInlineAsm hack from ARMISelDAGToDAG.
  This hack undoes the transformation of i64 operands into two
  arbitrarily-allocated separate i32 registers in
  SelectionDAGBuilder. and instead passes them in a single
  IntPair. (Arbitrarily allocated registers are not useful, asm code
  expects to be receiving a pair, which can be passed to ldd/std.)

Also adds a bunch of test cases covering all the bugs I've added along
the way.

Differential Revision: http://reviews.llvm.org/D8713

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244484 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agorename toELFShdrIter to getSection and move it closer to getSymbol. NFC.
Rafael Espindola [Mon, 10 Aug 2015 19:10:37 +0000 (19:10 +0000)]
rename toELFShdrIter to getSection and move it closer to getSymbol. NFC.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244483 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agotoELFSymIter and getSymbol are now the same thing. Merge them.
Rafael Espindola [Mon, 10 Aug 2015 19:07:56 +0000 (19:07 +0000)]
toELFSymIter and getSymbol are now the same thing. Merge them.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244482 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoFix a bunch of trivial cases of 'CHECK[^:]*$' in the tests. NFCI
Jonathan Roelofs [Mon, 10 Aug 2015 19:01:27 +0000 (19:01 +0000)]
Fix a bunch of trivial cases of 'CHECK[^:]*$' in the tests. NFCI

I looked into adding a warning / error for this to FileCheck, but there doesn't
seem to be a good way to avoid it triggering on the instances of it in RUN lines.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244481 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoUse continue to reduce indentation. NFC.
Rafael Espindola [Mon, 10 Aug 2015 18:57:42 +0000 (18:57 +0000)]
Use continue to reduce indentation. NFC.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244480 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[AArch64] Convert a conditional check that will always be true to an assert. NFC.
Chad Rosier [Mon, 10 Aug 2015 18:42:45 +0000 (18:42 +0000)]
[AArch64] Convert a conditional check that will always be true to an assert. NFC.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244479 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoRecommit r244470+ r244471 together, the bot failed between them.
Yaron Keren [Mon, 10 Aug 2015 18:27:51 +0000 (18:27 +0000)]
Recommit r244470+ r244471 together, the bot failed between them.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244476 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[IndVarSimplify] Make cost estimation in RewriteLoopExitValues smarter
Igor Laevsky [Mon, 10 Aug 2015 18:23:58 +0000 (18:23 +0000)]
[IndVarSimplify] Make cost estimation in RewriteLoopExitValues smarter

Differential Revision: http://reviews.llvm.org/D11687

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244474 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoRevert r244470 and 244471 while looking into it.
Yaron Keren [Mon, 10 Aug 2015 18:14:56 +0000 (18:14 +0000)]
Revert r244470 and 244471 while looking into it.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244472 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoSecond part of r244470 (source file was unsaved in editor).
Yaron Keren [Mon, 10 Aug 2015 18:06:01 +0000 (18:06 +0000)]
Second part of r244470 (source file was unsaved in editor).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244471 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoReally implement David Blaikie suggestion in full of seperating
Yaron Keren [Mon, 10 Aug 2015 18:03:35 +0000 (18:03 +0000)]
Really implement David Blaikie suggestion in full of seperating
variable initialization from its usage in the push_back making
collapse of the two statements unlikely even without a comment.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244470 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoAdd new llvm.loop.unroll.enable metadata.
Mark Heffernan [Mon, 10 Aug 2015 17:28:08 +0000 (17:28 +0000)]
Add new llvm.loop.unroll.enable metadata.

This change adds the unroll metadata "llvm.loop.unroll.enable" which directs
the optimizer to unroll a loop fully if the trip count is known at compile time, and
unroll partially if the trip count is not known at compile time. This differs from
"llvm.loop.unroll.full" which explicitly does not unroll a loop if the trip count is not
known at compile time.

The "llvm.loop.unroll.enable" is intended to be added for loops annotated with
"#pragma unroll".

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244466 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoTypo. Move comment closer to relevant code. NFC.
Chad Rosier [Mon, 10 Aug 2015 17:17:19 +0000 (17:17 +0000)]
Typo. Move comment closer to relevant code. NFC.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244465 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agofix minsize detection: minsize attribute implies optimizing for size
Sanjay Patel [Mon, 10 Aug 2015 17:15:17 +0000 (17:15 +0000)]
fix minsize detection: minsize attribute implies optimizing for size

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244464 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agofix minsize detection: minsize attribute implies optimizing for size
Sanjay Patel [Mon, 10 Aug 2015 17:00:44 +0000 (17:00 +0000)]
fix minsize detection: minsize attribute implies optimizing for size

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244463 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoFully apply David Blaikie suggestion and add comment explaining why.
Yaron Keren [Mon, 10 Aug 2015 16:53:30 +0000 (16:53 +0000)]
Fully apply David Blaikie suggestion and add comment explaining why.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244461 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agofix minsize detection: minsize attribute implies optimizing for size
Sanjay Patel [Mon, 10 Aug 2015 16:47:47 +0000 (16:47 +0000)]
fix minsize detection: minsize attribute implies optimizing for size

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244460 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agofix minsize detection: minsize attribute implies optimizing for size
Sanjay Patel [Mon, 10 Aug 2015 16:43:20 +0000 (16:43 +0000)]
fix minsize detection: minsize attribute implies optimizing for size

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244458 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoAdd missing include guard to FuzzerInternal.h, NFC.
Yaron Keren [Mon, 10 Aug 2015 16:37:40 +0000 (16:37 +0000)]
Add missing include guard to FuzzerInternal.h, NFC.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244457 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoModify r244405 to clearer code, per David Blaikie suggestion.
Yaron Keren [Mon, 10 Aug 2015 16:15:51 +0000 (16:15 +0000)]
Modify r244405 to clearer code, per David Blaikie suggestion.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244455 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoSilence a sign mismatch warning; NFC.
Aaron Ballman [Mon, 10 Aug 2015 15:22:39 +0000 (15:22 +0000)]
Silence a sign mismatch warning; NFC.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244452 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[TTI] Add a hook for specifying per-target defaults for Interleaved Accesses
Silviu Baranga [Mon, 10 Aug 2015 14:50:54 +0000 (14:50 +0000)]
[TTI] Add a hook for specifying per-target defaults for Interleaved Accesses

Summary:
This adds a hook to TTI which enables us to selectively turn on by default
interleaved access vectorization for targets on which we have have performed
the required benchmarking.

Reviewers: rengolin

Subscribers: rengolin, llvm-commits

Differential Revision: http://reviews.llvm.org/D11901

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244449 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoPrevent the scalarizer from caching incorrect entries
Fraser Cormack [Mon, 10 Aug 2015 14:48:47 +0000 (14:48 +0000)]
Prevent the scalarizer from caching incorrect entries

The scalarizer can cache incorrect entries when walking up a chain of
insertelement instructions. This occurs when it encounters more than one
instruction that it is not actively searching for, as it unconditionally caches
every element it finds. The fix is to only cache the first element that it
isn't searching for so we don't overwrite correct entries.

Reviewers: hfinkel

Differential Revision: http://reviews.llvm.org/D11559

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244448 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoelf2yaml: Use existing section walk to find the symbol table. NFC.
Rafael Espindola [Mon, 10 Aug 2015 14:27:50 +0000 (14:27 +0000)]
elf2yaml: Use existing section walk to find the symbol table. NFC.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244447 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[RegionInfo] Fix typo
Michael Kruse [Mon, 10 Aug 2015 13:26:09 +0000 (13:26 +0000)]
[RegionInfo] Fix typo

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244445 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[RegionInfo] Add debug-time region viewer functions
Michael Kruse [Mon, 10 Aug 2015 13:21:59 +0000 (13:21 +0000)]
[RegionInfo] Add debug-time region viewer functions

Summary:
Analogously to Function::viewCFG(), RegionInfo::view() and RegionInfo::viewOnly() are meant to be called in debugging sessions. They open a viewer to show how RegionInfo currently understands the region hierarchy.

The functions viewRegion(Function*) and viewRegionOnly(Function*) invoke a fresh region analysis of the function in contrast to viewRegion(RegionInfo*) and viewRegionOnly(RegionInfo*) which show the current analysis result.

Reviewers: grosser

Subscribers: llvm-commits

Differential Revision: http://reviews.llvm.org/D11875

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244444 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[RegionInfo] Use RegionInfo* instead of RegionInfoPass* as graph type
Michael Kruse [Mon, 10 Aug 2015 12:57:23 +0000 (12:57 +0000)]
[RegionInfo] Use RegionInfo* instead of RegionInfoPass* as graph type

This allows printing region graphs when only the RegionInfo (e.g. Region::getRegionInfo()), but no RegionInfoPass object is available.

Specifically, we will use this to print RegionInfo graphs in the debugger.

Differential version: http://reviews.llvm.org/D11874

Reviewed-by: grosser
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244442 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[RegionInfo] Update old-style comments
Michael Kruse [Mon, 10 Aug 2015 12:40:41 +0000 (12:40 +0000)]
[RegionInfo] Update old-style comments

Authorized-by: grosser
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244441 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[RegionInfo] More descriptive error messages in verifier
Michael Kruse [Mon, 10 Aug 2015 12:28:52 +0000 (12:28 +0000)]
[RegionInfo] More descriptive error messages in verifier

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244440 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoTrace copies when checking for rematerializability in spill weight calculation
Robert Lougher [Mon, 10 Aug 2015 11:59:44 +0000 (11:59 +0000)]
Trace copies when checking for rematerializability in spill weight calculation

PR24139 contains an analysis of poor register allocation. One of the findings
was that when calculating the spill weight, a rematerializable interval once
split is no longer rematerializable. This is because the isRematerializable
check in CalcSpillWeights.cpp does not follow the copies introduced by live
range splitting (after splitting, the live interval register definition is a
copy which is not rematerializable).

Reviewers: qcolombet

Differential Revision: http://reviews.llvm.org/D11686

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244439 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoTest commit to verify commit access
Marina Yatsina [Mon, 10 Aug 2015 11:33:10 +0000 (11:33 +0000)]
Test commit to verify commit access

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244438 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoRangify for loop, NFC.
Yaron Keren [Mon, 10 Aug 2015 07:04:29 +0000 (07:04 +0000)]
Rangify for loop, NFC.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244434 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoReformat headers in ADT and Support partially.
NAKAMURA Takumi [Mon, 10 Aug 2015 04:22:36 +0000 (04:22 +0000)]
Reformat headers in ADT and Support partially.

Note, I didn't reformat entirely, but partially where I touched in previous commits.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244432 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoWhitespace.
NAKAMURA Takumi [Mon, 10 Aug 2015 04:22:09 +0000 (04:22 +0000)]
Whitespace.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244431 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoReformat linebreaks.
NAKAMURA Takumi [Mon, 10 Aug 2015 04:21:43 +0000 (04:21 +0000)]
Reformat linebreaks.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244430 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agollvm/include/llvm/Support/Memory.h: Fix comment header.
NAKAMURA Takumi [Mon, 10 Aug 2015 04:21:19 +0000 (04:21 +0000)]
llvm/include/llvm/Support/Memory.h: Fix comment header.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244429 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[TableGen] Make StringInit constructor take a StringRef instead of const std::string...
Craig Topper [Sun, 9 Aug 2015 22:03:04 +0000 (22:03 +0000)]
[TableGen] Make StringInit constructor take a StringRef instead of const std::string&. NFC.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244426 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoX86: remove a dead store (NFC)
Saleem Abdulrasool [Sun, 9 Aug 2015 20:39:09 +0000 (20:39 +0000)]
X86: remove a dead store (NFC)

The SP was always unconditionally assigned to later, but initialised early.
This delays the initialisation, and avoids the dead store.  Identified by
clang static analysis.  No functional change intended.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244423 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[LAA] Remove unused pointer partition argument from needsChecking(), NFC
Adam Nemet [Sun, 9 Aug 2015 20:06:08 +0000 (20:06 +0000)]
[LAA] Remove unused pointer partition argument from needsChecking(), NFC

This is no longer used in any of the callers.  Also remove the logic of
handling this argument.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244421 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[LAA] Remove unused pointer partition argument from generateChecks, NFC
Adam Nemet [Sun, 9 Aug 2015 20:06:06 +0000 (20:06 +0000)]
[LAA] Remove unused pointer partition argument from generateChecks, NFC

LoopDistribution does its own filtering now.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244420 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[PHITransAddr] Don't assume that instruction operands are translatable
David Majnemer [Sun, 9 Aug 2015 15:43:02 +0000 (15:43 +0000)]
[PHITransAddr] Don't assume that instruction operands are translatable

We can only PHI translate instructions.  In our attempt to PHI translate
a bitcast, we attempt to translate its operand; however, the operand
might be an argument or a global instead of an instruction.  Benignly
bail out when this happens.

This fixes PR24397.

Differential Revision: http://reviews.llvm.org/D11879

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244418 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[IR] Remove unused declaration
David Majnemer [Sun, 9 Aug 2015 00:32:18 +0000 (00:32 +0000)]
[IR] Remove unused declaration

CatchReturnInst::init is never referenced, remove it.
No functionality change is intended.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244408 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agocmake: Error on invalid CMAKE_BUILD_TYPE
Justin Bogner [Sat, 8 Aug 2015 21:04:45 +0000 (21:04 +0000)]
cmake: Error on invalid CMAKE_BUILD_TYPE

Apparently if you make a typo in the argument to CMAKE_BUILD_TYPE,
cmake silently accepts this but doesn't apply any particular build
type to your build. This means you get a build that doesn't really
make any sense - it's sort of a debug build with asserts disabled.

Error out instead.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244406 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoFix dangling reference in DwarfLinker.cpp. The original code
Yaron Keren [Sat, 8 Aug 2015 21:03:19 +0000 (21:03 +0000)]
Fix dangling reference in DwarfLinker.cpp. The original code

  Seq.emplace_back(Seq.back());

does not work as planned, since Seq.back() may become a dangling reference
when emplace_back is called and possibly reallocates vector. To avoid this,
the vector allocation should be reserved first and only then used.

This broke test/tools/dsymutil/X86/custom-line-table.test with Visual C++ 2013.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244405 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[x86] enable machine combiner reassociations for 128-bit vector single/double adds
Sanjay Patel [Sat, 8 Aug 2015 19:08:20 +0000 (19:08 +0000)]
[x86] enable machine combiner reassociations for 128-bit vector single/double adds

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244403 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoFix some comment typos.
Benjamin Kramer [Sat, 8 Aug 2015 18:27:36 +0000 (18:27 +0000)]
Fix some comment typos.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244402 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[IR] Cleanup some formatting issues in the EH instructions
David Majnemer [Sat, 8 Aug 2015 17:41:21 +0000 (17:41 +0000)]
[IR] Cleanup some formatting issues in the EH instructions

No functionality change is intended.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244399 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoReturn early on error. Should fix the asan bots.
Rafael Espindola [Sat, 8 Aug 2015 14:54:09 +0000 (14:54 +0000)]
Return early on error. Should fix the asan bots.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244397 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[X86] Add ADX and RDSEED to Skylake processor.
Craig Topper [Sat, 8 Aug 2015 07:31:15 +0000 (07:31 +0000)]
[X86] Add ADX and RDSEED to Skylake processor.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244396 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoAdd SlowBTMem to Sandy Bridge and newer Intel CPUs. Reading through Agner Fog's table...
Craig Topper [Sat, 8 Aug 2015 07:20:04 +0000 (07:20 +0000)]
Add SlowBTMem to Sandy Bridge and newer Intel CPUs. Reading through Agner Fog's table suggests there have been no improvements to these processors relative to Westmere for bit test instructions.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244395 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[InstCombine] Don't try to sink EH pad instructions
David Majnemer [Sat, 8 Aug 2015 03:51:49 +0000 (03:51 +0000)]
[InstCombine] Don't try to sink EH pad instructions

Found by inspection, this change should not effect the existing
landingpad behavior.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244391 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago244368: Fix a comment line introduced in r244368. [-Wdocumentation]
NAKAMURA Takumi [Sat, 8 Aug 2015 01:34:20 +0000 (01:34 +0000)]
244368: Fix a comment line introduced in r244368. [-Wdocumentation]

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244388 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[IR] Stop hacking around a bug in GCC 4.5
David Majnemer [Sat, 8 Aug 2015 01:33:30 +0000 (01:33 +0000)]
[IR] Stop hacking around a bug in GCC 4.5

GCC 4.5 miscompiled this aspect of LLVM.  We support a minimum version
of 4.7.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244387 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoAdd model numbers for Skylake CPUs and an additional Broadwell model.
Craig Topper [Sat, 8 Aug 2015 01:29:15 +0000 (01:29 +0000)]
Add model numbers for Skylake CPUs and an additional Broadwell model.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244385 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoAdd Intel family 6 model 93 as Silvermont.
Craig Topper [Sat, 8 Aug 2015 01:16:05 +0000 (01:16 +0000)]
Add Intel family 6 model 93 as Silvermont.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244384 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoAMDGPU/SI: Another attempt to fix Windows bots broken by r244372
Tom Stellard [Sat, 8 Aug 2015 01:11:07 +0000 (01:11 +0000)]
AMDGPU/SI: Another attempt to fix Windows bots broken by r244372

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244383 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoRemove unnecessary includes
Matt Arsenault [Sat, 8 Aug 2015 00:41:53 +0000 (00:41 +0000)]
Remove unnecessary includes

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244382 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoAMDGPU: Implement AMDGPUOperand::print()
Matt Arsenault [Sat, 8 Aug 2015 00:41:51 +0000 (00:41 +0000)]
AMDGPU: Implement AMDGPUOperand::print()

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244381 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoAMDGPU/SI: Remove VCCReg
Matt Arsenault [Sat, 8 Aug 2015 00:41:48 +0000 (00:41 +0000)]
AMDGPU/SI: Remove VCCReg

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244380 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoAMDGPU/SI: Remove source uses of VCCReg
Matt Arsenault [Sat, 8 Aug 2015 00:41:45 +0000 (00:41 +0000)]
AMDGPU/SI: Remove source uses of VCCReg

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244379 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoDelete dead code. NFC.
Rafael Espindola [Sat, 8 Aug 2015 00:25:57 +0000 (00:25 +0000)]
Delete dead code. NFC.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244378 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoAMDGPU/SI: Attempt to fix Windows bots broken by r244372
Tom Stellard [Sat, 8 Aug 2015 00:17:59 +0000 (00:17 +0000)]
AMDGPU/SI: Attempt to fix Windows bots broken by r244372

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244376 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoConvert getSymbolSection to return an ErrorOr.
Rafael Espindola [Fri, 7 Aug 2015 23:27:14 +0000 (23:27 +0000)]
Convert getSymbolSection to return an ErrorOr.

This function can actually fail since the symbol contains an index to the
section and that can be invalid.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244375 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoadd a missing regression test for a DAGCombiner FDIV optimization
Sanjay Patel [Fri, 7 Aug 2015 23:19:41 +0000 (23:19 +0000)]
add a missing regression test for a DAGCombiner FDIV optimization

There's no test for this transform in any backend. Discovered
while debugging fast-math-flag propagation in the DAG (r244053).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244373 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoAMDGPU: Add pass to lower OpenCL image and sampler arguments.
Tom Stellard [Fri, 7 Aug 2015 23:19:30 +0000 (23:19 +0000)]
AMDGPU: Add pass to lower OpenCL image and sampler arguments.

The pass adds new kernel arguments for image attributes, and
resolves calls to dummy attribute and resource id getter functions.

Patch by: Zoltan Gilian

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244372 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[SPARC] Disable unsupported ExecutionEngine tests, and XFAIL a couple
James Y Knight [Fri, 7 Aug 2015 23:01:16 +0000 (23:01 +0000)]
[SPARC] Disable unsupported ExecutionEngine tests, and XFAIL a couple
of DebugInfo tests.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244371 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[LAA] Remove unused pointer partition argument from getNumberOfChecks, NFC
Adam Nemet [Fri, 7 Aug 2015 22:44:21 +0000 (22:44 +0000)]
[LAA] Remove unused pointer partition argument from getNumberOfChecks, NFC

This is unused after filtering checks was moved to the clients.

As a result, we can just return the number of the checks in the
precomputed set.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244369 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[LAA] Make the set of runtime checks part of the state of LAA, NFC
Adam Nemet [Fri, 7 Aug 2015 22:44:15 +0000 (22:44 +0000)]
[LAA] Make the set of runtime checks part of the state of LAA, NFC

This is the full set of checks that clients can further filter. IOW,
it's client-agnostic.  This makes LAA complete in the sense that it now
provides the two main results of its analysis precomputed:

1. memory dependences via getDepChecker().getInsterestingDependences()
2. run-time checks via getRuntimePointerCheck().getChecks()

However, as a consequence we now compute this information pro-actively.
Thus if the client decides to skip the loop based on the dependences
we've computed the checks unnecessarily.  In order to see whether this
was a significant overhead I checked compile time on SPEC2k6 LTO bitcode
files.  The change was in the noise.

The checks are generated in canCheckPtrAtRT, at the same place where we
used to call groupChecks to merge checks.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244368 91177308-0d34-0410-b5e6-96231b3b80d8

8 years ago[AArch64][LoadStoreOptimizer] Turn a test into an assert. NFC.
Quentin Colombet [Fri, 7 Aug 2015 22:40:51 +0000 (22:40 +0000)]
[AArch64][LoadStoreOptimizer] Turn a test into an assert. NFC.

At this point the given Opc must be valid, otherwise we should
not look for a matching pair to form paired load or store.

Thanks to Chad to point out this piece of code!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244366 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoAMDGPU/SI: Use InstAlias instead of MnemonicAlias for VOPC instructions
Tom Stellard [Fri, 7 Aug 2015 22:00:56 +0000 (22:00 +0000)]
AMDGPU/SI: Use InstAlias instead of MnemonicAlias for VOPC instructions

Summary:
With InstAlias, we don't need to print the _e32 portion of the mnemonic
when we print the $dst operand.  This change makes it possible to
include vcc in the asm string when we switch VOPC over to having
implicit vcc defs.

Reviewers: arsenm

Subscribers: llvm-commits

Differential Revision: http://reviews.llvm.org/D11813

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244362 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoredo r244360 (tighten checks...) after specifying triple
Sanjay Patel [Fri, 7 Aug 2015 21:42:24 +0000 (21:42 +0000)]
redo r244360 (tighten checks...) after specifying triple

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244361 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agotighten checks using update_llc_test_checks.py
Sanjay Patel [Fri, 7 Aug 2015 21:38:53 +0000 (21:38 +0000)]
tighten checks using update_llc_test_checks.py

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244360 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoMIR Serialization: Serialize the base alignment for the machine memory operands.
Alex Lorenz [Fri, 7 Aug 2015 20:48:30 +0000 (20:48 +0000)]
MIR Serialization: Serialize the base alignment for the machine memory operands.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244357 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoMIR Serialization: Serialize the offsets for the machine memory operands.
Alex Lorenz [Fri, 7 Aug 2015 20:26:52 +0000 (20:26 +0000)]
MIR Serialization: Serialize the offsets for the machine memory operands.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244356 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoMIR Parser: Extract the parsing of the operand's offset into a new method. NFC.
Alex Lorenz [Fri, 7 Aug 2015 20:21:00 +0000 (20:21 +0000)]
MIR Parser: Extract the parsing of the operand's offset into a new method. NFC.

This commit extract the code that parses the 64-bit offset from the method
'parseOperandsOffset' to a new method 'parseOffset' so that we can reuse it
when parsing the offset for the machine memory operands.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244355 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoAMDGPU: Assume SMRD access for constant address space
Matt Arsenault [Fri, 7 Aug 2015 20:18:34 +0000 (20:18 +0000)]
AMDGPU: Assume SMRD access for constant address space

Since r243294 these are selected to SMRD and
moved later if required.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244354 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoDon't look for a SHT_DYNSYM in the ELFFile's constructor.
Rafael Espindola [Fri, 7 Aug 2015 20:11:08 +0000 (20:11 +0000)]
Don't look for a SHT_DYNSYM in the ELFFile's constructor.

Yet another step in not having it scan every section.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244353 91177308-0d34-0410-b5e6-96231b3b80d8

8 years agoAdd Intel family 6 model 90 as Silvermont. Fixes PR24392.
Craig Topper [Fri, 7 Aug 2015 20:09:42 +0000 (20:09 +0000)]
Add Intel family 6 model 90 as Silvermont. Fixes PR24392.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244352 91177308-0d34-0410-b5e6-96231b3b80d8