OSDN Git Service

android-x86/external-llvm.git
7 years agoandroid: R600(AMDGPU)/AsmParser: fix tblgen related building errors marshmallow-x86 android-x86-6.0-r2 android-x86-6.0-r3
Mauro Rossi [Wed, 4 Jan 2017 17:36:57 +0000 (18:36 +0100)]
android: R600(AMDGPU)/AsmParser: fix tblgen related building errors

Fixes the building errors appeared after restructuring R600(AMDGPU)
static library in device shared libLLVM:

In file included from external/llvm/lib/Target/R600/AsmParser/AMDGPUAsmParser.cpp:10:
external/llvm/lib/Target/R600/AsmParser/../MCTargetDesc/AMDGPUMCTargetDesc.h:55:10: fatal error: 'AMDGPUGenInstrInfo.inc' file not found
         ^

In file included from external/llvm/lib/Target/R600/AsmParser/AMDGPUAsmParser.cpp:10:
external/llvm/lib/Target/R600/AsmParser/../MCTargetDesc/AMDGPUMCTargetDesc.h:52:10: fatal error: 'AMDGPUGenRegisterInfo.inc' file not found
         ^

In file included from external/llvm/lib/Target/R600/AsmParser/AMDGPUAsmParser.cpp:10:
external/llvm/lib/Target/R600/AsmParser/../MCTargetDesc/AMDGPUMCTargetDesc.h:58:10: fatal error: 'AMDGPUGenSubtargetInfo.inc' file not found
         ^

7 years agoandroid: fix R600(AMDGPU) libraries inclusion in device shared libLLVM
Mauro Rossi [Wed, 4 Jan 2017 17:28:06 +0000 (18:28 +0100)]
android: fix R600(AMDGPU) libraries inclusion in device shared libLLVM

Inspired by Chih-Wei Huang patch on LLVM 3.8.0 for nougat-x86,
now applied as a backport to LLVM 3.7.0 of marshmallow-x86.

R600(AMDGPU) static libraries need to be added to x86 and x86_64 targets,
in order to become part of device shared libLLVM.

7 years agoandroid: conditionally add LLVM_TARGET(AMDGPU) in device configs
Mauro Rossi [Thu, 10 Nov 2016 22:27:09 +0000 (23:27 +0100)]
android: conditionally add LLVM_TARGET(AMDGPU) in device configs

Adding LLVM_TARGET(AMDGPU) causes LLVMInitializeAMDPU* prototypes definition,
but this needs to be controlled by defining FORCE_BUILD_AMDGPU,
in order to avoid building errors in clients not having AMDGPU support
like for example md.lc which is broken by LLVM_TARGET(AMDGPU)

Mesa amd/common and gallium radeonsi will require to define FORCE_BUILD_AMDGPU
in Android makefiles in order to materialize LLVMInitializeAMDGPU* prototypes

8 years agoRename LLVMInitializeR600* to LLVMInitializeAMDGPU* android-x86-6.0-r1
Mauro Rossi [Fri, 11 Dec 2015 03:34:08 +0000 (04:34 +0100)]
Rename LLVMInitializeR600* to LLVMInitializeAMDGPU*

These changes enable building current mesa 11.0.x and later,
by exposing llvm:: namespace as espected for 3.7.x,
while still having 3.7.0svn in marshmallow-x86 branch.

These changes will enable building radeonsi with llvm 3.7,
with few changes in mesa android makefiles,
to support new elfutils path and MESA_LLVM_VERSION,
but without any changes in the c/cpp sources.

8 years agoandroid: enable support for R600 targets for radeonsi
Mauro Rossi [Sat, 12 Dec 2015 22:11:42 +0000 (23:11 +0100)]
android: enable support for R600 targets for radeonsi

Inspired by former psglia work on LLVM 3.5.x, now applied to 3.7.0

Gallium radeonsi driver requires LLVM.
Some required features(like compiling the R600 Taget itself) are not enabled.

These changes enable R600 targets and fix a problem with "intrinsic",
due to a typo in tablegen command option.

8 years agoRemove ENABLE_TIMESTAMPS to ensure reproducible builds.
Stephen Hines [Thu, 24 Sep 2015 20:28:21 +0000 (13:28 -0700)]
Remove ENABLE_TIMESTAMPS to ensure reproducible builds.

Bug: 24349363

The use of __DATE__ makes this build hard to reproduce/diff.

Change-Id: I7d2b05bef53eac7084918f0781107bb920285bdf
(cherry picked from commit 3c19f5eec3bfcd1fcfda72cd02585569b42507a3)

8 years agoUpdate llvm device version number to 3.6.
Stephen Hines [Thu, 21 May 2015 16:28:54 +0000 (09:28 -0700)]
Update llvm device version number to 3.6.

Bug: 20894851
Change-Id: Ic6deb626e2bad98d7420046e47b92556868dfe05
(cherry picked from commit e1977d0f8ca591f43fc0d3cba7e6a2b5ca7e22ff)

8 years agoFix Android.mk files for plugins on darwin.
Stephen Hines [Thu, 14 May 2015 18:11:09 +0000 (11:11 -0700)]
Fix Android.mk files for plugins on darwin.

Darwin uses a few different flags for this than Linux, and we missed this
when we updated the test builds recently.

Change-Id: I8a0e8bc18ef698a0ed933f96b2bce0653f4307e5
(cherry picked from commit 651de8d5ac0b28b10ad0259efc75cf6152dc13dc)

8 years agoUpdate aosp/master LLVM with patches for fp16
Pirama Arumuga Nainar [Wed, 20 May 2015 19:55:36 +0000 (12:55 -0700)]
Update aosp/master LLVM with patches for fp16

Cherry-pick LLVM revisions r235191, r235215, r235220, r235341, r235363,
r235530, r235609, r235610, r237004

r235191 has a required bug-fix and the rest are all related to fp16.

Change-Id: I7fe8da5ffd8f2c06150885a54769abd18c3a04c6
(cherry picked from commit a18e6af1712fd41c4a705a19ad71f6e9ac7a4e68)

8 years agoUpdate aosp/master LLVM for rebase to r235153
Pirama Arumuga Nainar [Wed, 6 May 2015 18:46:36 +0000 (11:46 -0700)]
Update aosp/master LLVM for rebase to r235153

Change-Id: I9bf53792f9fc30570e81a8d80d296c681d005ea7
(cherry picked from commit 0c7f116bb6950ef819323d855415b2f2b0aad987)

8 years agoExport all dynamic symbols for opt and bugpoint
Pirama Arumuga Nainar [Thu, 23 Apr 2015 18:06:58 +0000 (11:06 -0700)]
Export all dynamic symbols for opt and bugpoint

bug 15433215

Command line options from an LLVM module are registered and stored in a
static global object in libLLVMSupport.  Linking the Hello module with
its own copy of libLLVMSupport meant this module's option was not
registered correctly.  This patch updates Hello's build rules to not
link with libLLVMSupport and libLLVMCore.

Given the above change, the Hello module still needs to find LLVM
symbols that it used to pull directly.  The second half of this patch
adds linker flag --export-dynamic to tools/opt and tools/bugpoint so
loaded modules can find LLVM symbols.

Other  notes:
- The linker flag is not added to the device build of opt.  No one
  should be running opt on the device, AFAIK.
- Other tools that load modules, such as llc, lli and even clang, would
  need this linker flag if they were to load modules correctly.  Now
  that we know how to fix the incorrect module loads, they can be fixed
  if the need arises.
- Remove a duplicate from opt's llvm_opt_STATIC_LIBRARIES.

All supported tests pass!

Cherry pick of https://android-review.googlesource.com/#/c/148017/ from
AOSP

Change-Id: Ib76507ccfeae37a368718c5a1fb69da337f4f964

8 years agoAdd makefile for tools/bugpoint-passes
Pirama Arumuga Nainar [Thu, 23 Apr 2015 18:06:25 +0000 (11:06 -0700)]
Add makefile for tools/bugpoint-passes

bug 15433215

Build BugpointPasses module for the host.  It is loaded by some bugpoint
tests.

Cherry pick https://android-review.googlesource.com/#/c/148016/ from
AOSP

Change-Id: I1c0450a63d5eb25cb9da9f07baaaceefd454def5

8 years agoam 7b4cd9c6: Merge "Fix mips vs. mips64 build issues."
Stephen Hines [Sat, 25 Apr 2015 03:58:57 +0000 (03:58 +0000)]
am 7b4cd9c6: Merge "Fix mips vs. mips64 build issues."

* commit '7b4cd9c62b527e0759ab76e4938a98415d5bc1ce':
  Fix mips vs. mips64 build issues.

8 years agoMerge "Fix mips vs. mips64 build issues."
Stephen Hines [Sat, 25 Apr 2015 03:17:35 +0000 (03:17 +0000)]
Merge "Fix mips vs. mips64 build issues."

8 years agoFix mips vs. mips64 build issues.
Stephen Hines [Sat, 25 Apr 2015 02:16:52 +0000 (19:16 -0700)]
Fix mips vs. mips64 build issues.

Change-Id: I55b16d8c0e597079c036ceeefd8c04bfb394367b

9 years agoam 53b3699b: Merge "Remove any stale BuildVariables.inc files in the source tree."
Stephen Hines [Thu, 16 Apr 2015 01:00:06 +0000 (01:00 +0000)]
am 53b3699b: Merge "Remove any stale BuildVariables.inc files in the source tree."

* commit '53b3699b0d46b0bb7c8bf5e4a481b91f5e7aae87':
  Remove any stale BuildVariables.inc files in the source tree.

9 years agoMerge "Remove any stale BuildVariables.inc files in the source tree."
Stephen Hines [Thu, 16 Apr 2015 00:25:28 +0000 (00:25 +0000)]
Merge "Remove any stale BuildVariables.inc files in the source tree."

9 years agoRemove any stale BuildVariables.inc files in the source tree.
Stephen Hines [Thu, 16 Apr 2015 00:21:28 +0000 (17:21 -0700)]
Remove any stale BuildVariables.inc files in the source tree.

We previously had a bug that generated this file in the source tree instead
of in the actual build output directory.

Change-Id: Ie942750f91b37327c4f9cc8d83e0040b6e06ce2a

9 years agoam 3d7a0abc: Merge "Remove duplicate."
Ying Wang [Mon, 13 Apr 2015 23:58:40 +0000 (23:58 +0000)]
am 3d7a0abc: Merge "Remove duplicate."

* commit '3d7a0abcefb3c5bc742fb522eb1f5f06e85d7d55':
  Remove duplicate.

9 years agoMerge "Remove duplicate."
Ying Wang [Mon, 13 Apr 2015 23:02:18 +0000 (23:02 +0000)]
Merge "Remove duplicate."

9 years agoRemove duplicate.
Ying Wang [Mon, 13 Apr 2015 22:38:57 +0000 (15:38 -0700)]
Remove duplicate.

This fixes build warnings:
build/core/binary.mk:494: target
`out/host/linux-x86/obj/STATIC_LIBRARIES/libLLVMARMCodeGen_intermediates/ARMGenCodeEmitter.inc'
given more than once in the same rule.
build/core/binary.mk:494: target
`out/target/product/shamu/obj/STATIC_LIBRARIES/libLLVMARMCodeGen_intermediates/ARMGenCodeEmitter.inc'
given more than once in the same rule.

Change-Id: I4691fe616c1e13a4cc18ceaf3b64a3f2b9a5cd87

9 years agoam 31195f0b: Merge "Update aosp/master llvm for rebase to r233350"
Pirama Arumuga Nainar [Fri, 10 Apr 2015 22:08:18 +0000 (22:08 +0000)]
am 31195f0b: Merge "Update aosp/master llvm for rebase to r233350"

* commit '31195f0bdca6ee2a5e72d07edf13e1d81206d949':
  Update aosp/master llvm for rebase to r233350

9 years agoMerge "Update aosp/master llvm for rebase to r233350"
Pirama Arumuga Nainar [Fri, 10 Apr 2015 21:22:52 +0000 (21:22 +0000)]
Merge "Update aosp/master llvm for rebase to r233350"

9 years agoUpdate aosp/master llvm for rebase to r233350
Pirama Arumuga Nainar [Wed, 8 Apr 2015 15:55:49 +0000 (08:55 -0700)]
Update aosp/master llvm for rebase to r233350

Change-Id: I07d935f8793ee8ec6b7da003f6483046594bca49

9 years agoam c75239e6: Merge "Take HOST_PREFER_32_BIT into account"
Colin Cross [Thu, 9 Apr 2015 01:15:16 +0000 (01:15 +0000)]
am c75239e6: Merge "Take HOST_PREFER_32_BIT into account"

* commit 'c75239e6119d0f9a74c57099d91cbc9bde56bf33':
  Take HOST_PREFER_32_BIT into account

9 years agoam 55a4283a: Merge "Set LOCAL_MULTLIB := first for all LLVM host builds"
Colin Cross [Wed, 8 Apr 2015 22:12:29 +0000 (22:12 +0000)]
am 55a4283a: Merge "Set LOCAL_MULTLIB := first for all LLVM host builds"

* commit '55a4283a8567819d70c7e196f68dff5ae12fdc8f':
  Set LOCAL_MULTLIB := first for all LLVM host builds

9 years agoMerge "Take HOST_PREFER_32_BIT into account"
Colin Cross [Wed, 8 Apr 2015 22:04:47 +0000 (22:04 +0000)]
Merge "Take HOST_PREFER_32_BIT into account"

9 years agoTake HOST_PREFER_32_BIT into account
Colin Cross [Wed, 8 Apr 2015 21:50:08 +0000 (14:50 -0700)]
Take HOST_PREFER_32_BIT into account

LLVM modules should compile for 64-bit for the host, except when
HOST_PREFER_32_BIT is set.

Change-Id: I8179df10b929ce1cc655e097814fa50ca0c3c43e

9 years agoMerge "Set LOCAL_MULTLIB := first for all LLVM host builds"
Colin Cross [Wed, 8 Apr 2015 18:09:14 +0000 (18:09 +0000)]
Merge "Set LOCAL_MULTLIB := first for all LLVM host builds"

9 years agoSet LOCAL_MULTLIB := first for all LLVM host builds
Colin Cross [Tue, 7 Apr 2015 22:05:50 +0000 (15:05 -0700)]
Set LOCAL_MULTLIB := first for all LLVM host builds

The default multlib setting for host libraries is going to change from
"both" to "first".  This breaks LLVM host compiles on 64-bit when
FORCE_BUILD_LLVM_COMPONENTS, because LLVMHello tries to compile for
both 64-bit and 32-bit, the 32-bit version tries to link against
32-bit libLLVM, but prebuilts/sdk/tools/* only provides a 64-bit
version of libLLVM.so.

When compiling for a 32-bit host we always set
FORCE_BUILD_LLVM_COMPONENTS=true, so the easy fix is to force 64-bit
host builds to only build LLVM components for 64-bit by setting
LOCAL_MULTILIB := first in llvm-host-build.mk.

Change-Id: Ia17c045649b59b90bdc06d4cbe03f2542bf42371

9 years agoam 6f4fa452: Merge "Update lit.site.cfg to be able to run LLVM tests properly again."
Stephen Hines [Fri, 3 Apr 2015 14:52:21 +0000 (14:52 +0000)]
am 6f4fa452: Merge "Update lit.site.cfg to be able to run LLVM tests properly again."

* commit '6f4fa452db89a32b9dfc8ed8ab61834dcdca07ad':
  Update lit.site.cfg to be able to run LLVM tests properly again.

9 years agoMerge "Update lit.site.cfg to be able to run LLVM tests properly again."
Stephen Hines [Thu, 2 Apr 2015 23:27:30 +0000 (23:27 +0000)]
Merge "Update lit.site.cfg to be able to run LLVM tests properly again."

9 years agoUpdate lit.site.cfg to be able to run LLVM tests properly again.
Stephen Hines [Thu, 2 Apr 2015 02:21:59 +0000 (19:21 -0700)]
Update lit.site.cfg to be able to run LLVM tests properly again.

Bug: 15433215

Add support for building llvm-dsymutil.
Add support for building llvm-pdbdump.

We still have 4 unexpected failures to track down with the Android build/run
of these tests. These are all related to module loading support.

Change-Id: Ibd39cbd2c0ee232a0df23a414d491420493ea94a

9 years agoam 3fa16bd6: Merge "Update aosp/master LLVM for rebase to r230699."
Stephen Hines [Wed, 1 Apr 2015 22:08:43 +0000 (22:08 +0000)]
am 3fa16bd6: Merge "Update aosp/master LLVM for rebase to r230699."

* commit '3fa16bd6062e23bcdb82ed4dd965674792e6b761':
  Update aosp/master LLVM for rebase to r230699.

9 years agoMerge "Update aosp/master LLVM for rebase to r230699."
Stephen Hines [Wed, 1 Apr 2015 18:49:24 +0000 (18:49 +0000)]
Merge "Update aosp/master LLVM for rebase to r230699."

9 years agoam beed4739: Merge "Remove uses of libcxx.mk."
Dan Albert [Fri, 27 Mar 2015 23:21:58 +0000 (23:21 +0000)]
am beed4739: Merge "Remove uses of libcxx.mk."

* commit 'beed47390a60f6f0c77532b3d3f76bb47ef49423':
  Remove uses of libcxx.mk.

9 years agoMerge "Remove uses of libcxx.mk."
Dan Albert [Fri, 27 Mar 2015 20:27:12 +0000 (20:27 +0000)]
Merge "Remove uses of libcxx.mk."

9 years agoRemove uses of libcxx.mk.
Dan Albert [Fri, 27 Mar 2015 18:18:35 +0000 (11:18 -0700)]
Remove uses of libcxx.mk.

This is a no-op.

Change-Id: I5dc6a2a5a0e0f7e34a0ae26566798daa085ce8f2

9 years agoUpdate aosp/master LLVM for rebase to r230699.
Stephen Hines [Mon, 23 Mar 2015 19:10:34 +0000 (12:10 -0700)]
Update aosp/master LLVM for rebase to r230699.

Change-Id: I2b5be30509658cb8266be782de0ab24f9099f9b9

9 years agoam b7d2e72b: Merge "Add NOTICE file"
Conley Owens [Wed, 18 Mar 2015 23:49:16 +0000 (23:49 +0000)]
am b7d2e72b: Merge "Add NOTICE file"

* commit 'b7d2e72b02a4cb8034f32f8247a2558d2434e121':
  Add NOTICE file

9 years agoMerge "Add NOTICE file"
Conley Owens [Wed, 18 Mar 2015 20:48:32 +0000 (20:48 +0000)]
Merge "Add NOTICE file"

9 years agoAdd NOTICE file
Conley Owens [Fri, 13 Mar 2015 00:36:30 +0000 (17:36 -0700)]
Add NOTICE file

Change-Id: I4794bc70b088df4bb417e2fd980e363b2becb52b

9 years agoam 09b23d75: am 22cea81c: Merge "Revert "Add -fno-inline to LLVM device flags.""
Stephen Hines [Thu, 29 Jan 2015 22:00:03 +0000 (22:00 +0000)]
am 09b23d75: am 22cea81c: Merge "Revert "Add -fno-inline to LLVM device flags.""

* commit '09b23d7595837e1f88872f6f0a60dca827b52e3f':
  Revert "Add -fno-inline to LLVM device flags."

9 years agoam 4e18f8fb: am e5656de2: Merge "MISched: Fix moving stores across barriers"
Stephen Hines [Thu, 29 Jan 2015 22:00:02 +0000 (22:00 +0000)]
am 4e18f8fb: am e5656de2: Merge "MISched: Fix moving stores across barriers"

* commit '4e18f8fb700656330c307f80a826823271182b01':
  MISched: Fix moving stores across barriers

9 years agoam 22cea81c: Merge "Revert "Add -fno-inline to LLVM device flags.""
Stephen Hines [Thu, 29 Jan 2015 21:54:52 +0000 (21:54 +0000)]
am 22cea81c: Merge "Revert "Add -fno-inline to LLVM device flags.""

* commit '22cea81c7ab789adf765705c89bc49cdba1a4fe6':
  Revert "Add -fno-inline to LLVM device flags."

9 years agoam e5656de2: Merge "MISched: Fix moving stores across barriers"
Stephen Hines [Thu, 29 Jan 2015 21:54:51 +0000 (21:54 +0000)]
am e5656de2: Merge "MISched: Fix moving stores across barriers"

* commit 'e5656de27822209f895cc8d3524f74c6f9f9afcb':
  MISched: Fix moving stores across barriers

9 years agoMerge "Revert "Add -fno-inline to LLVM device flags.""
Stephen Hines [Thu, 29 Jan 2015 21:43:29 +0000 (21:43 +0000)]
Merge "Revert "Add -fno-inline to LLVM device flags.""

9 years agoMerge "MISched: Fix moving stores across barriers"
Stephen Hines [Thu, 29 Jan 2015 21:43:23 +0000 (21:43 +0000)]
Merge "MISched: Fix moving stores across barriers"

9 years agoRevert "Add -fno-inline to LLVM device flags."
Stephen Hines [Wed, 21 Jan 2015 09:07:25 +0000 (01:07 -0800)]
Revert "Add -fno-inline to LLVM device flags."

This reverts commit 666dcadba6e445a06085ee785721bab99a01a226.

Bug: 18808781

Change-Id: I222968a99bdafe2368c97d1602081bbcdff70ed0

9 years agoMISched: Fix moving stores across barriers
Tom Stellard [Mon, 8 Dec 2014 23:36:48 +0000 (23:36 +0000)]
MISched: Fix moving stores across barriers

This fixes an issue with ScheduleDAGInstrs::buildSchedGraph
where stores without an underlying object would not be added
as a predecessor to the current BarrierChain.

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

9 years agoam 1d70b3af: am 5a622b72: Merge "Pass LSAN_OPTIONS down so that it is possible to...
Dan Albert [Fri, 9 Jan 2015 02:03:17 +0000 (02:03 +0000)]
am 1d70b3af: am 5a622b72: Merge "Pass LSAN_OPTIONS down so that it is possible to add suppressions."

* commit '1d70b3af1c1b8f321eba07127518a71878bce7a9':
  Pass LSAN_OPTIONS down so that it is possible to add suppressions.

9 years agoam 72714e0f: am 51f06ecc: Merge "Split executeShTest into two parts so that it can...
Dan Albert [Fri, 9 Jan 2015 02:03:15 +0000 (02:03 +0000)]
am 72714e0f: am 51f06ecc: Merge "Split executeShTest into two parts so that it can be better leveraged by libc++"

* commit '72714e0f8a3c209461d46551ebcf111e3f35ba32':
  Split executeShTest into two parts so that it can be better leveraged by libc++

9 years agoam 9cf8d9ca: am f41cd32a: Merge "[LIT] Add JSONMetricValue type to wrap types support...
Dan Albert [Fri, 9 Jan 2015 02:03:14 +0000 (02:03 +0000)]
am 9cf8d9ca: am f41cd32a: Merge "[LIT] Add JSONMetricValue type to wrap types supported by the json encoder."

* commit '9cf8d9ca5aef24403867b7154f369cc831739178':
  [LIT] Add JSONMetricValue type to wrap types supported by the json encoder.

9 years agoam d5a8f8a9: am d74cfd3c: Merge "Now that we require a newer python, use the new...
Dan Albert [Fri, 9 Jan 2015 02:03:13 +0000 (02:03 +0000)]
am d5a8f8a9: am d74cfd3c: Merge "Now that we require a newer python, use the new exception syntax."

* commit 'd5a8f8a93ed662d830cd4cc57ef14d05838f6897':
  Now that we require a newer python, use the new exception syntax.

9 years agoam b78e4661: am f13bcf2b: Merge "Require python 2.7."
Dan Albert [Fri, 9 Jan 2015 02:03:12 +0000 (02:03 +0000)]
am b78e4661: am f13bcf2b: Merge "Require python 2.7."

* commit 'b78e4661de92772bbe09e1f4bd8da54ee41f64e8':
  Require python 2.7.

9 years agoam ce4c5fc5: am 51e2fa82: Merge "[LIT] Add support for `UNSUPPORTED` tag to `TestRunn...
Dan Albert [Fri, 9 Jan 2015 02:03:11 +0000 (02:03 +0000)]
am ce4c5fc5: am 51e2fa82: Merge "[LIT] Add support for `UNSUPPORTED` tag to `TestRunner.parseIntegratedTestScript`"

* commit 'ce4c5fc5adebc9960edec1d2161e23d06b2d8107':
  [LIT] Add support for `UNSUPPORTED` tag to `TestRunner.parseIntegratedTestScript`

9 years agoam 4a6ac124: am 70fd1f24: Merge "lit: Don\'t use python 2.6 features"
Dan Albert [Fri, 9 Jan 2015 02:03:10 +0000 (02:03 +0000)]
am 4a6ac124: am 70fd1f24: Merge "lit: Don\'t use python 2.6 features"

* commit '4a6ac12444cc5c7b0a8fe1c2909fb78002cea488':
  lit: Don't use python 2.6 features

9 years agoam 9bfc923a: am a3c7e9e1: Merge "Fix for xunit output to work around issue in Jenkins...
Dan Albert [Fri, 9 Jan 2015 02:03:09 +0000 (02:03 +0000)]
am 9bfc923a: am a3c7e9e1: Merge "Fix for xunit output to work around issue in Jenkins when tests are at the root level"

* commit '9bfc923ac66dfb3bb0a6725426e6616c032f9fbb':
  Fix for xunit output to work around issue in Jenkins when tests are at the root level

9 years agoam bb284ab8: am 04092cf9: Merge "Fix corner cases in lit xunit for paths with dots"
Dan Albert [Fri, 9 Jan 2015 02:03:07 +0000 (02:03 +0000)]
am bb284ab8: am 04092cf9: Merge "Fix corner cases in lit xunit for paths with dots"

* commit 'bb284ab8237de04beef0c9a7ae0fce37be62fc5a':
  Fix corner cases in lit xunit for paths with dots

9 years agoam 198dd1c6: am 2ee64e38: Merge "Add a test-case for lit xunit output"
Dan Albert [Fri, 9 Jan 2015 02:03:06 +0000 (02:03 +0000)]
am 198dd1c6: am 2ee64e38: Merge "Add a test-case for lit xunit output"

* commit '198dd1c6891109876976549d55d6c74cd4a82f47':
  Add a test-case for lit xunit output

9 years agoam d8993195: am 51670790: Merge "Don\'t allow test-suite names with . in them in...
Dan Albert [Fri, 9 Jan 2015 02:03:05 +0000 (02:03 +0000)]
am d8993195: am 51670790: Merge "Don\'t allow test-suite names with . in them in xml output"

* commit 'd89931958aead6c2ef893d994db57042e870c780':
  Don't allow test-suite names with . in them in xml output

9 years agoam 23910ec0: am 2ce42da6: Merge "Give lit a --xunit-xml-output option for saving...
Dan Albert [Fri, 9 Jan 2015 02:03:04 +0000 (02:03 +0000)]
am 23910ec0: am 2ce42da6: Merge "Give lit a --xunit-xml-output option for saving results in xunit format"

* commit '23910ec0b0880243bf3733504c8308b304a2bdd3':
  Give lit a --xunit-xml-output option for saving results in xunit format

9 years agoam 5a622b72: Merge "Pass LSAN_OPTIONS down so that it is possible to add suppressions."
Dan Albert [Fri, 9 Jan 2015 01:56:39 +0000 (01:56 +0000)]
am 5a622b72: Merge "Pass LSAN_OPTIONS down so that it is possible to add suppressions."

* commit '5a622b72ff719e56da5e4384343c08305152e83e':
  Pass LSAN_OPTIONS down so that it is possible to add suppressions.

9 years agoam 51f06ecc: Merge "Split executeShTest into two parts so that it can be better lever...
Dan Albert [Fri, 9 Jan 2015 01:56:38 +0000 (01:56 +0000)]
am 51f06ecc: Merge "Split executeShTest into two parts so that it can be better leveraged by libc++"

* commit '51f06ecc5d0f71448146f98905b1796ae88d28da':
  Split executeShTest into two parts so that it can be better leveraged by libc++

9 years agoam f41cd32a: Merge "[LIT] Add JSONMetricValue type to wrap types supported by the...
Dan Albert [Fri, 9 Jan 2015 01:56:37 +0000 (01:56 +0000)]
am f41cd32a: Merge "[LIT] Add JSONMetricValue type to wrap types supported by the json encoder."

* commit 'f41cd32af0994358ae9f3acca23c0354de5b3f0d':
  [LIT] Add JSONMetricValue type to wrap types supported by the json encoder.

9 years agoam d74cfd3c: Merge "Now that we require a newer python, use the new exception syntax."
Dan Albert [Fri, 9 Jan 2015 01:56:36 +0000 (01:56 +0000)]
am d74cfd3c: Merge "Now that we require a newer python, use the new exception syntax."

* commit 'd74cfd3c1f507ab51b576e0d2ce80dc8906c2e8e':
  Now that we require a newer python, use the new exception syntax.

9 years agoam f13bcf2b: Merge "Require python 2.7."
Dan Albert [Fri, 9 Jan 2015 01:56:35 +0000 (01:56 +0000)]
am f13bcf2b: Merge "Require python 2.7."

* commit 'f13bcf2b4eeafa087bd649070bd8ed0ded10eb2b':
  Require python 2.7.

9 years agoam 51e2fa82: Merge "[LIT] Add support for `UNSUPPORTED` tag to `TestRunner.parseInteg...
Dan Albert [Fri, 9 Jan 2015 01:56:34 +0000 (01:56 +0000)]
am 51e2fa82: Merge "[LIT] Add support for `UNSUPPORTED` tag to `TestRunner.parseIntegratedTestScript`"

* commit '51e2fa825ba84f67cebe4c3d1c93bd2f94fb1318':
  [LIT] Add support for `UNSUPPORTED` tag to `TestRunner.parseIntegratedTestScript`

9 years agoam 70fd1f24: Merge "lit: Don\'t use python 2.6 features"
Dan Albert [Fri, 9 Jan 2015 01:56:33 +0000 (01:56 +0000)]
am 70fd1f24: Merge "lit: Don\'t use python 2.6 features"

* commit '70fd1f24656a2a0f9ea114b4a780fe5d381de68d':
  lit: Don't use python 2.6 features

9 years agoam a3c7e9e1: Merge "Fix for xunit output to work around issue in Jenkins when tests...
Dan Albert [Fri, 9 Jan 2015 01:56:32 +0000 (01:56 +0000)]
am a3c7e9e1: Merge "Fix for xunit output to work around issue in Jenkins when tests are at the root level"

* commit 'a3c7e9e11ece48c38dec9d9c645c24c608e62494':
  Fix for xunit output to work around issue in Jenkins when tests are at the root level

9 years agoam 04092cf9: Merge "Fix corner cases in lit xunit for paths with dots"
Dan Albert [Fri, 9 Jan 2015 01:56:30 +0000 (01:56 +0000)]
am 04092cf9: Merge "Fix corner cases in lit xunit for paths with dots"

* commit '04092cf98d875585f3b6ece0b7e71f2b3a2d3b97':
  Fix corner cases in lit xunit for paths with dots

9 years agoam 2ee64e38: Merge "Add a test-case for lit xunit output"
Dan Albert [Fri, 9 Jan 2015 01:56:29 +0000 (01:56 +0000)]
am 2ee64e38: Merge "Add a test-case for lit xunit output"

* commit '2ee64e38ab63e8d94fcdbceba954b35c605bd83e':
  Add a test-case for lit xunit output

9 years agoam 51670790: Merge "Don\'t allow test-suite names with . in them in xml output"
Dan Albert [Fri, 9 Jan 2015 01:56:28 +0000 (01:56 +0000)]
am 51670790: Merge "Don\'t allow test-suite names with . in them in xml output"

* commit '51670790ca5704c9dad0ff202ce905b0fea97f47':
  Don't allow test-suite names with . in them in xml output

9 years agoam 2ce42da6: Merge "Give lit a --xunit-xml-output option for saving results in xunit...
Dan Albert [Fri, 9 Jan 2015 01:56:27 +0000 (01:56 +0000)]
am 2ce42da6: Merge "Give lit a --xunit-xml-output option for saving results in xunit format"

* commit '2ce42da685202318fca422680d51ed2f7f5f41a1':
  Give lit a --xunit-xml-output option for saving results in xunit format

9 years agoMerge "Pass LSAN_OPTIONS down so that it is possible to add suppressions."
Dan Albert [Thu, 8 Jan 2015 23:39:03 +0000 (23:39 +0000)]
Merge "Pass LSAN_OPTIONS down so that it is possible to add suppressions."

9 years agoMerge "Split executeShTest into two parts so that it can be better leveraged by libc++"
Dan Albert [Thu, 8 Jan 2015 23:38:59 +0000 (23:38 +0000)]
Merge "Split executeShTest into two parts so that it can be better leveraged by libc++"

9 years agoMerge "[LIT] Add JSONMetricValue type to wrap types supported by the json encoder."
Dan Albert [Thu, 8 Jan 2015 23:38:55 +0000 (23:38 +0000)]
Merge "[LIT] Add JSONMetricValue type to wrap types supported by the json encoder."

9 years agoMerge "Now that we require a newer python, use the new exception syntax."
Dan Albert [Thu, 8 Jan 2015 23:38:51 +0000 (23:38 +0000)]
Merge "Now that we require a newer python, use the new exception syntax."

9 years agoMerge "Require python 2.7."
Dan Albert [Thu, 8 Jan 2015 23:38:47 +0000 (23:38 +0000)]
Merge "Require python 2.7."

9 years agoMerge "[LIT] Add support for `UNSUPPORTED` tag to `TestRunner.parseIntegratedTestScript`"
Dan Albert [Thu, 8 Jan 2015 23:38:42 +0000 (23:38 +0000)]
Merge "[LIT] Add support for `UNSUPPORTED` tag to `TestRunner.parseIntegratedTestScript`"

9 years agoMerge "lit: Don't use python 2.6 features"
Dan Albert [Thu, 8 Jan 2015 23:38:38 +0000 (23:38 +0000)]
Merge "lit: Don't use python 2.6 features"

9 years agoMerge "Fix for xunit output to work around issue in Jenkins when tests are at the...
Dan Albert [Thu, 8 Jan 2015 23:38:33 +0000 (23:38 +0000)]
Merge "Fix for xunit output to work around issue in Jenkins when tests are at the root level"

9 years agoMerge "Fix corner cases in lit xunit for paths with dots"
Dan Albert [Thu, 8 Jan 2015 23:38:28 +0000 (23:38 +0000)]
Merge "Fix corner cases in lit xunit for paths with dots"

9 years agoMerge "Add a test-case for lit xunit output"
Dan Albert [Thu, 8 Jan 2015 23:38:24 +0000 (23:38 +0000)]
Merge "Add a test-case for lit xunit output"

9 years agoMerge "Don't allow test-suite names with . in them in xml output"
Dan Albert [Thu, 8 Jan 2015 23:38:20 +0000 (23:38 +0000)]
Merge "Don't allow test-suite names with . in them in xml output"

9 years agoMerge "Give lit a --xunit-xml-output option for saving results in xunit format"
Dan Albert [Thu, 8 Jan 2015 23:38:16 +0000 (23:38 +0000)]
Merge "Give lit a --xunit-xml-output option for saving results in xunit format"

9 years agoPass LSAN_OPTIONS down so that it is possible to add suppressions.
Rafael Espindola [Tue, 23 Dec 2014 18:39:02 +0000 (18:39 +0000)]
Pass LSAN_OPTIONS down so that it is possible to add suppressions.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224777 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit 50c8c5686ec5fbae19d8ec72d46b228feb960862)

9 years agoSplit executeShTest into two parts so that it can be better leveraged by libc++
Eric Fiselier [Sat, 20 Dec 2014 03:23:53 +0000 (03:23 +0000)]
Split executeShTest into two parts so that it can be better leveraged by libc++

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224672 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit 2bea59bd02fe2a448314dfba205cd748a66ac6b9)

9 years ago[LIT] Add JSONMetricValue type to wrap types supported by the json encoder.
Eric Fiselier [Fri, 19 Dec 2014 22:29:12 +0000 (22:29 +0000)]
[LIT] Add JSONMetricValue type to wrap types supported by the json encoder.

Summary:
The following types can be encoded and decoded by the json library:
`dict`, `list`, `tuple`, `str`, `unicode`, `int`, `long`, `float`, `bool`, `NoneType`.

`JSONMetricValue` can be constructed with any of these types, and used as part of Test.Result.
This patch also adds a toMetricValue function that converts a value into a MetricValue.

Reviewers: ddunbar, EricWF

Reviewed By: EricWF

Subscribers: cfe-commits, llvm-commits

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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224628 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit 74430387cd6b1d0e3f89b604f747fa53fc3315b3)

9 years agoNow that we require a newer python, use the new exception syntax.
Rafael Espindola [Fri, 12 Dec 2014 15:32:23 +0000 (15:32 +0000)]
Now that we require a newer python, use the new exception syntax.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224130 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit fe6c7ee0f0e11a368d8c98db7e75d26c1c2b32e6)

9 years agoRequire python 2.7.
Rafael Espindola [Fri, 12 Dec 2014 15:29:31 +0000 (15:29 +0000)]
Require python 2.7.

We were already requiring 2.5, which meant that people on old linux distros
had to upgrade anyway.

Requiring python 2.6 will make supporting 3.X easier as we can use the 3.X
exception syntax.

According to the discussion on llvmdev, there is not much value is requiring
just 2.6, we may as well just require 2.7.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224129 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit 708bc15ff07dc2fcee3a66988bfc5bc15b80eb5f)

9 years ago[LIT] Add support for `UNSUPPORTED` tag to `TestRunner.parseIntegratedTestScript`
Eric Fiselier [Wed, 10 Dec 2014 03:42:09 +0000 (03:42 +0000)]
[LIT] Add support for `UNSUPPORTED` tag to `TestRunner.parseIntegratedTestScript`

Summary:
This patch gives me just enough to leverage the existing functionality in `TestRunner` for use in `libc++` and `libc++abi` .

It does the following:
* Adds the `UNSUPPORTED` tag to `TestRunner.parseIntegratedTestScript`.
* Allows `parseIntegratedTestScript` to return an empty script if a script is not required by the caller.

Reviewers: ddunbar, EricWF

Reviewed By: EricWF

Subscribers: cfe-commits, llvm-commits

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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223915 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit bd112609813171fad2eeb4ad5f7a9cd95fc78b2e)

9 years agolit: Don't use python 2.6 features
David Majnemer [Mon, 8 Dec 2014 08:33:30 +0000 (08:33 +0000)]
lit: Don't use python 2.6 features

LLVM supports python 2.5, this fixes a (somewhat) recent regression.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223626 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit 726bd4160263609011b3a8168bde045203fd021b)

9 years agoFix for xunit output to work around issue in Jenkins when tests are at the root level
Chris Matthews [Sat, 6 Dec 2014 01:13:49 +0000 (01:13 +0000)]
Fix for xunit output to work around issue in Jenkins when tests are at the root level

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223562 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit ab1837aef3d93a0bf2294aeaeb488c62e3d45535)

9 years agoFix corner cases in lit xunit for paths with dots
Chris Matthews [Sat, 6 Dec 2014 00:21:08 +0000 (00:21 +0000)]
Fix corner cases in lit xunit for paths with dots

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223549 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit 689f10d1b56f68fafd999debc86e0b58d2d5de80)

9 years agoAdd a test-case for lit xunit output
Chris Matthews [Wed, 3 Dec 2014 23:01:35 +0000 (23:01 +0000)]
Add a test-case for lit xunit output

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223307 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit 0baca9564c9df7b06645f71abdda0fe3090f46a6)

9 years agoDon't allow test-suite names with . in them in xml output
Chris Matthews [Wed, 3 Dec 2014 22:59:15 +0000 (22:59 +0000)]
Don't allow test-suite names with . in them in xml output

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223305 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit 06a1a5f256cabe6d20cf745cd93b389815c988a9)

9 years agoGive lit a --xunit-xml-output option for saving results in xunit format
Chris Matthews [Tue, 2 Dec 2014 22:19:21 +0000 (22:19 +0000)]
Give lit a --xunit-xml-output option for saving results in xunit format

  --xunit-xml-output saves test results to disk in JUnit's xml format. This will allow Jenkins to report the details of a lit run.

  Based on a patch by David Chisnall.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223163 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit dcedd15f58e7b76c2ee61c8030799c209104229b)

9 years agoam 33053845: am 00227471: Merge "Don\'t clobber LOCAL_CFLAGS_arm64 in llvm-device...
Tim Murray [Mon, 5 Jan 2015 18:35:45 +0000 (18:35 +0000)]
am 33053845: am 00227471: Merge "Don\'t clobber LOCAL_CFLAGS_arm64 in llvm-device-build."

* commit '3305384515fc8c4a1220cf4c0c868567ac1f1a69':
  Don't clobber LOCAL_CFLAGS_arm64 in llvm-device-build.

9 years agoam 00227471: Merge "Don\'t clobber LOCAL_CFLAGS_arm64 in llvm-device-build."
Tim Murray [Mon, 5 Jan 2015 18:30:05 +0000 (18:30 +0000)]
am 00227471: Merge "Don\'t clobber LOCAL_CFLAGS_arm64 in llvm-device-build."

* commit '00227471485a815abadf2cc8cd334c4e86f187f9':
  Don't clobber LOCAL_CFLAGS_arm64 in llvm-device-build.