Update kelvin builtin model from hello_world to conv1x1

Change-Id: I92c1254bb7c50a978203a9f85a2cd1cc840af4b2

platforms/nexus/cantrip_builtins.mk

diff --git a/platforms/nexus/cantrip_builtins.mk b/platforms/nexus/cantrip_builtins.mk
index cd79c49..ad37c43 100644
--- a/platforms/nexus/cantrip_builtins.mk
+++ b/platforms/nexus/cantrip_builtins.mk
@@ -20,7 +20,7 @@
                          $(CANTRIP_OUT_RUST_APP_RELEASE)/panic/panic.app \
                          $(CANTRIP_OUT_C_APP_RELEASE)/suicide/suicide.app \
                          $(CANTRIP_OUT_RUST_APP_RELEASE)/timer/timer.app
-CANTRIP_MODEL_RELEASE := $(OUT)/kelvin/sw/bazel_out/hello_world.kelvin
+CANTRIP_MODEL_RELEASE := $(OUT)/kelvin_iree/sparrow_iree/samples/microbenchmarks/conv1x1_test_emitc_static.kelvin
 
 CANTRIP_APPS_DEBUG    := $(CANTRIP_OUT_C_APP_DEBUG)/hello/hello.app \
                          $(CANTRIP_OUT_RUST_APP_DEBUG)/fibonacci/fibonacci.app \
@@ -30,12 +30,10 @@
                          $(CANTRIP_OUT_RUST_APP_DEBUG)/panic/panic.app \
                          $(CANTRIP_OUT_C_APP_DEBUG)/suicide/suicide.app \
                          $(CANTRIP_OUT_RUST_APP_DEBUG)/timer/timer.app
-CANTRIP_MODEL_DEBUG   := $(OUT)/kelvin/sw/bazel_out/hello_world.kelvin
+CANTRIP_MODEL_DEBUG   := $(OUT)/kelvin_iree/sparrow_iree/samples/microbenchmarks/conv1x1_test_emitc_static.kelvin
 
 CANTRIP_SCRIPTS       := $(ROOTDIR)/build/platforms/$(PLATFORM)/builtins.repl
 
 # HACK(jtgans): Fix the IREE targets to explicitly list the files it generates.
-# TODO(hcindyl): Use IREE targets instead of hello_world once `kelvin_cleanup`
-# topic is merged
-$(patsubst %.kelvin,%,$(CANTRIP_MODEL_RELEASE)): kelvin_sw
-$(patsubst %.kelvin,%,$(CANTRIP_MODEL_DEBUG)): kelvin_sw
+$(patsubst %.kelvin,%,$(CANTRIP_MODEL_RELEASE)): iree_model_builtins
+$(patsubst %.kelvin,%,$(CANTRIP_MODEL_DEBUG)): iree_model_builtins

platforms/nexus/iree.mk

diff --git a/platforms/nexus/iree.mk b/platforms/nexus/iree.mk
index 4243998..05965f4 100644
--- a/platforms/nexus/iree.mk
+++ b/platforms/nexus/iree.mk
@@ -104,7 +104,9 @@
 # IREE executables used in cantrip-builtins-*
 iree_model_builtins: $(IREE_RUNTIME_OUT)/build.ninja | iree_check iree_commit_check
 	PYTHONPATH=$(IREE_COMPILER_DIR) cmake --build $(IREE_RUNTIME_OUT) --target \
-		quant_models/mobilenet_v1_emitc_static
+		sparrow_iree/samples/microbenchmarks/conv1x1_test_emitc_static
+	ln -sfn $(IREE_RUNTIME_OUT)/sparrow_iree/samples/microbenchmarks/conv1x1_test_emitc_static \
+		$(IREE_RUNTIME_OUT)/sparrow_iree/samples/microbenchmarks/conv1x1_test_emitc_static.elf
 
 $(IREE_RUNTIME_INTERNAL_OUT)/build.ninja: | iree_check iree_commit_check
 	cmake -G Ninja -B $(IREE_RUNTIME_INTERNAL_OUT) \

platforms/nexus/sim.mk

diff --git a/platforms/nexus/sim.mk b/platforms/nexus/sim.mk
index 23c9b9c..3f5f174 100644
--- a/platforms/nexus/sim.mk
+++ b/platforms/nexus/sim.mk
@@ -64,7 +64,7 @@
 #
 # This is the default target for the build system, and is generally what you
 # need for day-to-day work on the software side of Shodan.
-simulate: renode multihart_boot_rom $(OUT)/ext_flash_release.tar kelvin_sw $(CANTRIP_OUT_RELEASE)/ext_builtins.cpio
+simulate: renode multihart_boot_rom $(OUT)/ext_flash_release.tar iree_model_builtins $(CANTRIP_OUT_RELEASE)/ext_builtins.cpio
 	$(RENODE_CMD) -e "\
     \$$repl_file = @sim/config/platforms/nexus.repl; \
     \$$tar = @$(ROOTDIR)/out/ext_flash_release.tar; \
@@ -77,7 +77,7 @@
 # This top-level target does the same job as `simulate`, but instead of
 # unhalting the CPUs and starting the system, this alternate target only unhalts
 # cpu0, and uses the debug build of TockOS from the `matcha_tock_debug` target.
-simulate-debug: renode multihart_boot_rom $(OUT)/ext_flash_debug.tar kelvin_sw $(CANTRIP_OUT_DEBUG)/ext_builtins.cpio
+simulate-debug: renode multihart_boot_rom $(OUT)/ext_flash_debug.tar iree_model_builtins $(CANTRIP_OUT_DEBUG)/ext_builtins.cpio
 	$(RENODE_CMD) -e "\
     \$$repl_file = @sim/config/platforms/nexus-debug.repl; \
     \$$tar = @$(ROOTDIR)/out/ext_flash_debug.tar; \
@@ -92,7 +92,7 @@
 # unhalting the CPUs and starting the system, this alternate target starts
 # renode with no CPUs unhalted, allowing for GDB to be used for early system
 # start.
-debug-simulation: renode multihart_boot_rom $(OUT)/ext_flash_debug.tar kelvin_sw $(CANTRIP_OUT_DEBUG)/ext_builtins.cpio
+debug-simulation: renode multihart_boot_rom $(OUT)/ext_flash_debug.tar iree_model_builtins $(CANTRIP_OUT_DEBUG)/ext_builtins.cpio
 	$(RENODE_CMD) -e "\
     \$$repl_file = @sim/config/platforms/nexus-debug.repl; \
     \$$tar = @$(ROOTDIR)/out/ext_flash_debug.tar; \