{"header":{"message":"Add magic number generator","description":null,"timestamp":"2023-01-02T20:47:25.292072553Z","authors":[{}]},"hash":"TDHJSFFSJZBEZFMDHPLRSVB6CIVJ7AWGGNIC3WUCADQLQSIQKXDAC","authors":[{"login":"voroskoi","key":"Guf8VYJNUiWAqxwLxDSKxmvvtY65ht2zK2q4h6VhxrcZ"}],"deps":{"hashes":[["TDHJSFFSJZBEZFMDHPLRSVB6CIVJ7AWGGNIC3WUCADQLQSIQKXDAC","Add magic number generator"],["AA",null],["XARNBDT4A5X6F3WFC5YNZBV5RNZ5GBRYOWKAK5R6HSTPBNIXTHDAC","Add relevant occupancy matrices"],["SNMQLFZFCV5XTPRLSD7SV4RPVOGUVJOYCZAKI5ATCEPSI5JMGVAAC","Add runtime blocker checks"],["BL3ZR4OWJM54HFXUNMUZKB5YQYVBT7ETFIXCOXWL6S5SZFM6IFDQC","Refactoring, simplifying attack table generation"],["FR6N5DIUYYWT5BBOIBOX3GCSEKZIINSGT4F4CWM6YA2XLQEOU4ZQC","Add setOccupancy()"]],"deps":["XARNBDT4A5X6F3WFC5YNZBV5RNZ5GBRYOWKAK5R6HSTPBNIXTHDAC"],"known":["BL3ZR4OWJM54HFXUNMUZKB5YQYVBT7ETFIXCOXWL6S5SZFM6IFDQC","SNMQLFZFCV5XTPRLSD7SV4RPVOGUVJOYCZAKI5ATCEPSI5JMGVAAC","FR6N5DIUYYWT5BBOIBOX3GCSEKZIINSGT4F4CWM6YA2XLQEOU4ZQC"]},"hunks":[{"Edit":{"inode":{"change":3,"pos":204},"path":"src/attacks.zig","line":275,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":7465}],"down_context":[{"change":3,"pos":7465}],"flag":"BLOCK","start":0,"end":2422,"inode":{"change":3,"pos":204}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"fn setOccupancy(index: usize, bits_in_mask: Chess.BoardType, attack_mask: Chess.BoardType) Chess.BoardType {"},{"Add":" var occupancy: Chess.BitBoard = .{};"},{"Add":""},{"Add":" var attack: Chess.BitBoard = .{ .board = attack_mask };"},{"Add":""},{"Add":" var count: u6 = 0;"},{"Add":" while (count < bits_in_mask) : (count += 1) {"},{"Add":" const square = @ctz(attack.board);"},{"Add":""},{"Add":" attack.pop(@intToEnum(Chess.Square, square));"},{"Add":""},{"Add":" if (index & @as(Chess.BoardType, 1) << count != 0) {"},{"Add":" occupancy.set(@intToEnum(Chess.Square, square));"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" return occupancy.board;"},{"Add":"}"},{"Add":""},{"Add":"test \"occupancy bits\" {"},{"Add":" const attack_mask = genSteps(.a1, .rook, .white);"},{"Add":""},{"Add":" var occupancy: Chess.BitBoard = .{};"},{"Add":" occupancy.board = setOccupancy(4095, @popCount(attack_mask), attack_mask);"},{"Add":""},{"Add":" var expected: Chess.BitBoard = .{};"},{"Add":" expected.setSlice(&[_]Chess.Square{ .a2, .a3, .a4, .a5, .a6, .a7, .b1, .c1, .d1, .e1, .f1, .g1 });"},{"Add":""},{"Add":" try std.testing.expectEqual(expected, occupancy);"},{"Add":"}"},{"Add":""},{"Add":"fn genRelevantOccupancy(piece: Chess.Pieces) [@typeInfo(Chess.Square).Enum.fields.len]u4 {"},{"Add":" var ret: [64]u4 = [_]u4{0} ** 64;"},{"Add":""},{"Add":" for (std.enums.values(Chess.Square)) |square| {"},{"Add":" const count = @popCount(genSteps(square, piece, .white));"},{"Add":" ret[@enumToInt(square)] = @intCast(u4, count);"},{"Add":" }"},{"Add":""},{"Add":" return ret;"},{"Add":"}"},{"Add":""},{"Add":"test \"genRelevantOccupancy\" {"},{"Add":" { // bishop"},{"Add":" const bishop = genRelevantOccupancy(.bishop);"},{"Add":""},{"Add":" // zig fmt: off"},{"Add":" const expected = [64]u4{"},{"Add":" 6, 5, 5, 5, 5, 5, 5, 6,"},{"Add":" 5, 5, 5, 5, 5, 5, 5, 5,"},{"Add":" 5, 5, 7, 7, 7, 7, 5, 5,"},{"Add":" 5, 5, 7, 9, 9, 7, 5, 5,"},{"Add":" 5, 5, 7, 9, 9, 7, 5, 5,"},{"Add":" 5, 5, 7, 7, 7, 7, 5, 5,"},{"Add":" 5, 5, 5, 5, 5, 5, 5, 5,"},{"Add":" 6, 5, 5, 5, 5, 5, 5, 6,"},{"Add":" };"},{"Add":" // zig fmt: on"},{"Add":""},{"Add":" try std.testing.expectEqualSlices(u4, &expected, &bishop);"},{"Add":" }"},{"Add":""},{"Add":" { // rook"},{"Add":" const rook = genRelevantOccupancy(.rook);"},{"Add":""},{"Add":" // zig fmt: off"},{"Add":" const expected = [64]u4{"},{"Add":" 12, 11, 11, 11, 11, 11, 11, 12,"},{"Add":" 11, 10, 10, 10, 10, 10, 10, 11,"},{"Add":" 11, 10, 10, 10, 10, 10, 10, 11,"},{"Add":" 11, 10, 10, 10, 10, 10, 10, 11,"},{"Add":" 11, 10, 10, 10, 10, 10, 10, 11,"},{"Add":" 11, 10, 10, 10, 10, 10, 10, 11,"},{"Add":" 11, 10, 10, 10, 10, 10, 10, 11,"},{"Add":" 12, 11, 11, 11, 11, 11, 11, 12,"},{"Add":" };"},{"Add":" // zig fmt: on"},{"Add":""},{"Add":" try std.testing.expectEqualSlices(u4, &expected, &rook);"},{"Add":" }"}]}},{"Edit":{"inode":{"change":3,"pos":204},"path":"src/attacks.zig","line":358,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":7467}],"down_context":[],"flag":"BLOCK","start":2423,"end":5622,"inode":{"change":3,"pos":204}}},"contents":[{"Add":""},{"Add":"fn findMagicNumber(square: Chess.Square, relevant: u4, piece: Chess.Pieces) Chess.BoardType {"},{"Add":" // TODO: piece+square defines the relevant bits"},{"Add":""},{"Add":" // TODO: this is for rooks, bishop needs less"},{"Add":" var occupancies: [4096]Chess.BoardType = undefined;"},{"Add":""},{"Add":" var attacks: [4096]Chess.BoardType = undefined;"},{"Add":""},{"Add":" var used: [4096]Chess.BoardType = undefined;"},{"Add":""},{"Add":" // attack mask for a current piece"},{"Add":" const attack_mask = genSteps(square, piece, .white);"},{"Add":""},{"Add":" const occupancy_idx = @as(Chess.BoardType, 1) << relevant;"},{"Add":""},{"Add":" var bb = Chess.BitBoard{};"},{"Add":""},{"Add":" var idx: usize = 0;"},{"Add":" while (idx < occupancy_idx) : (idx += 1) {"},{"Add":" occupancies[idx] = setOccupancy(idx, relevant, attack_mask);"},{"Add":" bb.board = occupancies[idx]; // FIXME UGLY"},{"Add":""},{"Add":" attacks[idx] = bb.riderBlocker(square, piece);"},{"Add":" }"},{"Add":""},{"Add":" // test the generated number"},{"Add":" var loop: usize = 0;"},{"Add":" while (loop < 100_000_000) : (loop += 1) {"},{"Add":" const magic = randLowZero();"},{"Add":""},{"Add":" // skip inappropriate numbers FIXME: ugly"},{"Add":" var tmp1: Chess.BoardType = undefined;"},{"Add":" _ = @mulWithOverflow(Chess.BoardType, attack_mask, magic, &tmp1);"},{"Add":" if (@popCount(tmp1 & 0xFF00000000000000) < 6) continue;"},{"Add":""},{"Add":" used = [_]Chess.BoardType{0} ** 4096;"},{"Add":""},{"Add":" var index: usize = 0;"},{"Add":" var fail: bool = false;"},{"Add":" while (!fail and index < occupancy_idx) : (index += 1) {"},{"Add":" var tmp2: Chess.BoardType = undefined; // FIXME: ugly"},{"Add":" _ = @mulWithOverflow(Chess.BoardType, occupancies[index], magic, &tmp2);"},{"Add":" var magic_index: usize = @intCast(usize, tmp2 >> @intCast(u6, @as(u7, 64) - relevant));"},{"Add":""},{"Add":" if (used[magic_index] == 0) {"},{"Add":" // magic index works"},{"Add":" used[magic_index] = attacks[index];"},{"Add":" } else if (used[magic_index] != attacks[index]) {"},{"Add":" // magic index does not work"},{"Add":" fail = true;"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" if (!fail) {"},{"Add":" return magic;"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" unreachable;"},{"Add":"}"},{"Add":""},{"Add":"fn randLowZero() u64 {"},{"Add":" return rand() & rand() & rand();"},{"Add":"}"},{"Add":""},{"Add":"var random_state: u32 = 1804289383;"},{"Add":"fn rand32() u32 {"},{"Add":" var number = random_state;"},{"Add":""},{"Add":" // XOR shift algorithm"},{"Add":" number ^= number << 13;"},{"Add":" number ^= number >> 17;"},{"Add":" number ^= number << 5;"},{"Add":""},{"Add":" // update random number state"},{"Add":" random_state = number;"},{"Add":""},{"Add":" // return random number"},{"Add":" return number;"},{"Add":"}"},{"Add":""},{"Add":"fn rand() u64 {"},{"Add":" const r1 = @intCast(u64, rand32()) & 0xFFFF;"},{"Add":" const r2 = @intCast(u64, rand32()) & 0xFFFF;"},{"Add":" const r3 = @intCast(u64, rand32()) & 0xFFFF;"},{"Add":" const r4 = @intCast(u64, rand32()) & 0xFFFF;"},{"Add":""},{"Add":" return r1 | (r2 << 16) | (r3 << 32) | (r4 << 48);"},{"Add":"}"},{"Add":""},{"Add":"test \"MagicNumbers\" {"},{"Add":" var bishop_magic: [64]Chess.BoardType = undefined;"},{"Add":" var rook_magic: [64]Chess.BoardType = undefined;"},{"Add":" for (std.enums.values(Chess.Square)) |square, idx| {"},{"Add":" bishop_magic[idx] = findMagicNumber("},{"Add":" square,"},{"Add":" genRelevantOccupancy(.bishop)[square.int()],"},{"Add":" .bishop,"},{"Add":" );"},{"Add":" rook_magic[idx] = findMagicNumber("},{"Add":" square,"},{"Add":" genRelevantOccupancy(.rook)[square.int()],"},{"Add":" .rook,"},{"Add":" );"},{"Add":" }"},{"Add":""},{"Add":" // std.debug.print(\"{any}\\n{any}\\n\", .{ bishop_magic, rook_magic });"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":3,"pos":7502},"path":"src/Chess.zig","line":149,"ins":{"up_context":[{"change":3,"pos":685}],"down_context":[{"change":3,"pos":737}],"flag":"BLOCK","start":5623,"end":5671,"inode":{"change":3,"pos":7502}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":685},"to":{"change":3,"start":685,"end":737},"introduced_by":3}],"inode":{"change":3,"pos":7502}},"ins_contents":[{"Add":" while (step < SIZE) : (step += 1) {"}],"del_contents":[{"Del":" while (step < SIZE - 1) : (step += 1) {\n"}]}},{"Edit":{"inode":{"change":3,"pos":7502},"path":"src/Chess.zig","line":163,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":1191}],"down_context":[{"change":3,"pos":1191}],"flag":"BLOCK","start":5672,"end":5718,"inode":{"change":3,"pos":7502}}},"contents":[{"Add":" // stop when we hit a blocker"}]}},{"Edit":{"inode":{"change":3,"pos":7502},"path":"src/Chess.zig","line":252,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":1949},"to":{"change":3,"start":12112,"end":12120},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":12112},"to":{"change":3,"start":12112,"end":12120},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":12120},"to":{"change":3,"start":142,"end":998},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":998},"to":{"change":2,"start":209,"end":1071},"introduced_by":2}],"inode":{"change":3,"pos":7502}}},"contents":[{"Del":" }\n}\n"},{"Del":"\nfn setOccupancy(index: usize, attack_mask: BoardType) BoardType {\n var occupancy: BitBoard = .{};\n\n var attack: BitBoard = .{ .board = attack_mask };\n\n var count: u6 = 0;\n while (count < @popCount(attack_mask)) : (count += 1) {\n const square = @ctz(attack.board);\n\n attack.pop(@intToEnum(Square, square));\n\n if (index & @as(BoardType, 1) << count != 0) {\n occupancy.set(@intToEnum(Square, square));\n }\n }\n\n return occupancy.board;\n}\n\ntest \"occupancy bits\" {\n const attack_mask = Attacks.genSteps(.a1, .rook, .white);\n\n var occupancy: BitBoard = .{};\n occupancy.board = setOccupancy(4095, attack_mask);\n\n var expected: BitBoard = .{};\n expected.setSlice(&[_]Square{ .a2, .a3, .a4, .a5, .a6, .a7, .b1, .c1, .d1, .e1, .f1, .g1 });\n\n try std.testing.expectEqual(expected, occupancy);\n"},{"Del":"}\n\nfn genRelevantOccupancy(piece: Pieces) [@typeInfo(Square).Enum.fields.len]BoardType {\n var ret: [64]BoardType = [_]BoardType{0} ** 64;\n\n for (std.enums.values(Square)) |square| {\n ret[@enumToInt(square)] = @popCount(Attacks.genSteps(square, piece, .white));\n }\n\n return ret;\n}\n\ntest \"genRelevantOccupancy\" {\n { // bishop\n const bishop = genRelevantOccupancy(.bishop);\n\n // zig fmt: off\n const expected = [64]BoardType{\n 6, 5, 5, 5, 5, 5, 5, 6,\n 5, 5, 5, 5, 5, 5, 5, 5,\n 5, 5, 7, 7, 7, 7, 5, 5,\n 5, 5, 7, 9, 9, 7, 5, 5,\n 5, 5, 7, 9, 9, 7, 5, 5,\n 5, 5, 7, 7, 7, 7, 5, 5,\n 5, 5, 5, 5, 5, 5, 5, 5,\n 6, 5, 5, 5, 5, 5, 5, 6,\n };\n // zig fmt: on\n\n try std.testing.expectEqualSlices(BoardType, &expected, &bishop);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":7502},"path":"src/Chess.zig","line":255,"ins":{"up_context":[{"change":2,"pos":1092}],"down_context":[{"change":2,"pos":1142}],"flag":"BLOCK","start":5719,"end":5829,"inode":{"change":3,"pos":7502}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1092},"to":{"change":2,"start":1092,"end":1142},"introduced_by":2}],"inode":{"change":3,"pos":7502}},"ins_contents":[{"Add":" bb.board = 0;"},{"Add":" bb.setSlice(&[_]Square{.b8});"},{"Add":""},{"Add":" const got = bb.riderBlocker(.h8, .rook);"}],"del_contents":[{"Del":" const rook = genRelevantOccupancy(.rook);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":7502},"path":"src/Chess.zig","line":260,"ins":{"up_context":[{"change":2,"pos":1143}],"down_context":[{"change":2,"pos":1593}],"flag":"BLOCK","start":5830,"end":5952,"inode":{"change":3,"pos":7502}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1143},"to":{"change":2,"start":1143,"end":1593},"introduced_by":2}],"inode":{"change":3,"pos":7502}},"ins_contents":[{"Add":" bb.board = 0;"},{"Add":" bb.setSlice(&[_]Square{ .b8, .c8, .d8, .e8, .f8, .g8, .h7, .h6, .h5, .h4, .h3, .h2, .h1 });"}],"del_contents":[{"Del":" // zig fmt: off\n const expected = [64]BoardType{\n 12, 11, 11, 11, 11, 11, 11, 12,\n 11, 10, 10, 10, 10, 10, 10, 11,\n 11, 10, 10, 10, 10, 10, 10, 11,\n 11, 10, 10, 10, 10, 10, 10, 11,\n 11, 10, 10, 10, 10, 10, 10, 11,\n 11, 10, 10, 10, 10, 10, 10, 11,\n 11, 10, 10, 10, 10, 10, 10, 11,\n 12, 11, 11, 11, 11, 11, 11, 12,\n };\n // zig fmt: on\n"}]}},{"Replacement":{"inode":{"change":3,"pos":7502},"path":"src/Chess.zig","line":263,"ins":{"up_context":[{"change":2,"pos":1594}],"down_context":[{"change":2,"pos":1666}],"flag":"BLOCK","start":5953,"end":6005,"inode":{"change":3,"pos":7502}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1594},"to":{"change":2,"start":1594,"end":1666},"introduced_by":2}],"inode":{"change":3,"pos":7502}},"ins_contents":[{"Add":" try std.testing.expectEqual(bb.board, got);"}],"del_contents":[{"Del":" try std.testing.expectEqualSlices(BoardType, &expected, &rook);\n"}]}}],"owner":"voroskoi","repo":"pistike","token":"qQtavNGf3cxJq1XvEtdHoO0KBydC+7Z15a74LNFfwdQ=","login":null}

…

Dependencies

Change contents