ci: add support for LLVM 15

Also switch to LLVM 15 for builds with a system-installed LLVM.

Author: aykevl

.circleci/config.yml

@@ -118,12 +118,12 @@ jobs:
     steps:
       - test-linux:
           llvm: "14"
-  test-llvm14-go119:
+  test-llvm15-go119:
     docker:
-      - image: golang:1.19beta1-buster
+      - image: golang:1.19-buster
     steps:
       - test-linux:
-          llvm: "14"
+          llvm: "15"
           fmt-check: false
 
 workflows:
@@ -132,6 +132,6 @@ workflows:
       # This tests our lowest supported versions of Go and LLVM, to make sure at
       # least the smoke tests still pass.
       - test-llvm14-go118
-      # This tests a beta version of Go. It should be removed once regular
-      # release builds are built using this version.
-      - test-llvm14-go119
+      # This tests a newer version of Go and LLVM. It should be removed once
+      # regular release builds are built using these versions.
+      - test-llvm15-go119

.github/workflows/build-macos.yml

@@ -108,7 +108,7 @@ jobs:
       - name: Install LLVM
         shell: bash
         run: |
-          HOMEBREW_NO_AUTO_UPDATE=1 brew install llvm@14
+          HOMEBREW_NO_AUTO_UPDATE=1 brew install llvm@14 # TODO: use LLVM 15
       - name: Checkout
         uses: actions/checkout@v2
       - name: Install Go
@@ -117,6 +117,6 @@ jobs:
           go-version: '1.18'
           cache: true
       - name: Build TinyGo
-        run: go install
+        run: go install -tags=llvm14 # TODO: remove -tags=llvm14
       - name: Check binary
         run: tinygo version

cgo/libclang_config_llvm14.go

@@ -1,5 +1,5 @@
-//go:build !byollvm
-// +build !byollvm
+//go:build !byollvm && llvm14
+// +build !byollvm,llvm14
 
 package cgo
 

cgo/libclang_config_llvm15.go

@@ -0,0 +1,16 @@
+//go:build !byollvm && !llvm14
+// +build !byollvm,!llvm14
+
+package cgo
+
+/*
+#cgo linux        CFLAGS:  -I/usr/lib/llvm-15/include
+#cgo darwin,amd64 CFLAGS:  -I/usr/local/opt/llvm@15/include
+#cgo darwin,arm64 CFLAGS:  -I/opt/homebrew/opt/llvm@15/include
+#cgo freebsd      CFLAGS:  -I/usr/local/llvm15/include
+#cgo linux        LDFLAGS: -L/usr/lib/llvm-15/lib -lclang
+#cgo darwin,amd64 LDFLAGS: -L/usr/local/opt/llvm@15/lib -lclang -lffi
+#cgo darwin,arm64 LDFLAGS: -L/opt/homebrew/opt/llvm@15/lib -lclang -lffi
+#cgo freebsd      LDFLAGS: -L/usr/local/llvm15/lib -lclang
+*/
+import "C"

compiler/intrinsics.go

@@ -7,6 +7,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/tinygo-org/tinygo/compiler/llvmutil"
 	"tinygo.org/x/go-llvm"
 )
 
@@ -44,7 +45,10 @@ func (b *builder) defineIntrinsicFunction() {
 // and will otherwise be lowered to regular libc memcpy/memmove calls.
 func (b *builder) createMemoryCopyImpl() {
 	b.createFunctionStart(true)
-	fnName := "llvm." + b.fn.Name() + ".p0i8.p0i8.i" + strconv.Itoa(b.uintptrType.IntTypeWidth())
+	fnName := "llvm." + b.fn.Name() + ".p0.p0.i" + strconv.Itoa(b.uintptrType.IntTypeWidth())
+	if llvmutil.Major() < 15 { // compatibility with LLVM 14
+		fnName = "llvm." + b.fn.Name() + ".p0i8.p0i8.i" + strconv.Itoa(b.uintptrType.IntTypeWidth())
+	}
 	llvmFn := b.mod.NamedFunction(fnName)
 	if llvmFn.IsNil() {
 		fnType := llvm.FunctionType(b.ctx.VoidType(), []llvm.Type{b.i8ptrType, b.i8ptrType, b.uintptrType, b.ctx.Int1Type()}, false)
@@ -64,7 +68,10 @@ func (b *builder) createMemoryCopyImpl() {
 // regular libc memset calls if they aren't optimized out in a different way.
 func (b *builder) createMemoryZeroImpl() {
 	b.createFunctionStart(true)
-	fnName := "llvm.memset.p0i8.i" + strconv.Itoa(b.uintptrType.IntTypeWidth())
+	fnName := "llvm.memset.p0.i" + strconv.Itoa(b.uintptrType.IntTypeWidth())
+	if llvmutil.Major() < 15 { // compatibility with LLVM 14
+		fnName = "llvm.memset.p0i8.i" + strconv.Itoa(b.uintptrType.IntTypeWidth())
+	}
 	llvmFn := b.mod.NamedFunction(fnName)
 	if llvmFn.IsNil() {
 		fnType := llvm.FunctionType(b.ctx.VoidType(), []llvm.Type{b.i8ptrType, b.ctx.Int8Type(), b.uintptrType, b.ctx.Int1Type()}, false)

compiler/llvmutil/llvm.go

@@ -7,7 +7,22 @@
 // places would be a big risk if only one of them is updated.
 package llvmutil
 
-import "tinygo.org/x/go-llvm"
+import (
+	"strconv"
+	"strings"
+
+	"tinygo.org/x/go-llvm"
+)
+
+// Major returns the LLVM major version.
+func Major() int {
+	llvmMajor, err := strconv.Atoi(strings.SplitN(llvm.Version, ".", 2)[0])
+	if err != nil {
+		// sanity check, should be unreachable
+		panic("could not parse LLVM version: " + err.Error())
+	}
+	return llvmMajor
+}
 
 // CreateEntryBlockAlloca creates a new alloca in the entry block, even though
 // the IR builder is located elsewhere. It assumes that the insert point is
@@ -78,25 +93,33 @@ func EmitLifetimeEnd(builder llvm.Builder, mod llvm.Module, ptr, size llvm.Value
 // getLifetimeStartFunc returns the llvm.lifetime.start intrinsic and creates it
 // first if it doesn't exist yet.
 func getLifetimeStartFunc(mod llvm.Module) (llvm.Type, llvm.Value) {
-	fn := mod.NamedFunction("llvm.lifetime.start.p0i8")
+	fnName := "llvm.lifetime.start.p0"
+	if Major() < 15 { // compatibility with LLVM 14
+		fnName = "llvm.lifetime.start.p0i8"
+	}
+	fn := mod.NamedFunction(fnName)
 	ctx := mod.Context()
 	i8ptrType := llvm.PointerType(ctx.Int8Type(), 0)
 	fnType := llvm.FunctionType(ctx.VoidType(), []llvm.Type{ctx.Int64Type(), i8ptrType}, false)
 	if fn.IsNil() {
-		fn = llvm.AddFunction(mod, "llvm.lifetime.start.p0i8", fnType)
+		fn = llvm.AddFunction(mod, fnName, fnType)
 	}
 	return fnType, fn
 }
 
 // getLifetimeEndFunc returns the llvm.lifetime.end intrinsic and creates it
 // first if it doesn't exist yet.
 func getLifetimeEndFunc(mod llvm.Module) (llvm.Type, llvm.Value) {
-	fn := mod.NamedFunction("llvm.lifetime.end.p0i8")
+	fnName := "llvm.lifetime.end.p0"
+	if Major() < 15 {
+		fnName = "llvm.lifetime.end.p0i8"
+	}
+	fn := mod.NamedFunction(fnName)
 	ctx := mod.Context()
 	i8ptrType := llvm.PointerType(ctx.Int8Type(), 0)
 	fnType := llvm.FunctionType(ctx.VoidType(), []llvm.Type{ctx.Int64Type(), i8ptrType}, false)
 	if fn.IsNil() {
-		fn = llvm.AddFunction(mod, "llvm.lifetime.end.p0i8", fnType)
+		fn = llvm.AddFunction(mod, fnName, fnType)
 	}
 	return fnType, fn
 }

compiler/symbol.go

@@ -10,6 +10,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/tinygo-org/tinygo/compiler/llvmutil"
 	"github.com/tinygo-org/tinygo/loader"
 	"golang.org/x/tools/go/ssa"
 	"tinygo.org/x/go-llvm"
@@ -353,7 +354,15 @@ func (c *compilerContext) addStandardDefinedAttributes(llvmFn llvm.Value) {
 	llvmFn.AddFunctionAttr(c.ctx.CreateEnumAttribute(llvm.AttributeKindID("nounwind"), 0))
 	if strings.Split(c.Triple, "-")[0] == "x86_64" {
 		// Required by the ABI.
-		llvmFn.AddFunctionAttr(c.ctx.CreateEnumAttribute(llvm.AttributeKindID("uwtable"), 0))
+		if llvmutil.Major() < 15 {
+			// Needed for LLVM 14 support.
+			llvmFn.AddFunctionAttr(c.ctx.CreateEnumAttribute(llvm.AttributeKindID("uwtable"), 0))
+		} else {
+			// The uwtable has two possible values: sync (1) or async (2). We
+			// use sync because we currently don't use async unwind tables.
+			// For details, see: https://llvm.org/docs/LangRef.html#function-attributes
+			llvmFn.AddFunctionAttr(c.ctx.CreateEnumAttribute(llvm.AttributeKindID("uwtable"), 1))
+		}
 	}
 }
 

go.mod

@@ -17,7 +17,7 @@ require (
 	golang.org/x/sys v0.0.0-20220829200755-d48e67d00261
 	golang.org/x/tools v0.1.11
 	gopkg.in/yaml.v2 v2.4.0
-	tinygo.org/x/go-llvm v0.0.0-20220922113433-4b5ad7ff76ec
+	tinygo.org/x/go-llvm v0.0.0-20220922115213-dcb078a26266
 )
 
 require (

go.sum

@@ -64,5 +64,5 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
-tinygo.org/x/go-llvm v0.0.0-20220922113433-4b5ad7ff76ec h1:FYtAFrw/YQPc644uNN65dW50FrEuVNaPBf70x23ApY4=
-tinygo.org/x/go-llvm v0.0.0-20220922113433-4b5ad7ff76ec/go.mod h1:GFbusT2VTA4I+l4j80b17KFK+6whv69Wtny5U+T8RR0=
+tinygo.org/x/go-llvm v0.0.0-20220922115213-dcb078a26266 h1:vg4sYKEM+w6epr5S1nXqP/7UhMYcc8nRt7Ohkq28rok=
+tinygo.org/x/go-llvm v0.0.0-20220922115213-dcb078a26266/go.mod h1:GFbusT2VTA4I+l4j80b17KFK+6whv69Wtny5U+T8RR0=

interp/interpreter.go

@@ -356,7 +356,7 @@ func (r *runner) run(fn *function, params []value, parentMem *memoryView, indent
 				default:
 					panic("unknown integer type width")
 				}
-			case strings.HasPrefix(callFn.name, "llvm.memcpy.p0i8.p0i8.") || strings.HasPrefix(callFn.name, "llvm.memmove.p0i8.p0i8."):
+			case strings.HasPrefix(callFn.name, "llvm.memcpy.p0") || strings.HasPrefix(callFn.name, "llvm.memmove.p0"):
 				// Copy a block of memory from one pointer to another.
 				dst, err := operands[1].asPointer(r)
 				if err != nil {
@@ -496,7 +496,7 @@ func (r *runner) run(fn *function, params []value, parentMem *memoryView, indent
 				typecodeID := typecodeIDBitCast.Operand(0).Initializer()
 
 				// Load the method set, which is part of the typecodeID object.
-				methodSet := r.builder.CreateExtractValue(typecodeID, 2, "").Operand(0).Initializer()
+				methodSet := stripPointerCasts(r.builder.CreateExtractValue(typecodeID, 2, "")).Initializer()
 
 				// We don't need to load the interface method set.
 
@@ -1087,3 +1087,15 @@ func intPredicateString(predicate llvm.IntPredicate) string {
 		return "cmp?"
 	}
 }
+
+// Strip some pointer casts. This is probably unnecessary once support for
+// LLVM 14 (non-opaque pointers) is dropped.
+func stripPointerCasts(value llvm.Value) llvm.Value {
+	if !value.IsAConstantExpr().IsNil() {
+		switch value.Opcode() {
+		case llvm.GetElementPtr, llvm.BitCast:
+			return stripPointerCasts(value.Operand(0))
+		}
+	}
+	return value
+}