From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id E13C215D65BC; Fri, 24 Oct 2025 13:59:15 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org E13C215D65BC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1761303556; bh=klbdCXmha1bUYB9XIjIVWSePlQXHKp9lSITFoMMSuPk=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=YEDkLKHVb0MCN9lWMNuACrYs9KbTpg2SoOJTdQafTbNpVs28lh3IAWHAHtzncBAdO UYR0BK+1apn5zPZBJpGfnXsYiGSZbIH7aM1fiDqlvqKuAUE9e1XEKFLX21++iLGSXN ZsUKGpaZ5gJuX+AxTrMv25tuBvzokyJRpFLor//A= Received: from send36.i.mail.ru (send36.i.mail.ru [89.221.237.131]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 847D315F7CC5 for ; Fri, 24 Oct 2025 13:51:10 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 847D315F7CC5 Received: by exim-smtp-855f5997bb-88mr2 with esmtpa (envelope-from ) id 1vCFO1-000000006vv-1YKk; Fri, 24 Oct 2025 13:51:09 +0300 To: Sergey Bronnikov Date: Fri, 24 Oct 2025 13:50:21 +0300 Message-ID: <771ce40700f63e508869a55a973d8f852ee93a06.1761301736.git.skaplun@tarantool.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9DAB542EDD08389FE5747FF4E83FD1C179EDF99FC6F4B40A8182A05F538085040A2F33245976F1E803DE06ABAFEAF67055668E7D18C207EC152E7C6720268728EEE80B9AFA0738B6B X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE78C7BFD8663541045EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AC83A81C8FD4AD23D82A6BABE6F325AC2E85FA5F3EDFCBAA7353EFBB55337566D857902A848E84F8F47370CAB1C49884282EBDC4CF679BDECB2E839D32C70DE6389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C0ECC8AC47CD0EDEFF8941B15DA834481FCF19DD082D7633A0EF3E4896CB9E6436389733CBF5DBD5E9D5E8D9A59859A8B6E5E764EB5D94DBD4CC7F00164DA146DA6F5DAA56C3B73B237318B6A418E8EAB86D1867E19FE14079C09775C1D3CA48CF3D321E7403792E342EB15956EA79C166A417C69337E82CC275ECD9A6C639B01B78DA827A17800CE7A9D141641BA1E09E731C566533BA786AA5CC5B56E945C8DA X-C1DE0DAB: 0D63561A33F958A5A554292B847775ED5002B1117B3ED69672BC7BEF3624A44A92B673A2F5DDD7E7823CB91A9FED034534781492E4B8EEAD21D4E6D365FE45D1C79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF9EBDB0771936319E73178433139CC7982CA29F79BE3EDCA4AA37E2B139DD804F04D7482423E9A0B86EB503EC62A3E87FE44201160C5C9A57E2422C6CC32E61FEEB32652F9F004CE05F4332CA8FE04980913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXMZebaIdHP2ghjoIc/363UZI6Kf1ptIMVRN2q9QiacRuGpcWzRKrOxs= X-DA7885C5: 0C34E2782419EC73F255D290C0D534F93329ED1EFD25D5384934A7FE69F624E09C2DA7432BF8FC0E5B1A4C17EAA7BC4BEF2421ABFA55128DAF83EF9164C44C7E X-Mailru-Sender: 689FA8AB762F7393DDD5FD59B456EAD2E4279F5EB931116B11988E4495A63B6E9952327D3E7F4D92E49D44BB4BD9522A059A1ED8796F048DB274557F927329BE89D5A3BC2B10C37545BD1C3CC395C826B4A721A3011E896F X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 luajit 17/41] perf: adjust nbody in LuaJIT-benches X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Sergey Kaplun via Tarantool-patches Reply-To: Sergey Kaplun Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This patch adjusts the aforementioned test to use the benchmark framework introduced before. The default arguments are adjusted according to the file. The arguments to the script still can be provided in the command line run. --- perf/LuaJIT-benches/nbody.lua | 127 ++++++++++++++++++++-------------- 1 file changed, 74 insertions(+), 53 deletions(-) diff --git a/perf/LuaJIT-benches/nbody.lua b/perf/LuaJIT-benches/nbody.lua index e0ff8f77..f01c20a3 100644 --- a/perf/LuaJIT-benches/nbody.lua +++ b/perf/LuaJIT-benches/nbody.lua @@ -1,56 +1,12 @@ +local bench = require("bench").new(arg) local sqrt = math.sqrt local PI = 3.141592653589793 local SOLAR_MASS = 4 * PI * PI local DAYS_PER_YEAR = 365.24 -local bodies = { - { -- Sun - x = 0, - y = 0, - z = 0, - vx = 0, - vy = 0, - vz = 0, - mass = SOLAR_MASS - }, - { -- Jupiter - x = 4.84143144246472090e+00, - y = -1.16032004402742839e+00, - z = -1.03622044471123109e-01, - vx = 1.66007664274403694e-03 * DAYS_PER_YEAR, - vy = 7.69901118419740425e-03 * DAYS_PER_YEAR, - vz = -6.90460016972063023e-05 * DAYS_PER_YEAR, - mass = 9.54791938424326609e-04 * SOLAR_MASS - }, - { -- Saturn - x = 8.34336671824457987e+00, - y = 4.12479856412430479e+00, - z = -4.03523417114321381e-01, - vx = -2.76742510726862411e-03 * DAYS_PER_YEAR, - vy = 4.99852801234917238e-03 * DAYS_PER_YEAR, - vz = 2.30417297573763929e-05 * DAYS_PER_YEAR, - mass = 2.85885980666130812e-04 * SOLAR_MASS - }, - { -- Uranus - x = 1.28943695621391310e+01, - y = -1.51111514016986312e+01, - z = -2.23307578892655734e-01, - vx = 2.96460137564761618e-03 * DAYS_PER_YEAR, - vy = 2.37847173959480950e-03 * DAYS_PER_YEAR, - vz = -2.96589568540237556e-05 * DAYS_PER_YEAR, - mass = 4.36624404335156298e-05 * SOLAR_MASS - }, - { -- Neptune - x = 1.53796971148509165e+01, - y = -2.59193146099879641e+01, - z = 1.79258772950371181e-01, - vx = 2.68067772490389322e-03 * DAYS_PER_YEAR, - vy = 1.62824170038242295e-03 * DAYS_PER_YEAR, - vz = -9.51592254519715870e-05 * DAYS_PER_YEAR, - mass = 5.15138902046611451e-05 * SOLAR_MASS - } -} +local bodies +local nbody local function advance(bodies, nbody, dt) for i=1,nbody do @@ -110,10 +66,75 @@ local function offsetMomentum(b, nbody) b[1].vz = -pz / SOLAR_MASS end -local N = tonumber(arg and arg[1]) or 1000 -local nbody = #bodies +local DEFAULT_N = 5e6 +local N = tonumber(arg and arg[1]) or DEFAULT_N -offsetMomentum(bodies, nbody) -io.write( string.format("%0.9f",energy(bodies, nbody)), "\n") -for i=1,N do advance(bodies, nbody, 0.01) end -io.write( string.format("%0.9f",energy(bodies, nbody)), "\n") +bench:add({ + name = "nbody", + payload = function() + bodies = { + { -- Sun + x = 0, + y = 0, + z = 0, + vx = 0, + vy = 0, + vz = 0, + mass = SOLAR_MASS + }, + { -- Jupiter + x = 4.84143144246472090e+00, + y = -1.16032004402742839e+00, + z = -1.03622044471123109e-01, + vx = 1.66007664274403694e-03 * DAYS_PER_YEAR, + vy = 7.69901118419740425e-03 * DAYS_PER_YEAR, + vz = -6.90460016972063023e-05 * DAYS_PER_YEAR, + mass = 9.54791938424326609e-04 * SOLAR_MASS + }, + { -- Saturn + x = 8.34336671824457987e+00, + y = 4.12479856412430479e+00, + z = -4.03523417114321381e-01, + vx = -2.76742510726862411e-03 * DAYS_PER_YEAR, + vy = 4.99852801234917238e-03 * DAYS_PER_YEAR, + vz = 2.30417297573763929e-05 * DAYS_PER_YEAR, + mass = 2.85885980666130812e-04 * SOLAR_MASS + }, + { -- Uranus + x = 1.28943695621391310e+01, + y = -1.51111514016986312e+01, + z = -2.23307578892655734e-01, + vx = 2.96460137564761618e-03 * DAYS_PER_YEAR, + vy = 2.37847173959480950e-03 * DAYS_PER_YEAR, + vz = -2.96589568540237556e-05 * DAYS_PER_YEAR, + mass = 4.36624404335156298e-05 * SOLAR_MASS + }, + { -- Neptune + x = 1.53796971148509165e+01, + y = -2.59193146099879641e+01, + z = 1.79258772950371181e-01, + vx = 2.68067772490389322e-03 * DAYS_PER_YEAR, + vy = 1.62824170038242295e-03 * DAYS_PER_YEAR, + vz = -9.51592254519715870e-05 * DAYS_PER_YEAR, + mass = 5.15138902046611451e-05 * SOLAR_MASS + } + } + nbody = #bodies + + offsetMomentum(bodies, nbody) + + assert(energy(bodies, nbody) == -0.16907516382852447179, + "Correct start energy") + for i=1,N do advance(bodies, nbody, 0.01) end + end, + checker = function() + if N == DEFAULT_N then + assert(energy(bodies, nbody) == -0.16908313397890917251, + "Correct result energy") + end + return true + end, + items = N, +}) + +bench:run_and_report() -- 2.51.0