cannon: Support Go 1.23

.circleci/config.yml

@@ -265,7 +265,7 @@ jobs:
       - run:
           name: build Cannon example binaries
           command: make elf # only compile ELF binaries with Go, we do not have MIPS GCC for creating the debug-dumps.
-          working_directory: cannon/testdata/example
+          working_directory: cannon/testdata
       - run:
           name: Cannon Go lint
           command: |
@@ -2148,7 +2148,7 @@ workflows:
           notify: true
           mentions: "@proofs-team"
           no_output_timeout: 60m
-          test_timeout: 75m
+          test_timeout: 90m
           resource_class: ethereum-optimism/latitude-fps-1
           environment_overrides: |
             export OP_E2E_CANNON_ENABLED="true"

cannon/.gitignore

@@ -5,9 +5,9 @@ cache
 venv
 .idea
 *.log
-testdata/example/bin
 contracts/out
 *.pprof
 *.out
 bin
+testdata/**/bin/
 multicannon/embeds/cannon*

cannon/Dockerfile.diff

@@ -23,6 +23,7 @@ ARG GIT_DATE
 
 ARG TARGETOS TARGETARCH
 
+# TODO(#14692): Update to test cannon-multithreaded64-4 when new VM stabilizes
 FROM --platform=$BUILDPLATFORM us-docker.pkg.dev/oplabs-tools-artifacts/images/cannon:v1.1.0-alpha.4 AS cannon-v2
 FROM --platform=$BUILDPLATFORM us-docker.pkg.dev/oplabs-tools-artifacts/images/cannon:v1.4.0 AS cannon-multithreaded64-3
 

cannon/Makefile

@@ -39,15 +39,21 @@ cannon-embeds: cannon32-impl cannon64-impl
 	@cp bin/cannon32-impl ./multicannon/embeds/cannon-5
 	# 64-bit multithreaded vm
 	@cp bin/cannon64-impl ./multicannon/embeds/cannon-6
+	@cp bin/cannon64-impl ./multicannon/embeds/cannon-7
 
 cannon: cannon-embeds
 	env GO111MODULE=on GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) go build -v $(LDFLAGS) -o ./bin/cannon ./multicannon/
 
 clean:
 	rm -rf bin multicannon/embeds/cannon*
 
-elf:
-	make -C ./testdata/example elf
+elf: elf-go-122 elf-go-123
+
+elf-go-122:
+	make -C ./testdata/go-1-22 elf
+
+elf-go-123:
+	make -C ./testdata/go-1-23 elf
 
 sanitize-program:
 	mips-linux-gnu-objdump -d -j .text $$GUEST_PROGRAM > ./bin/dump.txt
@@ -67,7 +73,7 @@ test: elf contract test64
 test64: elf contract
 	go test -tags=cannon64 -run '(TestEVM.*64|TestHelloEVM|TestClaimEVM)' ./mipsevm/tests
 
-diff-%-cannon: cannon elf
+diff-%-cannon: cannon elf-go-122
 	# Load an elf file to create a prestate, and check that both cannon versions generate the same prestate
 	@VM=$*; \
 	echo "Running diff for VM type $${VM}"; \
@@ -78,8 +84,8 @@ diff-%-cannon: cannon elf
 		echo "Loading 32-bit program"; \
 		ELF_SUFFIX="elf"; \
 	fi; \
-	$$OTHER_CANNON load-elf --type $$VM --path ./testdata/example/bin/hello.$${ELF_SUFFIX} --out ./bin/prestate-other.bin.gz --meta ""; \
-	./bin/cannon   load-elf --type $$VM --path ./testdata/example/bin/hello.$${ELF_SUFFIX} --out ./bin/prestate.bin.gz --meta "";
+	$$OTHER_CANNON load-elf --type $$VM --path ./testdata/go-1-22/bin/hello.$${ELF_SUFFIX} --out ./bin/prestate-other.bin.gz --meta ""; \
+	./bin/cannon   load-elf --type $$VM --path ./testdata/go-1-22/bin/hello.$${ELF_SUFFIX} --out ./bin/prestate.bin.gz --meta "";
 	@cmp ./bin/prestate-other.bin.gz ./bin/prestate.bin.gz;
 	@if [ $$? -eq 0 ]; then \
 		echo "Generated identical prestates"; \
@@ -134,6 +140,9 @@ fuzz:
 	cannon-embeds \
 	cannon \
 	clean \
+	elf \
+	elf-go-122 \
+	elf-go-123 \
 	test \
 	lint \
 	fuzz \

cannon/README.md

@@ -80,11 +80,11 @@ The smart-contracts are integrated into the Optimism monorepo contracts:
 
 `mipsevm` is Go tooling to test the onchain MIPS implementation, and generate proof data.
 
-## `example`
+## `testdata`
 
 Example programs that can be run and proven with Cannon.
 Optional dependency, but required for `mipsevm` Go tests.
-See [`testdata/example/Makefile`](./testdata/example/Makefile) for building the example MIPS binaries.
+See [`testdata/Makefile`](testdata/Makefile) for building these MIPS binaries.
 
 ## License
 

cannon/mipsevm/arch/arch32.go

@@ -74,6 +74,7 @@ const (
 	SysTgkill        = 4266
 	SysGetRLimit     = 4076
 	SysLseek         = 4019
+	SysEventFd2      = 4325
 	// Profiling-related syscalls
 	SysSetITimer    = 4104
 	SysTimerCreate  = 4257

cannon/mipsevm/arch/arch64.go

@@ -82,6 +82,7 @@ const (
 	SysTgkill        = 5225
 	SysGetRLimit     = 5095
 	SysLseek         = 5008
+	SysEventFd2      = 5284
 	// Profiling-related syscalls
 	SysSetITimer    = 5036
 	SysTimerCreate  = 5216

cannon/mipsevm/iface.go

@@ -74,6 +74,7 @@ type Metadata interface {
 // Toggles here are temporary and should be removed once the newer state version is deployed widely. The older
 // version can then be supported via multicannon pulling in a specific build and support for it dropped in latest code.
 type FeatureToggles struct {
+	SupportNoopSysEventFd2 bool
 }
 
 type FPVM interface {

cannon/mipsevm/multithreaded/instrumented_test.go

@@ -37,6 +37,7 @@ func TestInstrumentedState_Claim(t *testing.T) {
 
 func TestInstrumentedState_UtilsCheck(t *testing.T) {
 	// Sanity check that test running utilities will return a non-zero exit code on failure
+	testutil.Cannon64OnlyTest(t, "32-bit Cannon is deprecated")
 	t.Parallel()
 	cases := []struct {
 		name           string
@@ -75,6 +76,7 @@ func TestInstrumentedState_UtilsCheck(t *testing.T) {
 }
 
 func TestInstrumentedState_MultithreadedProgram(t *testing.T) {
+	testutil.Cannon64OnlyTest(t, "32-bit Cannon is deprecated")
 	if os.Getenv("SKIP_SLOW_TESTS") == "true" {
 		t.Skip("Skipping slow test because SKIP_SLOW_TESTS is enabled")
 	}
@@ -208,6 +210,7 @@ func TestInstrumentedState_MultithreadedProgram(t *testing.T) {
 	}
 }
 func TestInstrumentedState_Alloc(t *testing.T) {
+	testutil.Cannon64OnlyTest(t, "32-bit Cannon is deprecated")
 	if os.Getenv("SKIP_SLOW_TESTS") == "true" {
 		t.Skip("Skipping slow test because SKIP_SLOW_TESTS is enabled")
 	}
@@ -259,9 +262,14 @@ func TestInstrumentedState_Alloc(t *testing.T) {
 // dependency loop, so we just cover the everything enabled case as that should be the upcoming version.
 func allFeaturesEnabled() mipsevm.FeatureToggles {
 	toggles := mipsevm.FeatureToggles{}
-	tRef := reflect.ValueOf(toggles)
+	tRef := reflect.ValueOf(&toggles).Elem() // Get a pointer and then dereference
+
 	for i := 0; i < tRef.NumField(); i++ {
-		tRef.Field(i).Set(reflect.ValueOf(true))
+		field := tRef.Field(i)
+		if field.Kind() == reflect.Bool && field.CanSet() {
+			field.SetBool(true)
+		}
 	}
+
 	return toggles
 }

cannon/mipsevm/multithreaded/mips.go

@@ -189,20 +189,28 @@ func (m *InstrumentedState) handleSyscall() error {
 	case arch.SysTimerDelete:
 	case arch.SysGetRLimit:
 	case arch.SysLseek:
+	case arch.SysEventFd2:
+		if !m.features.SupportNoopSysEventFd2 {
+			m.handleUnrecognizedSyscall(syscallNum)
+		}
 	default:
 		// These syscalls have the same values on 64-bit. So we use if-stmts here to avoid "duplicate case" compiler error for the cannon64 build
 		if arch.IsMips32 && (syscallNum == arch.SysFstat64 || syscallNum == arch.SysStat64 || syscallNum == arch.SysLlseek) {
 			// noop
 		} else {
-			m.Traceback()
-			panic(fmt.Sprintf("unrecognized syscall: %d", syscallNum))
+			m.handleUnrecognizedSyscall(syscallNum)
 		}
 	}
 
 	exec.HandleSyscallUpdates(&thread.Cpu, &thread.Registers, v0, v1)
 	return nil
 }
 
+func (m *InstrumentedState) handleUnrecognizedSyscall(syscallNum Word) {
+	m.Traceback()
+	panic(fmt.Sprintf("unrecognized syscall: %d", syscallNum))
+}
+
 func (m *InstrumentedState) syscallYield(thread *ThreadState) {
 	v0 := Word(0)
 	v1 := Word(0)

cannon/mipsevm/multithreaded/state_test.go

@@ -101,7 +101,7 @@ func TestState_EncodeWitness(t *testing.T) {
 }
 
 func TestState_JSONCodec(t *testing.T) {
-	elfProgram, err := elf.Open("../../testdata/example/bin/hello.elf")
+	elfProgram, err := elf.Open("../../testdata/go-1-23/bin/hello.elf")
 	require.NoError(t, err, "open ELF file")
 	state, err := program.LoadELF(elfProgram, CreateInitialState)
 	require.NoError(t, err, "load ELF into state")
@@ -138,7 +138,7 @@ func TestState_JSONCodec(t *testing.T) {
 }
 
 func TestState_Binary(t *testing.T) {
-	elfProgram, err := elf.Open("../../testdata/example/bin/hello.elf")
+	elfProgram, err := elf.Open("../../testdata/go-1-23/bin/hello.elf")
 	require.NoError(t, err, "open ELF file")
 	state, err := program.LoadELF(elfProgram, CreateInitialState)
 	require.NoError(t, err, "load ELF into state")

cannon/mipsevm/singlethreaded/instrumented_test.go

@@ -21,11 +21,3 @@ func vmFactory(state *State, po mipsevm.PreimageOracle, stdOut, stdErr io.Writer
 func TestInstrumentedState_OpenMips(t *testing.T) {
 	testutil.RunVMTests_OpenMips(t, CreateEmptyState, vmFactory)
 }
-
-func TestInstrumentedState_Hello(t *testing.T) {
-	testutil.RunVMTest_Hello(t, CreateInitialState, vmFactory, true)
-}
-
-func TestInstrumentedState_Claim(t *testing.T) {
-	testutil.RunVMTest_Claim(t, CreateInitialState, vmFactory, true)
-}

cannon/mipsevm/singlethreaded/state_test.go

@@ -65,7 +65,7 @@ func TestStateHash(t *testing.T) {
 }
 
 func TestStateJSONCodec(t *testing.T) {
-	elfProgram, err := elf.Open("../../testdata/example/bin/hello.elf")
+	elfProgram, err := elf.Open("../../testdata/go-1-23/bin/hello.elf")
 	require.NoError(t, err, "open ELF file")
 	state, err := program.LoadELF(elfProgram, CreateInitialState)
 	require.NoError(t, err, "load ELF into state")
@@ -88,7 +88,7 @@ func TestStateJSONCodec(t *testing.T) {
 }
 
 func TestStateBinaryCodec(t *testing.T) {
-	elfProgram, err := elf.Open("../../testdata/example/bin/hello.elf")
+	elfProgram, err := elf.Open("../../testdata/go-1-23/bin/hello.elf")
 	require.NoError(t, err, "open ELF file")
 	state, err := program.LoadELF(elfProgram, CreateInitialState)
 	require.NoError(t, err, "load ELF into state")

cannon/mipsevm/tests/evm_common_test.go

@@ -1009,6 +1009,7 @@ func TestEVM_Fault(t *testing.T) {
 }
 
 func TestEVM_HelloProgram(t *testing.T) {
+	testutil.Cannon64OnlyTest(t, "32-bit Cannon is deprecated")
 	if os.Getenv("SKIP_SLOW_TESTS") == "true" {
 		t.Skip("Skipping slow test because SKIP_SLOW_TESTS is enabled")
 	}
@@ -1028,7 +1029,7 @@ func TestEVM_HelloProgram(t *testing.T) {
 			state := goVm.GetState()
 
 			start := time.Now()
-			for i := 0; i < 430_000; i++ {
+			for i := 0; i < 450_000; i++ {
 				step := goVm.GetState().GetStep()
 				if goVm.GetState().GetExited() {
 					break
@@ -1056,6 +1057,7 @@ func TestEVM_HelloProgram(t *testing.T) {
 }
 
 func TestEVM_ClaimProgram(t *testing.T) {
+	testutil.Cannon64OnlyTest(t, "32-bit Cannon is deprecated")
 	if os.Getenv("SKIP_SLOW_TESTS") == "true" {
 		t.Skip("Skipping slow test because SKIP_SLOW_TESTS is enabled")
 	}
@@ -1102,6 +1104,7 @@ func TestEVM_ClaimProgram(t *testing.T) {
 }
 
 func TestEVM_EntryProgram(t *testing.T) {
+	testutil.Cannon64OnlyTest(t, "32-bit Cannon is deprecated")
 	if os.Getenv("SKIP_SLOW_TESTS") == "true" {
 		t.Skip("Skipping slow test because SKIP_SLOW_TESTS is enabled")
 	}