Revert "Rework go bindings so that validation works fine"

And add llvm-go back to the test dependencies.

No longer necessary now that llvm-go has been brought back.

This reverts commit e8f8873da5eaad187f82dad78ebdb3ab3df22b36.

diff --git a/llvm/bindings/go/build.sh b/llvm/bindings/go/build.sh
new file mode 100755 (executable)
index 0000000..3177852
--- /dev/null
+++ b/llvm/bindings/go/build.sh
@@ -0,0 +1,28 @@
+#!/bin/sh -xe
+
+gollvmdir=$(dirname "$0")/llvm
+
+workdir=$gollvmdir/workdir
+llvmdir=$gollvmdir/../../..
+llvm_builddir=$workdir/llvm_build
+
+mkdir -p $llvm_builddir
+
+cmake_flags="../../../../.. $@"
+llvm_config="$llvm_builddir/bin/llvm-config"
+llvm_go="$llvm_builddir/bin/llvm-go"
+
+if test -n "`which ninja`" ; then
+  # If Ninja is available, we can speed up the build by building only the
+  # required subset of LLVM.
+  (cd $llvm_builddir && cmake -G Ninja $cmake_flags)
+  ninja -C $llvm_builddir llvm-config llvm-go
+  llvm_components="$($llvm_go print-components)"
+  llvm_buildtargets="$($llvm_config --libs $llvm_components | sed -e 's/-l//g')"
+  ninja -C $llvm_builddir $llvm_buildtargets FileCheck
+else
+  (cd $llvm_builddir && cmake $cmake_flags)
+  make -C $llvm_builddir -j4
+fi
+
+$llvm_go print-config > $gollvmdir/llvm_config.go

diff --git a/llvm/bindings/go/src/llvm/IRBindings.cpp b/llvm/bindings/go/llvm/IRBindings.cpp
similarity index 100%
rename from llvm/bindings/go/src/llvm/IRBindings.cpp
rename to llvm/bindings/go/llvm/IRBindings.cpp

diff --git a/llvm/bindings/go/src/llvm/IRBindings.h b/llvm/bindings/go/llvm/IRBindings.h
similarity index 100%
rename from llvm/bindings/go/src/llvm/IRBindings.h
rename to llvm/bindings/go/llvm/IRBindings.h

diff --git a/llvm/bindings/go/src/llvm/InstrumentationBindings.cpp b/llvm/bindings/go/llvm/InstrumentationBindings.cpp
similarity index 100%
rename from llvm/bindings/go/src/llvm/InstrumentationBindings.cpp
rename to llvm/bindings/go/llvm/InstrumentationBindings.cpp

diff --git a/llvm/bindings/go/src/llvm/InstrumentationBindings.h b/llvm/bindings/go/llvm/InstrumentationBindings.h
similarity index 100%
rename from llvm/bindings/go/src/llvm/InstrumentationBindings.h
rename to llvm/bindings/go/llvm/InstrumentationBindings.h

diff --git a/llvm/bindings/go/src/llvm/SupportBindings.cpp b/llvm/bindings/go/llvm/SupportBindings.cpp
similarity index 100%
rename from llvm/bindings/go/src/llvm/SupportBindings.cpp
rename to llvm/bindings/go/llvm/SupportBindings.cpp

diff --git a/llvm/bindings/go/src/llvm/SupportBindings.h b/llvm/bindings/go/llvm/SupportBindings.h
similarity index 100%
rename from llvm/bindings/go/src/llvm/SupportBindings.h
rename to llvm/bindings/go/llvm/SupportBindings.h

diff --git a/llvm/bindings/go/src/llvm/analysis.go b/llvm/bindings/go/llvm/analysis.go
similarity index 100%
rename from llvm/bindings/go/src/llvm/analysis.go
rename to llvm/bindings/go/llvm/analysis.go

diff --git a/llvm/bindings/go/src/llvm/bitreader.go b/llvm/bindings/go/llvm/bitreader.go
similarity index 100%
rename from llvm/bindings/go/src/llvm/bitreader.go
rename to llvm/bindings/go/llvm/bitreader.go

diff --git a/llvm/bindings/go/src/llvm/bitwriter.go b/llvm/bindings/go/llvm/bitwriter.go
similarity index 100%
rename from llvm/bindings/go/src/llvm/bitwriter.go
rename to llvm/bindings/go/llvm/bitwriter.go

diff --git a/llvm/bindings/go/src/llvm/dibuilder.go b/llvm/bindings/go/llvm/dibuilder.go
similarity index 100%
rename from llvm/bindings/go/src/llvm/dibuilder.go
rename to llvm/bindings/go/llvm/dibuilder.go

diff --git a/llvm/bindings/go/src/llvm/executionengine.go b/llvm/bindings/go/llvm/executionengine.go
similarity index 100%
rename from llvm/bindings/go/src/llvm/executionengine.go
rename to llvm/bindings/go/llvm/executionengine.go

diff --git a/llvm/bindings/go/src/llvm/executionengine_test.go b/llvm/bindings/go/llvm/executionengine_test.go
similarity index 100%
rename from llvm/bindings/go/src/llvm/executionengine_test.go
rename to llvm/bindings/go/llvm/executionengine_test.go

diff --git a/llvm/bindings/go/src/llvm/ir.go b/llvm/bindings/go/llvm/ir.go
similarity index 100%
rename from llvm/bindings/go/src/llvm/ir.go
rename to llvm/bindings/go/llvm/ir.go

diff --git a/llvm/bindings/go/src/llvm/ir_test.go b/llvm/bindings/go/llvm/ir_test.go
similarity index 100%
rename from llvm/bindings/go/src/llvm/ir_test.go
rename to llvm/bindings/go/llvm/ir_test.go

diff --git a/llvm/bindings/go/src/llvm/linker.go b/llvm/bindings/go/llvm/linker.go
similarity index 100%
rename from llvm/bindings/go/src/llvm/linker.go
rename to llvm/bindings/go/llvm/linker.go

diff --git a/llvm/bindings/go/src/llvm/llvm_config.go.in b/llvm/bindings/go/llvm/llvm_config.go.in
similarity index 100%
rename from llvm/bindings/go/src/llvm/llvm_config.go.in
rename to llvm/bindings/go/llvm/llvm_config.go.in

diff --git a/llvm/bindings/go/src/llvm/llvm_dep.go b/llvm/bindings/go/llvm/llvm_dep.go
similarity index 96%
rename from llvm/bindings/go/src/llvm/llvm_dep.go
rename to llvm/bindings/go/llvm/llvm_dep.go
index e3ccce0..9484e6d 100644 (file)
--- a/llvm/bindings/go/src/llvm/llvm_dep.go
+++ b/llvm/bindings/go/llvm/llvm_dep.go
@@ -14,3 +14,5 @@
 // +build !byollvm
 
 package llvm
+
+var _ run_build_sh

diff --git a/llvm/bindings/go/src/llvm/string.go b/llvm/bindings/go/llvm/string.go
similarity index 100%
rename from llvm/bindings/go/src/llvm/string.go
rename to llvm/bindings/go/llvm/string.go

diff --git a/llvm/bindings/go/src/llvm/string_test.go b/llvm/bindings/go/llvm/string_test.go
similarity index 100%
rename from llvm/bindings/go/src/llvm/string_test.go
rename to llvm/bindings/go/llvm/string_test.go

diff --git a/llvm/bindings/go/src/llvm/support.go b/llvm/bindings/go/llvm/support.go
similarity index 100%
rename from llvm/bindings/go/src/llvm/support.go
rename to llvm/bindings/go/llvm/support.go

diff --git a/llvm/bindings/go/src/llvm/target.go b/llvm/bindings/go/llvm/target.go
similarity index 100%
rename from llvm/bindings/go/src/llvm/target.go
rename to llvm/bindings/go/llvm/target.go

diff --git a/llvm/bindings/go/src/llvm/transforms_coroutines.go b/llvm/bindings/go/llvm/transforms_coroutines.go
similarity index 100%
rename from llvm/bindings/go/src/llvm/transforms_coroutines.go
rename to llvm/bindings/go/llvm/transforms_coroutines.go

diff --git a/llvm/bindings/go/src/llvm/transforms_instrumentation.go b/llvm/bindings/go/llvm/transforms_instrumentation.go
similarity index 100%
rename from llvm/bindings/go/src/llvm/transforms_instrumentation.go
rename to llvm/bindings/go/llvm/transforms_instrumentation.go

diff --git a/llvm/bindings/go/src/llvm/transforms_ipo.go b/llvm/bindings/go/llvm/transforms_ipo.go
similarity index 100%
rename from llvm/bindings/go/src/llvm/transforms_ipo.go
rename to llvm/bindings/go/llvm/transforms_ipo.go

diff --git a/llvm/bindings/go/src/llvm/transforms_pmbuilder.go b/llvm/bindings/go/llvm/transforms_pmbuilder.go
similarity index 100%
rename from llvm/bindings/go/src/llvm/transforms_pmbuilder.go
rename to llvm/bindings/go/llvm/transforms_pmbuilder.go

diff --git a/llvm/bindings/go/src/llvm/transforms_scalar.go b/llvm/bindings/go/llvm/transforms_scalar.go
similarity index 100%
rename from llvm/bindings/go/src/llvm/transforms_scalar.go
rename to llvm/bindings/go/llvm/transforms_scalar.go

diff --git a/llvm/bindings/go/src/llvm/version.go b/llvm/bindings/go/llvm/version.go
similarity index 100%
rename from llvm/bindings/go/src/llvm/version.go
rename to llvm/bindings/go/llvm/version.go

diff --git a/llvm/test/Bindings/Go/go.test b/llvm/test/Bindings/Go/go.test
index 5901ccb..bb39e6c 100644 (file)
--- a/llvm/test/Bindings/Go/go.test
+++ b/llvm/test/Bindings/Go/go.test
@@ -1,4 +1,4 @@
-; RUN: CGO_CPPFLAGS="`llvm-config --cppflags`" CGO_CXXFLAGS=-std=c++14 CGO_LDFLAGS="`llvm-config --ldflags --libs --system-libs all`" go test llvm
+; RUN: llvm-go test llvm.org/llvm/bindings/go/llvm
 
 ; REQUIRES: shell
 ; UNSUPPORTED: asan, ubsan, msan

diff --git a/llvm/test/Bindings/Go/lit.local.cfg b/llvm/test/Bindings/Go/lit.local.cfg
index 7c72c76..3021fc6 100644 (file)
--- a/llvm/test/Bindings/Go/lit.local.cfg
+++ b/llvm/test/Bindings/Go/lit.local.cfg
@@ -57,5 +57,4 @@ def fixup_compiler_path(compiler):
 
 config.environment['CC'] = fixup_compiler_path(config.host_cc)
 config.environment['CXX'] = fixup_compiler_path(config.host_cxx)
-config.environment['LD_LIBRARY_PATH'] = config.llvm_shlib_dir
-config.environment['GOPATH'] = os.path.join(config.llvm_src_root, 'bindings', 'go')
+config.environment['CGO_LDFLAGS'] = config.host_ldflags

diff --git a/llvm/test/CMakeLists.txt b/llvm/test/CMakeLists.txt
index fb19741..2f19963 100644 (file)
--- a/llvm/test/CMakeLists.txt
+++ b/llvm/test/CMakeLists.txt
@@ -122,6 +122,10 @@ if(TARGET LLVMgold)
   set(LLVM_TEST_DEPENDS ${LLVM_TEST_DEPENDS} LLVMgold)
 endif()
 
+if(TARGET llvm-go)
+  set(LLVM_TEST_DEPENDS ${LLVM_TEST_DEPENDS} llvm-go)
+endif()
+
 if(TARGET LTO)
   set(LLVM_TEST_DEPENDS ${LLVM_TEST_DEPENDS} LTO)
 endif()

diff --git a/llvm/test/lit.cfg.py b/llvm/test/lit.cfg.py
index 5789f9d..777322e 100644 (file)
--- a/llvm/test/lit.cfg.py
+++ b/llvm/test/lit.cfg.py
@@ -160,7 +160,7 @@ tools.extend([
 
 # The following tools are optional
 tools.extend([
-    ToolSubst('go', unresolved='ignore'),
+    ToolSubst('llvm-go', unresolved='ignore'),
     ToolSubst('llvm-mt', unresolved='ignore'),
     ToolSubst('Kaleidoscope-Ch3', unresolved='ignore'),
     ToolSubst('Kaleidoscope-Ch4', unresolved='ignore'),

diff --git a/llvm/utils/lit/lit/llvm/subst.py b/llvm/utils/lit/lit/llvm/subst.py
index c4a2692..4275b8a 100644 (file)
--- a/llvm/utils/lit/lit/llvm/subst.py
+++ b/llvm/utils/lit/lit/llvm/subst.py
@@ -23,7 +23,7 @@ class FindTool(object):
 
         if self.name == 'llc' and os.environ.get('LLVM_ENABLE_MACHINE_VERIFIER') == '1':
             command += ' -verify-machineinstrs'
-        elif self.name == 'go':
+        elif self.name == 'llvm-go':
             exe = getattr(config.config, 'go_executable', None)
             if exe:
                 command += ' go=' + exe