From d26d5f1a099f24bdbbbf3e63caca70c9b26e0857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20L=C3=BCtke=20Dreimann?= Date: Fri, 2 Dec 2022 16:09:18 +0100 Subject: [PATCH] start_task rpc void return type --- repos/dde_uos-intel-gpgpu/include/gpgpu_virt/client.h | 4 ++-- repos/dde_uos-intel-gpgpu/include/gpgpu_virt/session.h | 4 ++-- repos/dde_uos-intel-gpgpu/src/virt/rpc.cc | 10 +++++----- repos/dde_uos-intel-gpgpu/src/virt/rpc.h | 2 +- repos/hello_gpgpu/src/hello_gpgpu/CL/cl_genode.cc | 4 ++-- repos/hello_gpgpu/src/hello_gpgpu/CL/cl_genode.h | 3 +-- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/repos/dde_uos-intel-gpgpu/include/gpgpu_virt/client.h b/repos/dde_uos-intel-gpgpu/include/gpgpu_virt/client.h index a5fe1108b8..e7328be888 100644 --- a/repos/dde_uos-intel-gpgpu/include/gpgpu_virt/client.h +++ b/repos/dde_uos-intel-gpgpu/include/gpgpu_virt/client.h @@ -13,9 +13,9 @@ struct Session_client : Genode::Rpc_client Session_client(Genode::Capability cap) : Genode::Rpc_client(cap) { } - int start_task(unsigned long kconf) override + void start_task(unsigned long kconf) override { - return call(kconf); + call(kconf); } void register_vm(Genode::size_t size, Genode::Ram_dataspace_capability& ram_cap) override diff --git a/repos/dde_uos-intel-gpgpu/include/gpgpu_virt/session.h b/repos/dde_uos-intel-gpgpu/include/gpgpu_virt/session.h index 545f3b28d5..4a20483955 100644 --- a/repos/dde_uos-intel-gpgpu/include/gpgpu_virt/session.h +++ b/repos/dde_uos-intel-gpgpu/include/gpgpu_virt/session.h @@ -14,7 +14,7 @@ struct Session : Genode::Session virtual int say_hello(int& i) = 0; virtual void register_vm(Genode::size_t size, Genode::Ram_dataspace_capability& ram_cap) = 0; - virtual int start_task(unsigned long kconf) = 0; + virtual void start_task(unsigned long kconf) = 0; virtual void print_vgpu_bench(unsigned long i) = 0; /******************* @@ -23,7 +23,7 @@ struct Session : Genode::Session GENODE_RPC(Rpc_say_hello, int, say_hello, int&); GENODE_RPC(Rpc_register_vm, void, register_vm, Genode::size_t, Genode::Ram_dataspace_capability&); - GENODE_RPC(Rpc_start_task, int, start_task, unsigned long); + GENODE_RPC(Rpc_start_task, void, start_task, unsigned long); GENODE_RPC(Rpc_print_vgpu_bench, void, print_vgpu_bench, unsigned long); diff --git a/repos/dde_uos-intel-gpgpu/src/virt/rpc.cc b/repos/dde_uos-intel-gpgpu/src/virt/rpc.cc index b5189dc245..9eee559243 100644 --- a/repos/dde_uos-intel-gpgpu/src/virt/rpc.cc +++ b/repos/dde_uos-intel-gpgpu/src/virt/rpc.cc @@ -43,7 +43,7 @@ void Session_component::register_vm(Genode::size_t size, Genode::Ram_dataspace_c _global_sched->add_vgpu(&vgpu); } -int Session_component::start_task(unsigned long kconf) +void Session_component::start_task(unsigned long kconf) { // convert offset to driver virt addr struct kernel_config* kc = (struct kernel_config*)(kconf + mapped_base); @@ -72,8 +72,8 @@ int Session_component::start_task(unsigned long kconf) _global_sched->handle_gpu_event(); } - static int id = 0; - /*Genode::log("Kernel ", id); + /*static int id = 0; + Genode::log("Kernel ", id); for(int i = 0; i < 3; i++) { Genode::log("\t\trange: ", (int)kc->range[i]); @@ -97,8 +97,8 @@ int Session_component::start_task(unsigned long kconf) Genode::log("\t\tpos: ", (uint32_t)kc->buffConfigs[i].pos); // to print this, temporary make the var public } Genode::log("\t\tsize: ", (int)kc->buffConfigs[i].buffer_size); - }*/ - return id++; + } + id++;*/ } Session_component::~Session_component() diff --git a/repos/dde_uos-intel-gpgpu/src/virt/rpc.h b/repos/dde_uos-intel-gpgpu/src/virt/rpc.h index 6e207556d2..05f95cc794 100644 --- a/repos/dde_uos-intel-gpgpu/src/virt/rpc.h +++ b/repos/dde_uos-intel-gpgpu/src/virt/rpc.h @@ -25,7 +25,7 @@ struct Session_component : Genode::Rpc_object void register_vm(Genode::size_t size, Genode::Ram_dataspace_capability& ram_cap) override; - int start_task(unsigned long kconf) override; + void start_task(unsigned long kconf) override; void print_vgpu_bench(unsigned long i) override; diff --git a/repos/hello_gpgpu/src/hello_gpgpu/CL/cl_genode.cc b/repos/hello_gpgpu/src/hello_gpgpu/CL/cl_genode.cc index 6a8bf339fd..9aa71cfa47 100644 --- a/repos/hello_gpgpu/src/hello_gpgpu/CL/cl_genode.cc +++ b/repos/hello_gpgpu/src/hello_gpgpu/CL/cl_genode.cc @@ -69,7 +69,7 @@ void cl_genode::testRPC() Genode::log("got number back from RPC: ", ret, "; number ref: ", i); } -int cl_genode::enqueue_task(struct kernel_config* kconf) +void cl_genode::enqueue_task(struct kernel_config* kconf) { // convert virt vm addr to offset for(int i = 0; i < kconf->buffCount; i++) @@ -81,7 +81,7 @@ int cl_genode::enqueue_task(struct kernel_config* kconf) kconf->binary = (Genode::uint8_t*)((Genode::addr_t)kconf->binary - mapped_base); // send RPC - return backend_driver.start_task((unsigned long)kconf - mapped_base); + backend_driver.start_task((unsigned long)kconf - mapped_base); } void cl_genode::wait(struct kernel_config* kconf) diff --git a/repos/hello_gpgpu/src/hello_gpgpu/CL/cl_genode.h b/repos/hello_gpgpu/src/hello_gpgpu/CL/cl_genode.h index f961fb9ed2..ce0de60fe3 100644 --- a/repos/hello_gpgpu/src/hello_gpgpu/CL/cl_genode.h +++ b/repos/hello_gpgpu/src/hello_gpgpu/CL/cl_genode.h @@ -108,9 +108,8 @@ public: * @brief * * @param kconf - * @return int */ - int enqueue_task(struct kernel_config* kconf); + void enqueue_task(struct kernel_config* kconf); /** * @brief