ARROW-17790: [C++][Gandiva] Adapt to LLVM opaque pointer#14187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pitrou merged 7 commits into from
Sep 22, 2022
Merged

ARROW-17790: [C++][Gandiva] Adapt to LLVM opaque pointer #14187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cce529c
adapt llvm opaque pointer
js8544 Sep 20, 2022
a079a23
remove GetBufferRefence type param since it's always i64
js8544 Sep 20, 2022
9ee60db
remove GetLocalBitMapReference type param since it's always i64
js8544 Sep 20, 2022
fbd8ff6
use brew version of clang, to be consistent with installed LLVM lib
js8544 Sep 20, 2022
66353c9
fix clang-15 compatibility
Sep 21, 2022
80f7750
misc
Sep 22, 2022
266e915
increase c++ ci time to 75
Sep 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .github/workflows/cpp.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ jobs:
name: ${{ matrix.title }}
runs-on: ubuntu-latest
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
timeout-minutes: 60
timeout-minutes: 75
strategy:
fail-fast: false
matrix:
Expand DownExpand Up@@ -122,7 +122,7 @@ jobs:
name: AMD64 macOS 11 C++
runs-on: macos-latest
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
timeout-minutes: 60
timeout-minutes: 75
strategy:
fail-fast: false
env:
Expand DownExpand Up@@ -179,7 +179,11 @@ jobs:
key: cpp-ccache-macos-${{ hashFiles('cpp/**') }}
restore-keys: cpp-ccache-macos-
- name: Build
run: ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
# use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
run: |
export CC=$(brew --prefix llvm)/bin/clang
export CXX=$(brew --prefix llvm)/bin/clang++
ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
- name: Test
shell: bash
run: |
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/python.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,10 @@ jobs:
-r python/requirements-test.txt
- name: Build
shell: bash
# use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
run: |
export CC=$(brew --prefix llvm)/bin/clang
export CXX=$(brew --prefix llvm)/bin/clang++
export PYTHON=python3
ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
ci/scripts/python_build.sh $(pwd) $(pwd)/build
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ruby.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,10 @@ jobs:
key: ruby-ccache-macos-${{ hashFiles('cpp/**') }}
restore-keys: ruby-ccache-macos-
- name: Build C++
# use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
run: |
export CC=$(brew --prefix llvm)/bin/clang
export CXX=$(brew --prefix llvm)/bin/clang++
ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
- name: Build GLib
run: |
Expand Down
3 changes: 0 additions & 3 deletions cpp/src/arrow/array/array_test.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2831,8 +2831,6 @@ class DecimalTest : public ::testing::TestWithParam<int> {
auto type = std::make_shared<TYPE>(precision, 4);
auto builder = std::make_shared<DecimalBuilder>(type);

size_t null_count = 0;

const size_t size = draw.size();

ARROW_EXPECT_OK(builder->Reserve(size));
Expand All@@ -2842,7 +2840,6 @@ class DecimalTest : public ::testing::TestWithParam<int> {
ARROW_EXPECT_OK(builder->Append(draw[i]));
} else {
ARROW_EXPECT_OK(builder->AppendNull());
++null_count;
}
}

Expand Down
1 change: 1 addition & 0 deletions cpp/src/arrow/filesystem/gcsfs_test.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@

#include <algorithm> // Missing include in boost/process

#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// This boost/asio/io_context.hpp include is needless for no MinGW
// build.
//
Expand Down
1 change: 1 addition & 0 deletions cpp/src/arrow/filesystem/s3_test_util.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
#ifdef __MINGW32__
#include <boost/asio/io_context.hpp>
#endif
#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// We need BOOST_USE_WINDOWS_H definition with MinGW when we use
// boost/process.hpp. See BOOST_USE_WINDOWS_H=1 in
// cpp/cmake_modules/ThirdpartyToolchain.cmake for details.
Expand Down
3 changes: 2 additions & 1 deletion cpp/src/arrow/flight/test_util.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,11 +30,12 @@
// We need Windows fixes before including Boost
#include "arrow/util/windows_compatibility.h"

#include <gtest/gtest.h>
#include <boost/filesystem.hpp>
#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// We need BOOST_USE_WINDOWS_H definition with MinGW when we use
// boost/process.hpp. See BOOST_USE_WINDOWS_H=1 in
// cpp/cmake_modules/ThirdpartyToolchain.cmake for details.
#include <gtest/gtest.h>
#include <boost/process.hpp>

#include "arrow/array.h"
Expand Down
13 changes: 7 additions & 6 deletions cpp/src/gandiva/decimal_ir.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,8 +96,9 @@ void DecimalIR::InitializeIntrinsics() {
// CPP: return kScaleMultipliers[scale]
llvm::Value* DecimalIR::GetScaleMultiplier(llvm::Value* scale) {
auto const_array = module()->getGlobalVariable(kScaleMultipliersName);
auto ptr = CreateGEP(ir_builder(), const_array, {types()->i32_constant(0), scale});
return CreateLoad(ir_builder(), ptr);
auto ptr = ir_builder()->CreateGEP(const_array->getValueType(), const_array,
{types()->i32_constant(0), scale});
return ir_builder()->CreateLoad(types()->i128_type(), ptr);
}

// CPP: x <= y ? y : x
Expand DownExpand Up@@ -248,8 +249,8 @@ llvm::Value* DecimalIR::AddLarge(const ValueFull& x, const ValueFull& y,
ir_builder()->CreateCall(module()->getFunction("add_large_decimal128_decimal128"),
args);

auto out_high = CreateLoad(ir_builder(), out_high_ptr);
auto out_low = CreateLoad(ir_builder(), out_low_ptr);
auto out_high = ir_builder()->CreateLoad(types()->i64_type(), out_high_ptr);
auto out_low = ir_builder()->CreateLoad(types()->i64_type(), out_low_ptr);
auto sum = ValueSplit(out_high, out_low).AsInt128(this);
ADD_TRACE_128("AddLarge : sum", sum);
return sum;
Expand DownExpand Up@@ -445,8 +446,8 @@ llvm::Value* DecimalIR::CallDecimalFunction(const std::string& function_name,
// Make call to pre-compiled IR function.
ir_builder()->CreateCall(module()->getFunction(function_name), dis_assembled_args);

auto out_high = CreateLoad(ir_builder(), out_high_ptr);
auto out_low = CreateLoad(ir_builder(), out_low_ptr);
auto out_high = ir_builder()->CreateLoad(i64, out_high_ptr);
auto out_low = ir_builder()->CreateLoad(i64, out_low_ptr);
result = ValueSplit(out_high, out_low).AsInt128(this);
} else {
DCHECK_NE(return_type, types()->void_type());
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/gandiva/engine.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -234,11 +234,11 @@ Status Engine::LoadPreCompiledIR() {
Status::CodeGenError("Could not load module from IR: ",
buffer_or_error.getError().message()));

std::unique_ptr<llvm::MemoryBuffer> buffer = move(buffer_or_error.get());
std::unique_ptr<llvm::MemoryBuffer> buffer = std::move(buffer_or_error.get());

/// Parse the IR module.
llvm::Expected<std::unique_ptr<llvm::Module>> module_or_error =
llvm::getOwningLazyBitcodeModule(move(buffer), *context());
llvm::getOwningLazyBitcodeModule(std::move(buffer), *context());
if (!module_or_error) {
// NOTE: llvm::handleAllErrors() fails linking with RTTI-disabled LLVM builds
// (ARROW-5148)
Expand All@@ -247,14 +247,14 @@ Status Engine::LoadPreCompiledIR() {
stream << module_or_error.takeError();
return Status::CodeGenError(stream.str());
}
std::unique_ptr<llvm::Module> ir_module = move(module_or_error.get());
std::unique_ptr<llvm::Module> ir_module = std::move(module_or_error.get());

// set dataLayout
SetDataLayout(ir_module.get());

ARROW_RETURN_IF(llvm::verifyModule(*ir_module, &llvm::errs()),
Status::CodeGenError("verify of IR Module failed"));
ARROW_RETURN_IF(llvm::Linker::linkModules(*module_, move(ir_module)),
ARROW_RETURN_IF(llvm::Linker::linkModules(*module_, std::move(ir_module)),
Status::CodeGenError("failed to link IR Modules"));

return Status::OK();
Expand Down
5 changes: 3 additions & 2 deletions cpp/src/gandiva/engine_llvm_test.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,8 +80,9 @@ class TestEngine : public ::testing::Test {
loop_var->addIncoming(loop_update, loop_body);

// get the current value
llvm::Value* offset = CreateGEP(builder, arg_elements, loop_var, "offset");
llvm::Value* current_value = CreateLoad(builder, offset, "value");
llvm::Value* offset =
builder->CreateGEP(types->i64_type(), arg_elements, loop_var, "offset");
llvm::Value* current_value = builder->CreateLoad(types->i64_type(), offset, "value");

// setup sum PHI
llvm::Value* sum_update = builder->CreateAdd(sum, current_value, "sum+ith");
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ARROW-17790: [C++][Gandiva] Adapt to LLVM opaque pointer#14187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pitrou
merged 7 commits into

from

Sep 22, 2022
 Merged


ARROW-17790: [C++][Gandiva] Adapt to LLVM opaque pointer
#14187
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
cce529c

adapt llvm opaque pointer


js8544 Sep 20, 2022
a079a23

remove GetBufferRefence type param since it's always i64


js8544 Sep 20, 2022
9ee60db

remove GetLocalBitMapReference type param since it's always i64


js8544 Sep 20, 2022
fbd8ff6

use brew version of clang, to be consistent with installed LLVM lib


js8544 Sep 20, 2022
66353c9

fix clang-15 compatibility

Sep 21, 2022
80f7750

misc

Sep 22, 2022
266e915

increase c++ ci time to 75

Sep 22, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 7 additions & 3 deletions
.github/workflows/cpp.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ jobs:
 name: ${{ matrix.title }}
 runs-on: ubuntu-latest
 if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
 timeout-minutes: 60
 timeout-minutes: 75
 strategy:
 fail-fast: false
 matrix:
Expand DownExpand Up@@ -122,7 +122,7 @@ jobs:
 name: AMD64 macOS 11 C++
 runs-on: macos-latest
 if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
 timeout-minutes: 60
 timeout-minutes: 75
 strategy:
 fail-fast: false
 env:
Expand DownExpand Up@@ -179,7 +179,11 @@ jobs:
 key: cpp-ccache-macos-${{ hashFiles('cpp/**') }}
 restore-keys: cpp-ccache-macos-
 - name: Build
 run: ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 # use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
 run: |
 export CC=$(brew --prefix llvm)/bin/clang
 export CXX=$(brew --prefix llvm)/bin/clang++
 ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 - name: Test
 shell: bash
 run: |
Expand Down

3 changes: 3 additions & 0 deletions
.github/workflows/python.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,10 @@ jobs:
 -r python/requirements-test.txt
 - name: Build
 shell: bash
 # use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
 run: |
 export CC=$(brew --prefix llvm)/bin/clang
 export CXX=$(brew --prefix llvm)/bin/clang++
 export PYTHON=python3
 ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 ci/scripts/python_build.sh $(pwd) $(pwd)/build
Expand Down

3 changes: 3 additions & 0 deletions
.github/workflows/ruby.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,10 @@ jobs:
 key: ruby-ccache-macos-${{ hashFiles('cpp/**') }}
 restore-keys: ruby-ccache-macos-
 - name: Build C++
 # use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
 run: |
 export CC=$(brew --prefix llvm)/bin/clang
 export CXX=$(brew --prefix llvm)/bin/clang++
 ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 - name: Build GLib
 run: |
Expand Down

3 changes: 0 additions & 3 deletions
cpp/src/arrow/array/array_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2831,8 +2831,6 @@ class DecimalTest : public ::testing::TestWithParam<int> {
 auto type = std::make_shared<TYPE>(precision, 4);
 auto builder = std::make_shared<DecimalBuilder>(type);

 size_t null_count = 0;

 const size_t size = draw.size();

 ARROW_EXPECT_OK(builder->Reserve(size));
Expand All@@ -2842,7 +2840,6 @@ class DecimalTest : public ::testing::TestWithParam<int> {
 ARROW_EXPECT_OK(builder->Append(draw[i]));
 } else {
 ARROW_EXPECT_OK(builder->AppendNull());
 ++null_count;
 }
 }

Expand Down

1 change: 1 addition & 0 deletions
cpp/src/arrow/filesystem/gcsfs_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@

#include <algorithm> // Missing include in boost/process

#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// This boost/asio/io_context.hpp include is needless for no MinGW
// build.
//
Expand Down

1 change: 1 addition & 0 deletions
cpp/src/arrow/filesystem/s3_test_util.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
#ifdef __MINGW32__
#include <boost/asio/io_context.hpp>
#endif
#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// We need BOOST_USE_WINDOWS_H definition with MinGW when we use
// boost/process.hpp. See BOOST_USE_WINDOWS_H=1 in
// cpp/cmake_modules/ThirdpartyToolchain.cmake for details.
Expand Down

3 changes: 2 additions & 1 deletion
cpp/src/arrow/flight/test_util.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,11 +30,12 @@
// We need Windows fixes before including Boost
#include "arrow/util/windows_compatibility.h"

#include <gtest/gtest.h>
#include <boost/filesystem.hpp>
#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// We need BOOST_USE_WINDOWS_H definition with MinGW when we use
// boost/process.hpp. See BOOST_USE_WINDOWS_H=1 in
// cpp/cmake_modules/ThirdpartyToolchain.cmake for details.
#include <gtest/gtest.h>
#include <boost/process.hpp>

#include "arrow/array.h"
Expand Down

13 changes: 7 additions & 6 deletions
cpp/src/gandiva/decimal_ir.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,8 +96,9 @@ void DecimalIR::InitializeIntrinsics() {
// CPP: return kScaleMultipliers[scale]
llvm::Value* DecimalIR::GetScaleMultiplier(llvm::Value* scale) {
 auto const_array = module()->getGlobalVariable(kScaleMultipliersName);
 auto ptr = CreateGEP(ir_builder(), const_array, {types()->i32_constant(0), scale});
 return CreateLoad(ir_builder(), ptr);
 auto ptr = ir_builder()->CreateGEP(const_array->getValueType(), const_array,
 {types()->i32_constant(0), scale});
 return ir_builder()->CreateLoad(types()->i128_type(), ptr);
}

// CPP: x <= y ? y : x
Expand DownExpand Up@@ -248,8 +249,8 @@ llvm::Value* DecimalIR::AddLarge(const ValueFull& x, const ValueFull& y,
 ir_builder()->CreateCall(module()->getFunction("add_large_decimal128_decimal128"),
 args);

 auto out_high = CreateLoad(ir_builder(), out_high_ptr);
 auto out_low = CreateLoad(ir_builder(), out_low_ptr);
 auto out_high = ir_builder()->CreateLoad(types()->i64_type(), out_high_ptr);
 auto out_low = ir_builder()->CreateLoad(types()->i64_type(), out_low_ptr);
 auto sum = ValueSplit(out_high, out_low).AsInt128(this);
 ADD_TRACE_128("AddLarge : sum", sum);
 return sum;
Expand DownExpand Up@@ -445,8 +446,8 @@ llvm::Value* DecimalIR::CallDecimalFunction(const std::string& function_name,
 // Make call to pre-compiled IR function.
 ir_builder()->CreateCall(module()->getFunction(function_name), dis_assembled_args);

 auto out_high = CreateLoad(ir_builder(), out_high_ptr);
 auto out_low = CreateLoad(ir_builder(), out_low_ptr);
 auto out_high = ir_builder()->CreateLoad(i64, out_high_ptr);
 auto out_low = ir_builder()->CreateLoad(i64, out_low_ptr);
 result = ValueSplit(out_high, out_low).AsInt128(this);
 } else {
 DCHECK_NE(return_type, types()->void_type());
Expand Down

8 changes: 4 additions & 4 deletions
cpp/src/gandiva/engine.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -234,11 +234,11 @@ Status Engine::LoadPreCompiledIR() {
 Status::CodeGenError("Could not load module from IR: ",
 buffer_or_error.getError().message()));

 std::unique_ptr<llvm::MemoryBuffer> buffer = move(buffer_or_error.get());
 std::unique_ptr<llvm::MemoryBuffer> buffer = std::move(buffer_or_error.get());

 /// Parse the IR module.
 llvm::Expected<std::unique_ptr<llvm::Module>> module_or_error =
 llvm::getOwningLazyBitcodeModule(move(buffer), *context());
 llvm::getOwningLazyBitcodeModule(std::move(buffer), *context());
 if (!module_or_error) {
 // NOTE: llvm::handleAllErrors() fails linking with RTTI-disabled LLVM builds
 // (ARROW-5148)
Expand All@@ -247,14 +247,14 @@ Status Engine::LoadPreCompiledIR() {
 stream << module_or_error.takeError();
 return Status::CodeGenError(stream.str());
 }
 std::unique_ptr<llvm::Module> ir_module = move(module_or_error.get());
 std::unique_ptr<llvm::Module> ir_module = std::move(module_or_error.get());

 // set dataLayout
 SetDataLayout(ir_module.get());

 ARROW_RETURN_IF(llvm::verifyModule(*ir_module, &llvm::errs()),
 Status::CodeGenError("verify of IR Module failed"));
 ARROW_RETURN_IF(llvm::Linker::linkModules(*module_, move(ir_module)),
 ARROW_RETURN_IF(llvm::Linker::linkModules(*module_, std::move(ir_module)),
 Status::CodeGenError("failed to link IR Modules"));

 return Status::OK();
Expand Down

5 changes: 3 additions & 2 deletions
cpp/src/gandiva/engine_llvm_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,8 +80,9 @@ class TestEngine : public ::testing::Test {
 loop_var->addIncoming(loop_update, loop_body);

 // get the current value
 llvm::Value* offset = CreateGEP(builder, arg_elements, loop_var, "offset");
 llvm::Value* current_value = CreateLoad(builder, offset, "value");
 llvm::Value* offset =
 builder->CreateGEP(types->i64_type(), arg_elements, loop_var, "offset");
 llvm::Value* current_value = builder->CreateLoad(types->i64_type(), offset, "value");

 // setup sum PHI
 llvm::Value* sum_update = builder->CreateAdd(sum, current_value, "sum+ith");
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-17790: [C++][Gandiva] Adapt to LLVM opaque pointer#14187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pitrou
merged 7 commits into

from

Sep 22, 2022
 Merged


ARROW-17790: [C++][Gandiva] Adapt to LLVM opaque pointer
#14187
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
cce529c

adapt llvm opaque pointer


js8544 Sep 20, 2022
a079a23

remove GetBufferRefence type param since it's always i64


js8544 Sep 20, 2022
9ee60db

remove GetLocalBitMapReference type param since it's always i64


js8544 Sep 20, 2022
fbd8ff6

use brew version of clang, to be consistent with installed LLVM lib


js8544 Sep 20, 2022
66353c9

fix clang-15 compatibility

Sep 21, 2022
80f7750

misc

Sep 22, 2022
266e915

increase c++ ci time to 75

Sep 22, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 7 additions & 3 deletions
.github/workflows/cpp.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ jobs:
 name: ${{ matrix.title }}
 runs-on: ubuntu-latest
 if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
 timeout-minutes: 60
 timeout-minutes: 75
 strategy:
 fail-fast: false
 matrix:
Expand DownExpand Up@@ -122,7 +122,7 @@ jobs:
 name: AMD64 macOS 11 C++
 runs-on: macos-latest
 if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
 timeout-minutes: 60
 timeout-minutes: 75
 strategy:
 fail-fast: false
 env:
Expand DownExpand Up@@ -179,7 +179,11 @@ jobs:
 key: cpp-ccache-macos-${{ hashFiles('cpp/**') }}
 restore-keys: cpp-ccache-macos-
 - name: Build
 run: ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 # use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
 run: |
 export CC=$(brew --prefix llvm)/bin/clang
 export CXX=$(brew --prefix llvm)/bin/clang++
 ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 - name: Test
 shell: bash
 run: |
Expand Down

3 changes: 3 additions & 0 deletions
.github/workflows/python.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,10 @@ jobs:
 -r python/requirements-test.txt
 - name: Build
 shell: bash
 # use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
 run: |
 export CC=$(brew --prefix llvm)/bin/clang
 export CXX=$(brew --prefix llvm)/bin/clang++
 export PYTHON=python3
 ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 ci/scripts/python_build.sh $(pwd) $(pwd)/build
Expand Down

3 changes: 3 additions & 0 deletions
.github/workflows/ruby.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,10 @@ jobs:
 key: ruby-ccache-macos-${{ hashFiles('cpp/**') }}
 restore-keys: ruby-ccache-macos-
 - name: Build C++
 # use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
 run: |
 export CC=$(brew --prefix llvm)/bin/clang
 export CXX=$(brew --prefix llvm)/bin/clang++
 ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 - name: Build GLib
 run: |
Expand Down

3 changes: 0 additions & 3 deletions
cpp/src/arrow/array/array_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2831,8 +2831,6 @@ class DecimalTest : public ::testing::TestWithParam<int> {
 auto type = std::make_shared<TYPE>(precision, 4);
 auto builder = std::make_shared<DecimalBuilder>(type);

 size_t null_count = 0;

 const size_t size = draw.size();

 ARROW_EXPECT_OK(builder->Reserve(size));
Expand All@@ -2842,7 +2840,6 @@ class DecimalTest : public ::testing::TestWithParam<int> {
 ARROW_EXPECT_OK(builder->Append(draw[i]));
 } else {
 ARROW_EXPECT_OK(builder->AppendNull());
 ++null_count;
 }
 }

Expand Down

1 change: 1 addition & 0 deletions
cpp/src/arrow/filesystem/gcsfs_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@

#include <algorithm> // Missing include in boost/process

#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// This boost/asio/io_context.hpp include is needless for no MinGW
// build.
//
Expand Down

1 change: 1 addition & 0 deletions
cpp/src/arrow/filesystem/s3_test_util.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
#ifdef __MINGW32__
#include <boost/asio/io_context.hpp>
#endif
#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// We need BOOST_USE_WINDOWS_H definition with MinGW when we use
// boost/process.hpp. See BOOST_USE_WINDOWS_H=1 in
// cpp/cmake_modules/ThirdpartyToolchain.cmake for details.
Expand Down

3 changes: 2 additions & 1 deletion
cpp/src/arrow/flight/test_util.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,11 +30,12 @@
// We need Windows fixes before including Boost
#include "arrow/util/windows_compatibility.h"

#include <gtest/gtest.h>
#include <boost/filesystem.hpp>
#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// We need BOOST_USE_WINDOWS_H definition with MinGW when we use
// boost/process.hpp. See BOOST_USE_WINDOWS_H=1 in
// cpp/cmake_modules/ThirdpartyToolchain.cmake for details.
#include <gtest/gtest.h>
#include <boost/process.hpp>

#include "arrow/array.h"
Expand Down

13 changes: 7 additions & 6 deletions
cpp/src/gandiva/decimal_ir.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,8 +96,9 @@ void DecimalIR::InitializeIntrinsics() {
// CPP: return kScaleMultipliers[scale]
llvm::Value* DecimalIR::GetScaleMultiplier(llvm::Value* scale) {
 auto const_array = module()->getGlobalVariable(kScaleMultipliersName);
 auto ptr = CreateGEP(ir_builder(), const_array, {types()->i32_constant(0), scale});
 return CreateLoad(ir_builder(), ptr);
 auto ptr = ir_builder()->CreateGEP(const_array->getValueType(), const_array,
 {types()->i32_constant(0), scale});
 return ir_builder()->CreateLoad(types()->i128_type(), ptr);
}

// CPP: x <= y ? y : x
Expand DownExpand Up@@ -248,8 +249,8 @@ llvm::Value* DecimalIR::AddLarge(const ValueFull& x, const ValueFull& y,
 ir_builder()->CreateCall(module()->getFunction("add_large_decimal128_decimal128"),
 args);

 auto out_high = CreateLoad(ir_builder(), out_high_ptr);
 auto out_low = CreateLoad(ir_builder(), out_low_ptr);
 auto out_high = ir_builder()->CreateLoad(types()->i64_type(), out_high_ptr);
 auto out_low = ir_builder()->CreateLoad(types()->i64_type(), out_low_ptr);
 auto sum = ValueSplit(out_high, out_low).AsInt128(this);
 ADD_TRACE_128("AddLarge : sum", sum);
 return sum;
Expand DownExpand Up@@ -445,8 +446,8 @@ llvm::Value* DecimalIR::CallDecimalFunction(const std::string& function_name,
 // Make call to pre-compiled IR function.
 ir_builder()->CreateCall(module()->getFunction(function_name), dis_assembled_args);

 auto out_high = CreateLoad(ir_builder(), out_high_ptr);
 auto out_low = CreateLoad(ir_builder(), out_low_ptr);
 auto out_high = ir_builder()->CreateLoad(i64, out_high_ptr);
 auto out_low = ir_builder()->CreateLoad(i64, out_low_ptr);
 result = ValueSplit(out_high, out_low).AsInt128(this);
 } else {
 DCHECK_NE(return_type, types()->void_type());
Expand Down

8 changes: 4 additions & 4 deletions
cpp/src/gandiva/engine.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -234,11 +234,11 @@ Status Engine::LoadPreCompiledIR() {
 Status::CodeGenError("Could not load module from IR: ",
 buffer_or_error.getError().message()));

 std::unique_ptr<llvm::MemoryBuffer> buffer = move(buffer_or_error.get());
 std::unique_ptr<llvm::MemoryBuffer> buffer = std::move(buffer_or_error.get());

 /// Parse the IR module.
 llvm::Expected<std::unique_ptr<llvm::Module>> module_or_error =
 llvm::getOwningLazyBitcodeModule(move(buffer), *context());
 llvm::getOwningLazyBitcodeModule(std::move(buffer), *context());
 if (!module_or_error) {
 // NOTE: llvm::handleAllErrors() fails linking with RTTI-disabled LLVM builds
 // (ARROW-5148)
Expand All@@ -247,14 +247,14 @@ Status Engine::LoadPreCompiledIR() {
 stream << module_or_error.takeError();
 return Status::CodeGenError(stream.str());
 }
 std::unique_ptr<llvm::Module> ir_module = move(module_or_error.get());
 std::unique_ptr<llvm::Module> ir_module = std::move(module_or_error.get());

 // set dataLayout
 SetDataLayout(ir_module.get());

 ARROW_RETURN_IF(llvm::verifyModule(*ir_module, &llvm::errs()),
 Status::CodeGenError("verify of IR Module failed"));
 ARROW_RETURN_IF(llvm::Linker::linkModules(*module_, move(ir_module)),
 ARROW_RETURN_IF(llvm::Linker::linkModules(*module_, std::move(ir_module)),
 Status::CodeGenError("failed to link IR Modules"));

 return Status::OK();
Expand Down

5 changes: 3 additions & 2 deletions
cpp/src/gandiva/engine_llvm_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,8 +80,9 @@ class TestEngine : public ::testing::Test {
 loop_var->addIncoming(loop_update, loop_body);

 // get the current value
 llvm::Value* offset = CreateGEP(builder, arg_elements, loop_var, "offset");
 llvm::Value* current_value = CreateLoad(builder, offset, "value");
 llvm::Value* offset =
 builder->CreateGEP(types->i64_type(), arg_elements, loop_var, "offset");
 llvm::Value* current_value = builder->CreateLoad(types->i64_type(), offset, "value");

 // setup sum PHI
 llvm::Value* sum_update = builder->CreateAdd(sum, current_value, "sum+ith");
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-17790: [C++][Gandiva] Adapt to LLVM opaque pointer#14187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pitrou
merged 7 commits into

from

Sep 22, 2022
 Merged


ARROW-17790: [C++][Gandiva] Adapt to LLVM opaque pointer
#14187
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
cce529c

adapt llvm opaque pointer


js8544 Sep 20, 2022
a079a23

remove GetBufferRefence type param since it's always i64


js8544 Sep 20, 2022
9ee60db

remove GetLocalBitMapReference type param since it's always i64


js8544 Sep 20, 2022
fbd8ff6

use brew version of clang, to be consistent with installed LLVM lib


js8544 Sep 20, 2022
66353c9

fix clang-15 compatibility

Sep 21, 2022
80f7750

misc

Sep 22, 2022
266e915

increase c++ ci time to 75

Sep 22, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 7 additions & 3 deletions
.github/workflows/cpp.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ jobs:
 name: ${{ matrix.title }}
 runs-on: ubuntu-latest
 if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
 timeout-minutes: 60
 timeout-minutes: 75
 strategy:
 fail-fast: false
 matrix:
Expand DownExpand Up@@ -122,7 +122,7 @@ jobs:
 name: AMD64 macOS 11 C++
 runs-on: macos-latest
 if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
 timeout-minutes: 60
 timeout-minutes: 75
 strategy:
 fail-fast: false
 env:
Expand DownExpand Up@@ -179,7 +179,11 @@ jobs:
 key: cpp-ccache-macos-${{ hashFiles('cpp/**') }}
 restore-keys: cpp-ccache-macos-
 - name: Build
 run: ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 # use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
 run: |
 export CC=$(brew --prefix llvm)/bin/clang
 export CXX=$(brew --prefix llvm)/bin/clang++
 ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 - name: Test
 shell: bash
 run: |
Expand Down

3 changes: 3 additions & 0 deletions
.github/workflows/python.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,10 @@ jobs:
 -r python/requirements-test.txt
 - name: Build
 shell: bash
 # use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
 run: |
 export CC=$(brew --prefix llvm)/bin/clang
 export CXX=$(brew --prefix llvm)/bin/clang++
 export PYTHON=python3
 ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 ci/scripts/python_build.sh $(pwd) $(pwd)/build
Expand Down

3 changes: 3 additions & 0 deletions
.github/workflows/ruby.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,10 @@ jobs:
 key: ruby-ccache-macos-${{ hashFiles('cpp/**') }}
 restore-keys: ruby-ccache-macos-
 - name: Build C++
 # use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
 run: |
 export CC=$(brew --prefix llvm)/bin/clang
 export CXX=$(brew --prefix llvm)/bin/clang++
 ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 - name: Build GLib
 run: |
Expand Down

3 changes: 0 additions & 3 deletions
cpp/src/arrow/array/array_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2831,8 +2831,6 @@ class DecimalTest : public ::testing::TestWithParam<int> {
 auto type = std::make_shared<TYPE>(precision, 4);
 auto builder = std::make_shared<DecimalBuilder>(type);

 size_t null_count = 0;

 const size_t size = draw.size();

 ARROW_EXPECT_OK(builder->Reserve(size));
Expand All@@ -2842,7 +2840,6 @@ class DecimalTest : public ::testing::TestWithParam<int> {
 ARROW_EXPECT_OK(builder->Append(draw[i]));
 } else {
 ARROW_EXPECT_OK(builder->AppendNull());
 ++null_count;
 }
 }

Expand Down

1 change: 1 addition & 0 deletions
cpp/src/arrow/filesystem/gcsfs_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@

#include <algorithm> // Missing include in boost/process

#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// This boost/asio/io_context.hpp include is needless for no MinGW
// build.
//
Expand Down

1 change: 1 addition & 0 deletions
cpp/src/arrow/filesystem/s3_test_util.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
#ifdef __MINGW32__
#include <boost/asio/io_context.hpp>
#endif
#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// We need BOOST_USE_WINDOWS_H definition with MinGW when we use
// boost/process.hpp. See BOOST_USE_WINDOWS_H=1 in
// cpp/cmake_modules/ThirdpartyToolchain.cmake for details.
Expand Down

3 changes: 2 additions & 1 deletion
cpp/src/arrow/flight/test_util.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,11 +30,12 @@
// We need Windows fixes before including Boost
#include "arrow/util/windows_compatibility.h"

#include <gtest/gtest.h>
#include <boost/filesystem.hpp>
#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// We need BOOST_USE_WINDOWS_H definition with MinGW when we use
// boost/process.hpp. See BOOST_USE_WINDOWS_H=1 in
// cpp/cmake_modules/ThirdpartyToolchain.cmake for details.
#include <gtest/gtest.h>
#include <boost/process.hpp>

#include "arrow/array.h"
Expand Down

13 changes: 7 additions & 6 deletions
cpp/src/gandiva/decimal_ir.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,8 +96,9 @@ void DecimalIR::InitializeIntrinsics() {
// CPP: return kScaleMultipliers[scale]
llvm::Value* DecimalIR::GetScaleMultiplier(llvm::Value* scale) {
 auto const_array = module()->getGlobalVariable(kScaleMultipliersName);
 auto ptr = CreateGEP(ir_builder(), const_array, {types()->i32_constant(0), scale});
 return CreateLoad(ir_builder(), ptr);
 auto ptr = ir_builder()->CreateGEP(const_array->getValueType(), const_array,
 {types()->i32_constant(0), scale});
 return ir_builder()->CreateLoad(types()->i128_type(), ptr);
}

// CPP: x <= y ? y : x
Expand DownExpand Up@@ -248,8 +249,8 @@ llvm::Value* DecimalIR::AddLarge(const ValueFull& x, const ValueFull& y,
 ir_builder()->CreateCall(module()->getFunction("add_large_decimal128_decimal128"),
 args);

 auto out_high = CreateLoad(ir_builder(), out_high_ptr);
 auto out_low = CreateLoad(ir_builder(), out_low_ptr);
 auto out_high = ir_builder()->CreateLoad(types()->i64_type(), out_high_ptr);
 auto out_low = ir_builder()->CreateLoad(types()->i64_type(), out_low_ptr);
 auto sum = ValueSplit(out_high, out_low).AsInt128(this);
 ADD_TRACE_128("AddLarge : sum", sum);
 return sum;
Expand DownExpand Up@@ -445,8 +446,8 @@ llvm::Value* DecimalIR::CallDecimalFunction(const std::string& function_name,
 // Make call to pre-compiled IR function.
 ir_builder()->CreateCall(module()->getFunction(function_name), dis_assembled_args);

 auto out_high = CreateLoad(ir_builder(), out_high_ptr);
 auto out_low = CreateLoad(ir_builder(), out_low_ptr);
 auto out_high = ir_builder()->CreateLoad(i64, out_high_ptr);
 auto out_low = ir_builder()->CreateLoad(i64, out_low_ptr);
 result = ValueSplit(out_high, out_low).AsInt128(this);
 } else {
 DCHECK_NE(return_type, types()->void_type());
Expand Down

8 changes: 4 additions & 4 deletions
cpp/src/gandiva/engine.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -234,11 +234,11 @@ Status Engine::LoadPreCompiledIR() {
 Status::CodeGenError("Could not load module from IR: ",
 buffer_or_error.getError().message()));

 std::unique_ptr<llvm::MemoryBuffer> buffer = move(buffer_or_error.get());
 std::unique_ptr<llvm::MemoryBuffer> buffer = std::move(buffer_or_error.get());

 /// Parse the IR module.
 llvm::Expected<std::unique_ptr<llvm::Module>> module_or_error =
 llvm::getOwningLazyBitcodeModule(move(buffer), *context());
 llvm::getOwningLazyBitcodeModule(std::move(buffer), *context());
 if (!module_or_error) {
 // NOTE: llvm::handleAllErrors() fails linking with RTTI-disabled LLVM builds
 // (ARROW-5148)
Expand All@@ -247,14 +247,14 @@ Status Engine::LoadPreCompiledIR() {
 stream << module_or_error.takeError();
 return Status::CodeGenError(stream.str());
 }
 std::unique_ptr<llvm::Module> ir_module = move(module_or_error.get());
 std::unique_ptr<llvm::Module> ir_module = std::move(module_or_error.get());

 // set dataLayout
 SetDataLayout(ir_module.get());

 ARROW_RETURN_IF(llvm::verifyModule(*ir_module, &llvm::errs()),
 Status::CodeGenError("verify of IR Module failed"));
 ARROW_RETURN_IF(llvm::Linker::linkModules(*module_, move(ir_module)),
 ARROW_RETURN_IF(llvm::Linker::linkModules(*module_, std::move(ir_module)),
 Status::CodeGenError("failed to link IR Modules"));

 return Status::OK();
Expand Down

5 changes: 3 additions & 2 deletions
cpp/src/gandiva/engine_llvm_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,8 +80,9 @@ class TestEngine : public ::testing::Test {
 loop_var->addIncoming(loop_update, loop_body);

 // get the current value
 llvm::Value* offset = CreateGEP(builder, arg_elements, loop_var, "offset");
 llvm::Value* current_value = CreateLoad(builder, offset, "value");
 llvm::Value* offset =
 builder->CreateGEP(types->i64_type(), arg_elements, loop_var, "offset");
 llvm::Value* current_value = builder->CreateLoad(types->i64_type(), offset, "value");

 // setup sum PHI
 llvm::Value* sum_update = builder->CreateAdd(sum, current_value, "sum+ith");
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ARROW-17790: [C++][Gandiva] Adapt to LLVM opaque pointer#14187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pitrou
merged 7 commits into

from

Sep 22, 2022
 Merged


ARROW-17790: [C++][Gandiva] Adapt to LLVM opaque pointer
#14187
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
cce529c

adapt llvm opaque pointer


js8544 Sep 20, 2022
a079a23

remove GetBufferRefence type param since it's always i64


js8544 Sep 20, 2022
9ee60db

remove GetLocalBitMapReference type param since it's always i64


js8544 Sep 20, 2022
fbd8ff6

use brew version of clang, to be consistent with installed LLVM lib


js8544 Sep 20, 2022
66353c9

fix clang-15 compatibility

Sep 21, 2022
80f7750

misc

Sep 22, 2022
266e915

increase c++ ci time to 75

Sep 22, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 7 additions & 3 deletions
.github/workflows/cpp.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ jobs:
 name: ${{ matrix.title }}
 runs-on: ubuntu-latest
 if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
 timeout-minutes: 60
 timeout-minutes: 75
 strategy:
 fail-fast: false
 matrix:
Expand DownExpand Up@@ -122,7 +122,7 @@ jobs:
 name: AMD64 macOS 11 C++
 runs-on: macos-latest
 if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
 timeout-minutes: 60
 timeout-minutes: 75
 strategy:
 fail-fast: false
 env:
Expand DownExpand Up@@ -179,7 +179,11 @@ jobs:
 key: cpp-ccache-macos-${{ hashFiles('cpp/**') }}
 restore-keys: cpp-ccache-macos-
 - name: Build
 run: ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 # use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
 run: |
 export CC=$(brew --prefix llvm)/bin/clang
 export CXX=$(brew --prefix llvm)/bin/clang++
 ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 - name: Test
 shell: bash
 run: |
Expand Down

3 changes: 3 additions & 0 deletions
.github/workflows/python.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,10 @@ jobs:
 -r python/requirements-test.txt
 - name: Build
 shell: bash
 # use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
 run: |
 export CC=$(brew --prefix llvm)/bin/clang
 export CXX=$(brew --prefix llvm)/bin/clang++
 export PYTHON=python3
 ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 ci/scripts/python_build.sh $(pwd) $(pwd)/build
Expand Down

3 changes: 3 additions & 0 deletions
.github/workflows/ruby.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,10 @@ jobs:
 key: ruby-ccache-macos-${{ hashFiles('cpp/**') }}
 restore-keys: ruby-ccache-macos-
 - name: Build C++
 # use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
 run: |
 export CC=$(brew --prefix llvm)/bin/clang
 export CXX=$(brew --prefix llvm)/bin/clang++
 ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 - name: Build GLib
 run: |
Expand Down

3 changes: 0 additions & 3 deletions
cpp/src/arrow/array/array_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2831,8 +2831,6 @@ class DecimalTest : public ::testing::TestWithParam<int> {
 auto type = std::make_shared<TYPE>(precision, 4);
 auto builder = std::make_shared<DecimalBuilder>(type);

 size_t null_count = 0;

 const size_t size = draw.size();

 ARROW_EXPECT_OK(builder->Reserve(size));
Expand All@@ -2842,7 +2840,6 @@ class DecimalTest : public ::testing::TestWithParam<int> {
 ARROW_EXPECT_OK(builder->Append(draw[i]));
 } else {
 ARROW_EXPECT_OK(builder->AppendNull());
 ++null_count;
 }
 }

Expand Down

1 change: 1 addition & 0 deletions
cpp/src/arrow/filesystem/gcsfs_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@

#include <algorithm> // Missing include in boost/process

#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// This boost/asio/io_context.hpp include is needless for no MinGW
// build.
//
Expand Down

1 change: 1 addition & 0 deletions
cpp/src/arrow/filesystem/s3_test_util.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
#ifdef __MINGW32__
#include <boost/asio/io_context.hpp>
#endif
#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// We need BOOST_USE_WINDOWS_H definition with MinGW when we use
// boost/process.hpp. See BOOST_USE_WINDOWS_H=1 in
// cpp/cmake_modules/ThirdpartyToolchain.cmake for details.
Expand Down

3 changes: 2 additions & 1 deletion
cpp/src/arrow/flight/test_util.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,11 +30,12 @@
// We need Windows fixes before including Boost
#include "arrow/util/windows_compatibility.h"

#include <gtest/gtest.h>
#include <boost/filesystem.hpp>
#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// We need BOOST_USE_WINDOWS_H definition with MinGW when we use
// boost/process.hpp. See BOOST_USE_WINDOWS_H=1 in
// cpp/cmake_modules/ThirdpartyToolchain.cmake for details.
#include <gtest/gtest.h>
#include <boost/process.hpp>

#include "arrow/array.h"
Expand Down

13 changes: 7 additions & 6 deletions
cpp/src/gandiva/decimal_ir.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,8 +96,9 @@ void DecimalIR::InitializeIntrinsics() {
// CPP: return kScaleMultipliers[scale]
llvm::Value* DecimalIR::GetScaleMultiplier(llvm::Value* scale) {
 auto const_array = module()->getGlobalVariable(kScaleMultipliersName);
 auto ptr = CreateGEP(ir_builder(), const_array, {types()->i32_constant(0), scale});
 return CreateLoad(ir_builder(), ptr);
 auto ptr = ir_builder()->CreateGEP(const_array->getValueType(), const_array,
 {types()->i32_constant(0), scale});
 return ir_builder()->CreateLoad(types()->i128_type(), ptr);
}

// CPP: x <= y ? y : x
Expand DownExpand Up@@ -248,8 +249,8 @@ llvm::Value* DecimalIR::AddLarge(const ValueFull& x, const ValueFull& y,
 ir_builder()->CreateCall(module()->getFunction("add_large_decimal128_decimal128"),
 args);

 auto out_high = CreateLoad(ir_builder(), out_high_ptr);
 auto out_low = CreateLoad(ir_builder(), out_low_ptr);
 auto out_high = ir_builder()->CreateLoad(types()->i64_type(), out_high_ptr);
 auto out_low = ir_builder()->CreateLoad(types()->i64_type(), out_low_ptr);
 auto sum = ValueSplit(out_high, out_low).AsInt128(this);
 ADD_TRACE_128("AddLarge : sum", sum);
 return sum;
Expand DownExpand Up@@ -445,8 +446,8 @@ llvm::Value* DecimalIR::CallDecimalFunction(const std::string& function_name,
 // Make call to pre-compiled IR function.
 ir_builder()->CreateCall(module()->getFunction(function_name), dis_assembled_args);

 auto out_high = CreateLoad(ir_builder(), out_high_ptr);
 auto out_low = CreateLoad(ir_builder(), out_low_ptr);
 auto out_high = ir_builder()->CreateLoad(i64, out_high_ptr);
 auto out_low = ir_builder()->CreateLoad(i64, out_low_ptr);
 result = ValueSplit(out_high, out_low).AsInt128(this);
 } else {
 DCHECK_NE(return_type, types()->void_type());
Expand Down

8 changes: 4 additions & 4 deletions
cpp/src/gandiva/engine.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -234,11 +234,11 @@ Status Engine::LoadPreCompiledIR() {
 Status::CodeGenError("Could not load module from IR: ",
 buffer_or_error.getError().message()));

 std::unique_ptr<llvm::MemoryBuffer> buffer = move(buffer_or_error.get());
 std::unique_ptr<llvm::MemoryBuffer> buffer = std::move(buffer_or_error.get());

 /// Parse the IR module.
 llvm::Expected<std::unique_ptr<llvm::Module>> module_or_error =
 llvm::getOwningLazyBitcodeModule(move(buffer), *context());
 llvm::getOwningLazyBitcodeModule(std::move(buffer), *context());
 if (!module_or_error) {
 // NOTE: llvm::handleAllErrors() fails linking with RTTI-disabled LLVM builds
 // (ARROW-5148)
Expand All@@ -247,14 +247,14 @@ Status Engine::LoadPreCompiledIR() {
 stream << module_or_error.takeError();
 return Status::CodeGenError(stream.str());
 }
 std::unique_ptr<llvm::Module> ir_module = move(module_or_error.get());
 std::unique_ptr<llvm::Module> ir_module = std::move(module_or_error.get());

 // set dataLayout
 SetDataLayout(ir_module.get());

 ARROW_RETURN_IF(llvm::verifyModule(*ir_module, &llvm::errs()),
 Status::CodeGenError("verify of IR Module failed"));
 ARROW_RETURN_IF(llvm::Linker::linkModules(*module_, move(ir_module)),
 ARROW_RETURN_IF(llvm::Linker::linkModules(*module_, std::move(ir_module)),
 Status::CodeGenError("failed to link IR Modules"));

 return Status::OK();
Expand Down

5 changes: 3 additions & 2 deletions
cpp/src/gandiva/engine_llvm_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,8 +80,9 @@ class TestEngine : public ::testing::Test {
 loop_var->addIncoming(loop_update, loop_body);

 // get the current value
 llvm::Value* offset = CreateGEP(builder, arg_elements, loop_var, "offset");
 llvm::Value* current_value = CreateLoad(builder, offset, "value");
 llvm::Value* offset =
 builder->CreateGEP(types->i64_type(), arg_elements, loop_var, "offset");
 llvm::Value* current_value = builder->CreateLoad(types->i64_type(), offset, "value");

 // setup sum PHI
 llvm::Value* sum_update = builder->CreateAdd(sum, current_value, "sum+ith");
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-17790: [C++][Gandiva] Adapt to LLVM opaque pointer#14187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pitrou
merged 7 commits into

from

Sep 22, 2022
 Merged


ARROW-17790: [C++][Gandiva] Adapt to LLVM opaque pointer
#14187
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
cce529c

adapt llvm opaque pointer


js8544 Sep 20, 2022
a079a23

remove GetBufferRefence type param since it's always i64


js8544 Sep 20, 2022
9ee60db

remove GetLocalBitMapReference type param since it's always i64


js8544 Sep 20, 2022
fbd8ff6

use brew version of clang, to be consistent with installed LLVM lib


js8544 Sep 20, 2022
66353c9

fix clang-15 compatibility

Sep 21, 2022
80f7750

misc

Sep 22, 2022
266e915

increase c++ ci time to 75

Sep 22, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 7 additions & 3 deletions
.github/workflows/cpp.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ jobs:
 name: ${{ matrix.title }}
 runs-on: ubuntu-latest
 if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
 timeout-minutes: 60
 timeout-minutes: 75
 strategy:
 fail-fast: false
 matrix:
Expand DownExpand Up@@ -122,7 +122,7 @@ jobs:
 name: AMD64 macOS 11 C++
 runs-on: macos-latest
 if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
 timeout-minutes: 60
 timeout-minutes: 75
 strategy:
 fail-fast: false
 env:
Expand DownExpand Up@@ -179,7 +179,11 @@ jobs:
 key: cpp-ccache-macos-${{ hashFiles('cpp/**') }}
 restore-keys: cpp-ccache-macos-
 - name: Build
 run: ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 # use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
 run: |
 export CC=$(brew --prefix llvm)/bin/clang
 export CXX=$(brew --prefix llvm)/bin/clang++
 ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 - name: Test
 shell: bash
 run: |
Expand Down

3 changes: 3 additions & 0 deletions
.github/workflows/python.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,10 @@ jobs:
 -r python/requirements-test.txt
 - name: Build
 shell: bash
 # use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
 run: |
 export CC=$(brew --prefix llvm)/bin/clang
 export CXX=$(brew --prefix llvm)/bin/clang++
 export PYTHON=python3
 ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 ci/scripts/python_build.sh $(pwd) $(pwd)/build
Expand Down

3 changes: 3 additions & 0 deletions
.github/workflows/ruby.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,10 @@ jobs:
 key: ruby-ccache-macos-${{ hashFiles('cpp/**') }}
 restore-keys: ruby-ccache-macos-
 - name: Build C++
 # use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
 run: |
 export CC=$(brew --prefix llvm)/bin/clang
 export CXX=$(brew --prefix llvm)/bin/clang++
 ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 - name: Build GLib
 run: |
Expand Down

3 changes: 0 additions & 3 deletions
cpp/src/arrow/array/array_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2831,8 +2831,6 @@ class DecimalTest : public ::testing::TestWithParam<int> {
 auto type = std::make_shared<TYPE>(precision, 4);
 auto builder = std::make_shared<DecimalBuilder>(type);

 size_t null_count = 0;

 const size_t size = draw.size();

 ARROW_EXPECT_OK(builder->Reserve(size));
Expand All@@ -2842,7 +2840,6 @@ class DecimalTest : public ::testing::TestWithParam<int> {
 ARROW_EXPECT_OK(builder->Append(draw[i]));
 } else {
 ARROW_EXPECT_OK(builder->AppendNull());
 ++null_count;
 }
 }

Expand Down

1 change: 1 addition & 0 deletions
cpp/src/arrow/filesystem/gcsfs_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@

#include <algorithm> // Missing include in boost/process

#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// This boost/asio/io_context.hpp include is needless for no MinGW
// build.
//
Expand Down

1 change: 1 addition & 0 deletions
cpp/src/arrow/filesystem/s3_test_util.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
#ifdef __MINGW32__
#include <boost/asio/io_context.hpp>
#endif
#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// We need BOOST_USE_WINDOWS_H definition with MinGW when we use
// boost/process.hpp. See BOOST_USE_WINDOWS_H=1 in
// cpp/cmake_modules/ThirdpartyToolchain.cmake for details.
Expand Down

3 changes: 2 additions & 1 deletion
cpp/src/arrow/flight/test_util.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,11 +30,12 @@
// We need Windows fixes before including Boost
#include "arrow/util/windows_compatibility.h"

#include <gtest/gtest.h>
#include <boost/filesystem.hpp>
#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// We need BOOST_USE_WINDOWS_H definition with MinGW when we use
// boost/process.hpp. See BOOST_USE_WINDOWS_H=1 in
// cpp/cmake_modules/ThirdpartyToolchain.cmake for details.
#include <gtest/gtest.h>
#include <boost/process.hpp>

#include "arrow/array.h"
Expand Down

13 changes: 7 additions & 6 deletions
cpp/src/gandiva/decimal_ir.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,8 +96,9 @@ void DecimalIR::InitializeIntrinsics() {
// CPP: return kScaleMultipliers[scale]
llvm::Value* DecimalIR::GetScaleMultiplier(llvm::Value* scale) {
 auto const_array = module()->getGlobalVariable(kScaleMultipliersName);
 auto ptr = CreateGEP(ir_builder(), const_array, {types()->i32_constant(0), scale});
 return CreateLoad(ir_builder(), ptr);
 auto ptr = ir_builder()->CreateGEP(const_array->getValueType(), const_array,
 {types()->i32_constant(0), scale});
 return ir_builder()->CreateLoad(types()->i128_type(), ptr);
}

// CPP: x <= y ? y : x
Expand DownExpand Up@@ -248,8 +249,8 @@ llvm::Value* DecimalIR::AddLarge(const ValueFull& x, const ValueFull& y,
 ir_builder()->CreateCall(module()->getFunction("add_large_decimal128_decimal128"),
 args);

 auto out_high = CreateLoad(ir_builder(), out_high_ptr);
 auto out_low = CreateLoad(ir_builder(), out_low_ptr);
 auto out_high = ir_builder()->CreateLoad(types()->i64_type(), out_high_ptr);
 auto out_low = ir_builder()->CreateLoad(types()->i64_type(), out_low_ptr);
 auto sum = ValueSplit(out_high, out_low).AsInt128(this);
 ADD_TRACE_128("AddLarge : sum", sum);
 return sum;
Expand DownExpand Up@@ -445,8 +446,8 @@ llvm::Value* DecimalIR::CallDecimalFunction(const std::string& function_name,
 // Make call to pre-compiled IR function.
 ir_builder()->CreateCall(module()->getFunction(function_name), dis_assembled_args);

 auto out_high = CreateLoad(ir_builder(), out_high_ptr);
 auto out_low = CreateLoad(ir_builder(), out_low_ptr);
 auto out_high = ir_builder()->CreateLoad(i64, out_high_ptr);
 auto out_low = ir_builder()->CreateLoad(i64, out_low_ptr);
 result = ValueSplit(out_high, out_low).AsInt128(this);
 } else {
 DCHECK_NE(return_type, types()->void_type());
Expand Down

8 changes: 4 additions & 4 deletions
cpp/src/gandiva/engine.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -234,11 +234,11 @@ Status Engine::LoadPreCompiledIR() {
 Status::CodeGenError("Could not load module from IR: ",
 buffer_or_error.getError().message()));

 std::unique_ptr<llvm::MemoryBuffer> buffer = move(buffer_or_error.get());
 std::unique_ptr<llvm::MemoryBuffer> buffer = std::move(buffer_or_error.get());

 /// Parse the IR module.
 llvm::Expected<std::unique_ptr<llvm::Module>> module_or_error =
 llvm::getOwningLazyBitcodeModule(move(buffer), *context());
 llvm::getOwningLazyBitcodeModule(std::move(buffer), *context());
 if (!module_or_error) {
 // NOTE: llvm::handleAllErrors() fails linking with RTTI-disabled LLVM builds
 // (ARROW-5148)
Expand All@@ -247,14 +247,14 @@ Status Engine::LoadPreCompiledIR() {
 stream << module_or_error.takeError();
 return Status::CodeGenError(stream.str());
 }
 std::unique_ptr<llvm::Module> ir_module = move(module_or_error.get());
 std::unique_ptr<llvm::Module> ir_module = std::move(module_or_error.get());

 // set dataLayout
 SetDataLayout(ir_module.get());

 ARROW_RETURN_IF(llvm::verifyModule(*ir_module, &llvm::errs()),
 Status::CodeGenError("verify of IR Module failed"));
 ARROW_RETURN_IF(llvm::Linker::linkModules(*module_, move(ir_module)),
 ARROW_RETURN_IF(llvm::Linker::linkModules(*module_, std::move(ir_module)),
 Status::CodeGenError("failed to link IR Modules"));

 return Status::OK();
Expand Down

5 changes: 3 additions & 2 deletions
cpp/src/gandiva/engine_llvm_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,8 +80,9 @@ class TestEngine : public ::testing::Test {
 loop_var->addIncoming(loop_update, loop_body);

 // get the current value
 llvm::Value* offset = CreateGEP(builder, arg_elements, loop_var, "offset");
 llvm::Value* current_value = CreateLoad(builder, offset, "value");
 llvm::Value* offset =
 builder->CreateGEP(types->i64_type(), arg_elements, loop_var, "offset");
 llvm::Value* current_value = builder->CreateLoad(types->i64_type(), offset, "value");

 // setup sum PHI
 llvm::Value* sum_update = builder->CreateAdd(sum, current_value, "sum+ith");
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-17790: [C++][Gandiva] Adapt to LLVM opaque pointer#14187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pitrou
merged 7 commits into

from

Sep 22, 2022
 Merged


ARROW-17790: [C++][Gandiva] Adapt to LLVM opaque pointer
#14187
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
cce529c

adapt llvm opaque pointer


js8544 Sep 20, 2022
a079a23

remove GetBufferRefence type param since it's always i64


js8544 Sep 20, 2022
9ee60db

remove GetLocalBitMapReference type param since it's always i64


js8544 Sep 20, 2022
fbd8ff6

use brew version of clang, to be consistent with installed LLVM lib


js8544 Sep 20, 2022
66353c9

fix clang-15 compatibility

Sep 21, 2022
80f7750

misc

Sep 22, 2022
266e915

increase c++ ci time to 75

Sep 22, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 7 additions & 3 deletions
.github/workflows/cpp.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ jobs:
 name: ${{ matrix.title }}
 runs-on: ubuntu-latest
 if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
 timeout-minutes: 60
 timeout-minutes: 75
 strategy:
 fail-fast: false
 matrix:
Expand DownExpand Up@@ -122,7 +122,7 @@ jobs:
 name: AMD64 macOS 11 C++
 runs-on: macos-latest
 if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
 timeout-minutes: 60
 timeout-minutes: 75
 strategy:
 fail-fast: false
 env:
Expand DownExpand Up@@ -179,7 +179,11 @@ jobs:
 key: cpp-ccache-macos-${{ hashFiles('cpp/**') }}
 restore-keys: cpp-ccache-macos-
 - name: Build
 run: ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 # use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
 run: |
 export CC=$(brew --prefix llvm)/bin/clang
 export CXX=$(brew --prefix llvm)/bin/clang++
 ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 - name: Test
 shell: bash
 run: |
Expand Down

3 changes: 3 additions & 0 deletions
.github/workflows/python.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,10 @@ jobs:
 -r python/requirements-test.txt
 - name: Build
 shell: bash
 # use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
 run: |
 export CC=$(brew --prefix llvm)/bin/clang
 export CXX=$(brew --prefix llvm)/bin/clang++
 export PYTHON=python3
 ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 ci/scripts/python_build.sh $(pwd) $(pwd)/build
Expand Down

3 changes: 3 additions & 0 deletions
.github/workflows/ruby.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,10 @@ jobs:
 key: ruby-ccache-macos-${{ hashFiles('cpp/**') }}
 restore-keys: ruby-ccache-macos-
 - name: Build C++
 # use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
 run: |
 export CC=$(brew --prefix llvm)/bin/clang
 export CXX=$(brew --prefix llvm)/bin/clang++
 ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 - name: Build GLib
 run: |
Expand Down

3 changes: 0 additions & 3 deletions
cpp/src/arrow/array/array_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2831,8 +2831,6 @@ class DecimalTest : public ::testing::TestWithParam<int> {
 auto type = std::make_shared<TYPE>(precision, 4);
 auto builder = std::make_shared<DecimalBuilder>(type);

 size_t null_count = 0;

 const size_t size = draw.size();

 ARROW_EXPECT_OK(builder->Reserve(size));
Expand All@@ -2842,7 +2840,6 @@ class DecimalTest : public ::testing::TestWithParam<int> {
 ARROW_EXPECT_OK(builder->Append(draw[i]));
 } else {
 ARROW_EXPECT_OK(builder->AppendNull());
 ++null_count;
 }
 }

Expand Down

1 change: 1 addition & 0 deletions
cpp/src/arrow/filesystem/gcsfs_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@

#include <algorithm> // Missing include in boost/process

#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// This boost/asio/io_context.hpp include is needless for no MinGW
// build.
//
Expand Down

1 change: 1 addition & 0 deletions
cpp/src/arrow/filesystem/s3_test_util.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
#ifdef __MINGW32__
#include <boost/asio/io_context.hpp>
#endif
#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// We need BOOST_USE_WINDOWS_H definition with MinGW when we use
// boost/process.hpp. See BOOST_USE_WINDOWS_H=1 in
// cpp/cmake_modules/ThirdpartyToolchain.cmake for details.
Expand Down

3 changes: 2 additions & 1 deletion
cpp/src/arrow/flight/test_util.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,11 +30,12 @@
// We need Windows fixes before including Boost
#include "arrow/util/windows_compatibility.h"

#include <gtest/gtest.h>
#include <boost/filesystem.hpp>
#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// We need BOOST_USE_WINDOWS_H definition with MinGW when we use
// boost/process.hpp. See BOOST_USE_WINDOWS_H=1 in
// cpp/cmake_modules/ThirdpartyToolchain.cmake for details.
#include <gtest/gtest.h>
#include <boost/process.hpp>

#include "arrow/array.h"
Expand Down

13 changes: 7 additions & 6 deletions
cpp/src/gandiva/decimal_ir.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,8 +96,9 @@ void DecimalIR::InitializeIntrinsics() {
// CPP: return kScaleMultipliers[scale]
llvm::Value* DecimalIR::GetScaleMultiplier(llvm::Value* scale) {
 auto const_array = module()->getGlobalVariable(kScaleMultipliersName);
 auto ptr = CreateGEP(ir_builder(), const_array, {types()->i32_constant(0), scale});
 return CreateLoad(ir_builder(), ptr);
 auto ptr = ir_builder()->CreateGEP(const_array->getValueType(), const_array,
 {types()->i32_constant(0), scale});
 return ir_builder()->CreateLoad(types()->i128_type(), ptr);
}

// CPP: x <= y ? y : x
Expand DownExpand Up@@ -248,8 +249,8 @@ llvm::Value* DecimalIR::AddLarge(const ValueFull& x, const ValueFull& y,
 ir_builder()->CreateCall(module()->getFunction("add_large_decimal128_decimal128"),
 args);

 auto out_high = CreateLoad(ir_builder(), out_high_ptr);
 auto out_low = CreateLoad(ir_builder(), out_low_ptr);
 auto out_high = ir_builder()->CreateLoad(types()->i64_type(), out_high_ptr);
 auto out_low = ir_builder()->CreateLoad(types()->i64_type(), out_low_ptr);
 auto sum = ValueSplit(out_high, out_low).AsInt128(this);
 ADD_TRACE_128("AddLarge : sum", sum);
 return sum;
Expand DownExpand Up@@ -445,8 +446,8 @@ llvm::Value* DecimalIR::CallDecimalFunction(const std::string& function_name,
 // Make call to pre-compiled IR function.
 ir_builder()->CreateCall(module()->getFunction(function_name), dis_assembled_args);

 auto out_high = CreateLoad(ir_builder(), out_high_ptr);
 auto out_low = CreateLoad(ir_builder(), out_low_ptr);
 auto out_high = ir_builder()->CreateLoad(i64, out_high_ptr);
 auto out_low = ir_builder()->CreateLoad(i64, out_low_ptr);
 result = ValueSplit(out_high, out_low).AsInt128(this);
 } else {
 DCHECK_NE(return_type, types()->void_type());
Expand Down

8 changes: 4 additions & 4 deletions
cpp/src/gandiva/engine.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -234,11 +234,11 @@ Status Engine::LoadPreCompiledIR() {
 Status::CodeGenError("Could not load module from IR: ",
 buffer_or_error.getError().message()));

 std::unique_ptr<llvm::MemoryBuffer> buffer = move(buffer_or_error.get());
 std::unique_ptr<llvm::MemoryBuffer> buffer = std::move(buffer_or_error.get());

 /// Parse the IR module.
 llvm::Expected<std::unique_ptr<llvm::Module>> module_or_error =
 llvm::getOwningLazyBitcodeModule(move(buffer), *context());
 llvm::getOwningLazyBitcodeModule(std::move(buffer), *context());
 if (!module_or_error) {
 // NOTE: llvm::handleAllErrors() fails linking with RTTI-disabled LLVM builds
 // (ARROW-5148)
Expand All@@ -247,14 +247,14 @@ Status Engine::LoadPreCompiledIR() {
 stream << module_or_error.takeError();
 return Status::CodeGenError(stream.str());
 }
 std::unique_ptr<llvm::Module> ir_module = move(module_or_error.get());
 std::unique_ptr<llvm::Module> ir_module = std::move(module_or_error.get());

 // set dataLayout
 SetDataLayout(ir_module.get());

 ARROW_RETURN_IF(llvm::verifyModule(*ir_module, &llvm::errs()),
 Status::CodeGenError("verify of IR Module failed"));
 ARROW_RETURN_IF(llvm::Linker::linkModules(*module_, move(ir_module)),
 ARROW_RETURN_IF(llvm::Linker::linkModules(*module_, std::move(ir_module)),
 Status::CodeGenError("failed to link IR Modules"));

 return Status::OK();
Expand Down

5 changes: 3 additions & 2 deletions
cpp/src/gandiva/engine_llvm_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,8 +80,9 @@ class TestEngine : public ::testing::Test {
 loop_var->addIncoming(loop_update, loop_body);

 // get the current value
 llvm::Value* offset = CreateGEP(builder, arg_elements, loop_var, "offset");
 llvm::Value* current_value = CreateLoad(builder, offset, "value");
 llvm::Value* offset =
 builder->CreateGEP(types->i64_type(), arg_elements, loop_var, "offset");
 llvm::Value* current_value = builder->CreateLoad(types->i64_type(), offset, "value");

 // setup sum PHI
 llvm::Value* sum_update = builder->CreateAdd(sum, current_value, "sum+ith");
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ARROW-17790: [C++][Gandiva] Adapt to LLVM opaque pointer#14187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pitrou
merged 7 commits into

from

Sep 22, 2022
 Merged


ARROW-17790: [C++][Gandiva] Adapt to LLVM opaque pointer
#14187
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
cce529c

adapt llvm opaque pointer


js8544 Sep 20, 2022
a079a23

remove GetBufferRefence type param since it's always i64


js8544 Sep 20, 2022
9ee60db

remove GetLocalBitMapReference type param since it's always i64


js8544 Sep 20, 2022
fbd8ff6

use brew version of clang, to be consistent with installed LLVM lib


js8544 Sep 20, 2022
66353c9

fix clang-15 compatibility

Sep 21, 2022
80f7750

misc

Sep 22, 2022
266e915

increase c++ ci time to 75

Sep 22, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 7 additions & 3 deletions
.github/workflows/cpp.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ jobs:
 name: ${{ matrix.title }}
 runs-on: ubuntu-latest
 if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
 timeout-minutes: 60
 timeout-minutes: 75
 strategy:
 fail-fast: false
 matrix:
Expand DownExpand Up@@ -122,7 +122,7 @@ jobs:
 name: AMD64 macOS 11 C++
 runs-on: macos-latest
 if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
 timeout-minutes: 60
 timeout-minutes: 75
 strategy:
 fail-fast: false
 env:
Expand DownExpand Up@@ -179,7 +179,11 @@ jobs:
 key: cpp-ccache-macos-${{ hashFiles('cpp/**') }}
 restore-keys: cpp-ccache-macos-
 - name: Build
 run: ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 # use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
 run: |
 export CC=$(brew --prefix llvm)/bin/clang
 export CXX=$(brew --prefix llvm)/bin/clang++
 ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 - name: Test
 shell: bash
 run: |
Expand Down

3 changes: 3 additions & 0 deletions
.github/workflows/python.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,10 @@ jobs:
 -r python/requirements-test.txt
 - name: Build
 shell: bash
 # use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
 run: |
 export CC=$(brew --prefix llvm)/bin/clang
 export CXX=$(brew --prefix llvm)/bin/clang++
 export PYTHON=python3
 ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 ci/scripts/python_build.sh $(pwd) $(pwd)/build
Expand Down

3 changes: 3 additions & 0 deletions
.github/workflows/ruby.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,7 +164,10 @@ jobs:
 key: ruby-ccache-macos-${{ hashFiles('cpp/**') }}
 restore-keys: ruby-ccache-macos-
 - name: Build C++
 # use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
 run: |
 export CC=$(brew --prefix llvm)/bin/clang
 export CXX=$(brew --prefix llvm)/bin/clang++
 ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
 - name: Build GLib
 run: |
Expand Down

3 changes: 0 additions & 3 deletions
cpp/src/arrow/array/array_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2831,8 +2831,6 @@ class DecimalTest : public ::testing::TestWithParam<int> {
 auto type = std::make_shared<TYPE>(precision, 4);
 auto builder = std::make_shared<DecimalBuilder>(type);

 size_t null_count = 0;

 const size_t size = draw.size();

 ARROW_EXPECT_OK(builder->Reserve(size));
Expand All@@ -2842,7 +2840,6 @@ class DecimalTest : public ::testing::TestWithParam<int> {
 ARROW_EXPECT_OK(builder->Append(draw[i]));
 } else {
 ARROW_EXPECT_OK(builder->AppendNull());
 ++null_count;
 }
 }

Expand Down

1 change: 1 addition & 0 deletions
cpp/src/arrow/filesystem/gcsfs_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@

#include <algorithm> // Missing include in boost/process

#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// This boost/asio/io_context.hpp include is needless for no MinGW
// build.
//
Expand Down

1 change: 1 addition & 0 deletions
cpp/src/arrow/filesystem/s3_test_util.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
#ifdef __MINGW32__
#include <boost/asio/io_context.hpp>
#endif
#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// We need BOOST_USE_WINDOWS_H definition with MinGW when we use
// boost/process.hpp. See BOOST_USE_WINDOWS_H=1 in
// cpp/cmake_modules/ThirdpartyToolchain.cmake for details.
Expand Down

3 changes: 2 additions & 1 deletion
cpp/src/arrow/flight/test_util.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,11 +30,12 @@
// We need Windows fixes before including Boost
#include "arrow/util/windows_compatibility.h"

#include <gtest/gtest.h>
#include <boost/filesystem.hpp>
#define BOOST_NO_CXX98_FUNCTION_BASE // ARROW-17805
// We need BOOST_USE_WINDOWS_H definition with MinGW when we use
// boost/process.hpp. See BOOST_USE_WINDOWS_H=1 in
// cpp/cmake_modules/ThirdpartyToolchain.cmake for details.
#include <gtest/gtest.h>
#include <boost/process.hpp>

#include "arrow/array.h"
Expand Down

13 changes: 7 additions & 6 deletions
cpp/src/gandiva/decimal_ir.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,8 +96,9 @@ void DecimalIR::InitializeIntrinsics() {
// CPP: return kScaleMultipliers[scale]
llvm::Value* DecimalIR::GetScaleMultiplier(llvm::Value* scale) {
 auto const_array = module()->getGlobalVariable(kScaleMultipliersName);
 auto ptr = CreateGEP(ir_builder(), const_array, {types()->i32_constant(0), scale});
 return CreateLoad(ir_builder(), ptr);
 auto ptr = ir_builder()->CreateGEP(const_array->getValueType(), const_array,
 {types()->i32_constant(0), scale});
 return ir_builder()->CreateLoad(types()->i128_type(), ptr);
}

// CPP: x <= y ? y : x
Expand DownExpand Up@@ -248,8 +249,8 @@ llvm::Value* DecimalIR::AddLarge(const ValueFull& x, const ValueFull& y,
 ir_builder()->CreateCall(module()->getFunction("add_large_decimal128_decimal128"),
 args);

 auto out_high = CreateLoad(ir_builder(), out_high_ptr);
 auto out_low = CreateLoad(ir_builder(), out_low_ptr);
 auto out_high = ir_builder()->CreateLoad(types()->i64_type(), out_high_ptr);
 auto out_low = ir_builder()->CreateLoad(types()->i64_type(), out_low_ptr);
 auto sum = ValueSplit(out_high, out_low).AsInt128(this);
 ADD_TRACE_128("AddLarge : sum", sum);
 return sum;
Expand DownExpand Up@@ -445,8 +446,8 @@ llvm::Value* DecimalIR::CallDecimalFunction(const std::string& function_name,
 // Make call to pre-compiled IR function.
 ir_builder()->CreateCall(module()->getFunction(function_name), dis_assembled_args);

 auto out_high = CreateLoad(ir_builder(), out_high_ptr);
 auto out_low = CreateLoad(ir_builder(), out_low_ptr);
 auto out_high = ir_builder()->CreateLoad(i64, out_high_ptr);
 auto out_low = ir_builder()->CreateLoad(i64, out_low_ptr);
 result = ValueSplit(out_high, out_low).AsInt128(this);
 } else {
 DCHECK_NE(return_type, types()->void_type());
Expand Down

8 changes: 4 additions & 4 deletions
cpp/src/gandiva/engine.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -234,11 +234,11 @@ Status Engine::LoadPreCompiledIR() {
 Status::CodeGenError("Could not load module from IR: ",
 buffer_or_error.getError().message()));

 std::unique_ptr<llvm::MemoryBuffer> buffer = move(buffer_or_error.get());
 std::unique_ptr<llvm::MemoryBuffer> buffer = std::move(buffer_or_error.get());

 /// Parse the IR module.
 llvm::Expected<std::unique_ptr<llvm::Module>> module_or_error =
 llvm::getOwningLazyBitcodeModule(move(buffer), *context());
 llvm::getOwningLazyBitcodeModule(std::move(buffer), *context());
 if (!module_or_error) {
 // NOTE: llvm::handleAllErrors() fails linking with RTTI-disabled LLVM builds
 // (ARROW-5148)
Expand All@@ -247,14 +247,14 @@ Status Engine::LoadPreCompiledIR() {
 stream << module_or_error.takeError();
 return Status::CodeGenError(stream.str());
 }
 std::unique_ptr<llvm::Module> ir_module = move(module_or_error.get());
 std::unique_ptr<llvm::Module> ir_module = std::move(module_or_error.get());

 // set dataLayout
 SetDataLayout(ir_module.get());

 ARROW_RETURN_IF(llvm::verifyModule(*ir_module, &llvm::errs()),
 Status::CodeGenError("verify of IR Module failed"));
 ARROW_RETURN_IF(llvm::Linker::linkModules(*module_, move(ir_module)),
 ARROW_RETURN_IF(llvm::Linker::linkModules(*module_, std::move(ir_module)),
 Status::CodeGenError("failed to link IR Modules"));

 return Status::OK();
Expand Down

5 changes: 3 additions & 2 deletions
cpp/src/gandiva/engine_llvm_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,8 +80,9 @@ class TestEngine : public ::testing::Test {
 loop_var->addIncoming(loop_update, loop_body);

 // get the current value
 llvm::Value* offset = CreateGEP(builder, arg_elements, loop_var, "offset");
 llvm::Value* current_value = CreateLoad(builder, offset, "value");
 llvm::Value* offset =
 builder->CreateGEP(types->i64_type(), arg_elements, loop_var, "offset");
 llvm::Value* current_value = builder->CreateLoad(types->i64_type(), offset, "value");

 // setup sum PHI
 llvm::Value* sum_update = builder->CreateAdd(sum, current_value, "sum+ith");
Expand Down
Loading