Commit gráf

1889 Commit-ok

Szerző SHA1 Üzenet Dátum
Chris Kitching bbac7c8b82 Move giant lookup table into another translation unit
Also, rewrote it as a constant variable instead of a function
that imperatively fills a map. It's shorter, faster the compile,
and (depending on how badly the compiler screws it up) maybe
faster to run.

And, of course, it starts breaking up that giant .cpp file.


[ROCm/clr commit: 803d3ffd9c]
2017-10-24 20:38:25 +01:00
Evgeny Mankov 5a2bdb98f0 Merge pull request #230 from emankov/master
[HIPIFY][fix] cmake: NO_DEFAULT_PATH is strongly needed in find_package for LLVM

[ROCm/clr commit: 4e78738267]
2017-10-24 20:44:56 +03:00
Evgeny Mankov a12402fc9a Merge branch 'master' into tests
[ROCm/clr commit: 712a1da073]
2017-10-24 20:03:51 +03:00
Evgeny Mankov a6f0e70cea Merge pull request #227 from ChrisKitching/clang-silly
Tweak some version numbers in clang version compatibility checks

[ROCm/clr commit: 7b307b21d1]
2017-10-24 17:16:07 +03:00
Evgeny Mankov 59c0a69751 [HIPIFY][fix] cmake: NO_DEFAULT_PATH is strongly needed in find_package for LLVM
Otherwise LLVM will be searched in system folders.


[ROCm/clr commit: 4a0228cedb]
2017-10-24 16:35:10 +03:00
Evgeny Mankov 10cd9f9eb9 [HIPIFY][fix] cmake: do not build hipify-clang if not asked
+ warn "hipify-clang will not be built" if HIPIFY_CLANG_LLVM_DIR is not specified.
+ fix typo in previous commit .


[ROCm/clr commit: 7c51376bbf]
2017-10-24 14:16:05 +03:00
emankov d9a550d09c [HIPIFY] cmake: simplify build
[ROCm/clr commit: 559d9a68aa]
2017-10-24 10:51:11 +03:00
Chris Kitching 482541bb8c Tweak some version numbers in clang version compatibility checks
Apparently a couple of those APIs changed in clang 5, not 4.

Drat.


[ROCm/clr commit: aa288fcf1f]
2017-10-24 01:45:23 +01:00
Evgeny Mankov 27df5ecc82 [HIPIFY] cmake: fix standalone build
[ROCm/clr commit: cdd849541f]
2017-10-23 21:16:13 +03:00
Chris Kitching 26be50b082 Add concurentKernels.cu to the testsuite
[ROCm/clr commit: 2c65d0da37]
2017-10-23 13:39:37 +01:00
Chris Kitching 8fffd03350 Add the CUDA samples include dir to the path for tests
Means we get to easily steal CUDA examples for tests


[ROCm/clr commit: 64d5f07050]
2017-10-23 13:39:37 +01:00
Chris Kitching 7547f796d0 Add cudaRegister.cu lit test
[ROCm/clr commit: 2437b31939]
2017-10-23 13:39:37 +01:00
Chris Kitching 8fd3b3b1cd Add square.cu to lit testsuite
[ROCm/clr commit: ead79e5bf4]
2017-10-23 13:39:37 +01:00
Chris Kitching 8b311424a6 Introduce a test runner script to simplify invocation
... And to use a standard, highly amusing trick for making
coloured output work.


[ROCm/clr commit: c99dcbba8d]
2017-10-23 13:39:37 +01:00
Chris Kitching 4e80782cda Adapt lit test for the hipLaunchKernelGGL changes from before...
[ROCm/clr commit: 5912f465bd]
2017-10-23 13:39:37 +01:00
Chris Kitching 0f6c153774 Migrate lit test to using FileCheck, so failures are readable
It seems the test is already broken, but look how awesome the
error message is now:

/home/chris/HIP/tests/hipify-clang/axpy.cu:31:12: error: expected string not found in input
 // CHECK: hipLaunchKernel(HIP_KERNEL_NAME(axpy), dim3(1), dim3(kDataLen), 0, 0, a, device_x, device_y);
           ^
<stdin>:31:2: note: scanning from here
 //
 ^
<stdin>:33:2: note: possible intended match here
 hipLaunchKernelGGL(axpy, dim3(1), dim3(kDataLen), 0, 0, a, device_x, device_y);
 ^


[ROCm/clr commit: 74fd64d5c1]
2017-10-23 13:39:37 +01:00
Chris Kitching d92c43bd21 Look for FileCheck for running lit tests, too
Use of grep in `lit` RUN lines is deprecated:
https://llvm.org/docs/TestingGuide.html#writing-new-regression-tests

Using grep leads to really unhelpful failure output (it literally
just says "the test failed"). FileCheck is much more helpful, and
distributed with LLVM on most distros anyway, so this extra
dependency shouldn't prove problematic.


[ROCm/clr commit: 3868036ea7]
2017-10-23 13:39:36 +01:00
Chris Kitching baabd2755e Propagate the CUDA toolkit directory into the lit tests
Allows the tests to actually run... :D


[ROCm/clr commit: 9747578d09]
2017-10-23 13:39:36 +01:00
Chris Kitching 49e43a7fc1 Remove dependency on nonexistent lit target
This just... isn't a target. Maybe you were trying to do a file
dependency? But that's handled implicitly by the find_program
call anyway, so all this is doing is generating a cmake warning


[ROCm/clr commit: e9d259699c]
2017-10-23 13:39:36 +01:00
Evgeny Mankov 255a770364 Merge pull request #219 from ChrisKitching/newClang
[HIPIFY] Migrate hipify-clang to a newer version of clang

[ROCm/clr commit: 9dec691dbf]
2017-10-21 11:59:46 +03:00
Ben Sander 33b46b8ed9 Merge pull request #214 from scchan/reinit_printf_buffer
hipDeviceReset(): make sure to reinitialize the printf buffer in hcc RT

[ROCm/clr commit: 326651875d]
2017-10-20 11:04:37 -05:00
Chris Kitching d0feaee4f4 Avoid a double-free of HipifyPPCallbacks instance
This bug was present all along, but something changed in the order
of de-initialisation performed by llvm that makes it actually
crash now.

The constructor of HipifyPPCallbacks gives:
```
std::unique_ptr<HipifyPPCallbacks>(this)
```
to the LLVM Preprocessor instance. The Preprocessor instance
subsequently frees the HipifyPPCallbacks, which is then freed
again when we leave the stack frame at line 4340.

So: let's leak the HipifyPPCallbacks onto the heap, and leave
the LLVM Preprocessor object responsible for tidying it up.


[ROCm/clr commit: 893ee6d6ca]
2017-10-19 17:09:32 +01:00
Chris Kitching 64a26027b7 Be agnostic to the new getReplacements() API
See comment


[ROCm/clr commit: a06fe54ee8]
2017-10-19 17:08:55 +01:00
Chris Kitching 5e09ca10b7 Use inline initialisers to set default field values
A trivial cleanup that helps in a moment..


[ROCm/clr commit: 9d83348ac7]
2017-10-19 17:08:55 +01:00
Chris Kitching fd9bc0d0d8 Omit now-removed Filename string arg from handleBeginSource
[ROCm/clr commit: abd34b2125]
2017-10-19 17:08:55 +01:00
Chris Kitching a21737be39 Cope with Replacements now having llvm::Error returns
[ROCm/clr commit: 885573e1e2]
2017-10-19 17:08:54 +01:00
Chris Kitching db2b03b879 Cope with clang 4.0's rename of getNumArgs()
Sorry, this one I couldn't do in a perfectly elegant way ;)


[ROCm/clr commit: 9ccb966e2b]
2017-10-19 17:08:54 +01:00
Chris Kitching ae40d4bdea Remove unnecessary call to Retain() on a smart pointer
The Preprocessor smart pointer is held by the CompilerInstance,
and therefore its reference count cannot reach zero until the
CompilerInstance itself is destroyed.

If the CompilerInstance is destroyed, you have more to worry about
than just the preprocessor being deallocated!

Newer versions of the LLVM/Clang API migrated to using
std::shared_ptr, so there is no `Retain()` function (by that
name, anyway). Eliminating this redundant use is a neat and
backward-compatible way to become compatible with newer versions
of the LLVM/Clang API.


[ROCm/clr commit: 22a5e2330d]
2017-10-19 17:08:54 +01:00
Chris Kitching 3f284c0927 Refer to clang::StringLiteral explicitly
Newer versions of llvm/clang mean there is both an
llvm::StringLiteral and a clang::StringLiteral. Since we're
dumping both namespaces wholesale into the global namespace with
`using` declarations, this creates a name collision, which must be
resolved.

This change is backwards-compatible, and fixes a problem you
encounter when using newer versions of the llvm/clang API.


[ROCm/clr commit: 73984ed809]
2017-10-19 17:08:54 +01:00
Chris Kitching 17903e9dbd Fix two faulty LLVM version checks
What we actually want to do here is use the StringRef version in
versions newer than 3.8, and the void one in 3.8 and older.

Checking "major-version >= 3 && minor-version >= 9" does not do
what we want. Consider what this will do for version 4.0, for
which minor-version is zero...


[ROCm/clr commit: c876f6ffd5]
2017-10-19 17:08:54 +01:00
Chris Kitching 37764de428 Use the cache for global variables - not PARENT_SCOPE hacks
[ROCm/clr commit: ed6681f563]
2017-10-19 17:08:54 +01:00
Chris Kitching f736f861b8 Skip lit tests if lit cannot be found
[ROCm/clr commit: 6abd8963ae]
2017-10-19 17:08:54 +01:00
Chris Kitching 95e1706537 Don't reinvent find_package
PythonInterp is a finder module that ships with cmake. It supports
the conventional interaction with find_package that allows you
to demand success, and particular vesions, without having your
own logic:

https://cmake.org/cmake/help/v3.0/command/find_package.html


[ROCm/clr commit: c62766f880]
2017-10-19 17:08:53 +01:00
Chris Kitching 35943634ea Don't be picky about clang versions
[ROCm/clr commit: 03dd8c9fca]
2017-10-19 17:08:53 +01:00
Chris Kitching 9eac4a2012 Declare HIPIFY_CLANG_TESTS as a cmake option
[ROCm/clr commit: b926cdf002]
2017-10-19 17:08:53 +01:00
Chris Kitching 28ebdf5379 Use early return to avoid indenting all of CMakeLists.txt
[ROCm/clr commit: d3a5646051]
2017-10-19 17:08:53 +01:00
Chris Kitching a0c26d39f9 Fix broken indentation introduced by previous commit
[ROCm/clr commit: 72c9767b1d]
2017-10-19 17:08:53 +01:00
Chris Kitching 5cbaf06867 Inline a redundant std::vector
Looks like a partial refactor..?


[ROCm/clr commit: 6165b65d21]
2017-10-19 14:11:25 +01:00
Chris Kitching ddd6304971 Allow user-provided -std=* argument to override the default
This means any user-provided -std=* argument overrides this one,
allowing use of newer standards.


[ROCm/clr commit: 90b04f696b]
2017-10-19 14:11:15 +01:00
Siu Chi Chan 5ccf3d4d9b hipDeviceReset(): make sure to reinitialize the printf buffer in hcc RT
[ROCm/clr commit: a1956f64e6]
2017-10-18 16:26:13 -04:00
Evgeny Mankov af78943d2c Merge pull request #210 from ChrisKitching/output-hipify
[HIPIFY] Alter output file behaviour slightly

[ROCm/clr commit: 6cfa73a7da]
2017-10-18 21:46:31 +03:00
Chris Kitching bbc7a86d2c Unconditionally append .hip as the default output filename
[ROCm/clr commit: dbbd6d576d]
2017-10-18 19:19:18 +01:00
Chris Kitching 756aca43f9 If an output path is given _use it_
Don't append .hip to a user-provided output file...


[ROCm/clr commit: 14061bf0e6]
2017-10-16 17:32:57 +01:00
Chris Kitching 40b7c1f9a1 Operate on a temp file in-place
This copies to the output after operation, instead of working
_on_ the output. This allows includes to work correctly, while
supporting output paths anywhere on the filesystem.

Fixes #208
Fixes #206


[ROCm/clr commit: bd8a90a05b]
2017-10-16 17:32:56 +01:00
Evgeny Mankov 8d9f902675 [HIPIFY][#199][Partial fix] Fix for cudaLaunchKernel transformation
[Synopsis]
If any of kernel arguments is a MACRO its location calculation is wrong (location of its definition is actually calculated).
Thus garbage code is being produced on the place of such a MACRO starting from the end of its actual definition.

[Solution]
Add isMacroBodyExpansion and isMacroArgExpansion checks on kernel arguments.


[ROCm/clr commit: f3ef942407]
2017-10-12 20:05:42 +03:00
Evgeny Mankov e403132550 [HIPIFY] cmake changes
+ standalone build support
+ WIN MSVC support
+ disable lit testing by default
+ to enable lit testing -DHIPIFY_CLANG_TESTS=1 should be specified

Tested builds:
+ hipify-clang standalone           {Ubuntu 16.04|Windows 10} {Debug|Release} {x86|x64a} {g++|clang++|MSVC 2017} {llvm 3.8.0|llvm 3.9.0} {-DHIPIFY_CLANG_TESTS=1| }
+ HIP {-DHIPIFY_CLANG_LLVM_DIR=..|} {Ubuntu 16.04}            {Debug|Release} {x86|x64a} {hcc}                   {llvm 3.8.0|llvm 3.9.0} {-DHIPIFY_CLANG_TESTS=1| }


[ROCm/clr commit: ff38a484af]
2017-10-09 20:28:20 +03:00
Evgeny Mankov 25f3bf2c44 Merge branch 'master' of https://github.com/ROCm-Developer-Tools/HIP
[ROCm/clr commit: 86e0aa63d0]
2017-10-09 20:17:43 +03:00
Maneesh Gupta 2719e8a185 Bump HIP version to 1.4 and update release notes
Change-Id: I3570dedb32fe5fec6f60565c587a3282a4c6c709


[ROCm/clr commit: 253c1bf890]
2017-10-06 10:26:11 +05:30
Evgeny Mankov 72215db89e [HIPIFY] CUDA RT Textures and Arrays support update
[ROCm/clr commit: 858315b4cd]
2017-10-05 16:38:36 +03:00
Maneesh Gupta caba6ac8d5 Merge pull request #188 from gargrahul/texture2D_tests
Added Texture 2D object and reference APIs tests

[ROCm/clr commit: 7bc98ced9d]
2017-10-05 12:01:10 +05:30