From b72a4590b1e8a96056ce0f704d84ef48e6aea96c Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Fri, 17 Sep 2021 20:53:53 -0700 Subject: [PATCH] ircd::gpt: Task header reorganization/resimplification. --- include/ircd/gpt/ctrl.h | 120 +++++++++++++++++++++++++++++ include/ircd/gpt/{task => }/gate.h | 0 include/ircd/gpt/gpt.h | 5 +- include/ircd/gpt/{task => }/opts.h | 0 include/ircd/gpt/{task => }/task.h | 6 -- include/ircd/gpt/task/ctrl.h | 65 ---------------- include/ircd/gpt/task/epic.h | 38 --------- include/ircd/gpt/task/tokens.h | 35 --------- 8 files changed, 124 insertions(+), 145 deletions(-) create mode 100644 include/ircd/gpt/ctrl.h rename include/ircd/gpt/{task => }/gate.h (100%) rename include/ircd/gpt/{task => }/opts.h (100%) rename include/ircd/gpt/{task => }/task.h (93%) delete mode 100644 include/ircd/gpt/task/ctrl.h delete mode 100644 include/ircd/gpt/task/epic.h delete mode 100644 include/ircd/gpt/task/tokens.h diff --git a/include/ircd/gpt/ctrl.h b/include/ircd/gpt/ctrl.h new file mode 100644 index 000000000..4ee1e8631 --- /dev/null +++ b/include/ircd/gpt/ctrl.h @@ -0,0 +1,120 @@ +// Matrix Construct +// +// Copyright (C) Matrix Construct Developers, Authors & Contributors +// Copyright (C) 2016-2021 Jason Volk +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice is present in all copies. The +// full license for this software is available in the LICENSE file. + +#pragma once +#define HAVE_IRCD_GPT_CTRL_H + +/// Epoch Precision Interrupt Controller +/// +struct ircd_gpt_ctrl_epic +{ + /// Accumulates the number of task cycles. The cycle counter is incremented + /// by device software after each repetition of the kernel pipeline to + /// produce one additional token. + ulong cycle; + + /// Accumulates the epoch count for the task. The counter is incremented + /// by one in device software before control returns back to the host. + /// Several cycles may occur during each epoch. + ulong epoch; + + /// Accumulates the training epoch count for the task. The counter is + /// incremented by one in device software for each backward propagation. + ulong step; + + /// Updated by the host with the value of the timestamp register as sampled + /// immediately before each transfer of control to the device. + ulong host_tsc; + + /// Accumulates time in microseconds elapsed for the task. + ulong elapsed; +}; + +/// Token Context Buffer (Control Block) +/// +struct ircd_gpt_ctrl_tokens +{ + /// Token ring head. Tokens in the ring extend behind the head for + /// `tokens`. The `head` value is automatically modulated by device + /// software to wrap around the ring. + uint head; + + /// Token counter. The counter indicates the number of valid tokens in + /// the context buffer. This value must not exceed the buffer size. + uint count; + + /// Accumulates the number of tokens produced by the task. Several tokens + /// may be produced each epoch, but currently only one token is produced + /// each cycle. + ulong produced; + + /// Accumulates the number tokens witnessed by the task. The number of + /// tokens in the context for each cycle is counted as witnessed. + ulong witnessed; +}; + +/// Task Control Page +/// +/// The control block is shared with our device software. Execution state is +/// maintained in the task control block across cycles. The control block is +/// the mutable state component for an execution; for the immutable component +/// also shared with device software see opts.h. +/// +struct ircd_gpt_ctrl +{ + /// Epoch counting & interrupt control block. + struct ircd_gpt_ctrl_epic epic; + + /// Token context control block. Contains state for the token context + /// buffer; the buffer with the tokens themselves is elsewhere. + struct ircd_gpt_ctrl_tokens tokens; + + /// Logit softmax state + struct ircd_math_samax samax; + + /// Target label loss state + struct ircd_math_mean loss; + + /// Target label perplexity score state + struct ircd_math_mean perp; + + /// Target label certainty difference state + struct ircd_math_mean cert; + + /// PRNG xoshiro256 state. This is the de facto random seed which can be + /// set before cycle entry by the host. It is updated by device software + /// when used. + ulong rand[4]; + + /// Perform backprop + bool prop; + + /// Header magic 0xC7012C70 + uint magic; + + /// The token buffer starts at offset 2048 and continues to the end of + /// the page; options specify the size of the tokens buffer in tokens. + /// Additional pages must be attached for larger buffer sizes. + ushort token[] __attribute__((aligned(2048))); +} +__attribute__((aligned(4096))); + +#ifdef __cplusplus +namespace ircd::gpt +{ + using ctrl = struct ircd_gpt_ctrl; +} +#endif + +#ifdef __cplusplus +static_assert(sizeof(struct ircd_gpt_ctrl) == 4096); +static_assert(offsetof(struct ircd_gpt_ctrl, token) == 2048); +static_assert(std::is_standard_layout::value); +#endif diff --git a/include/ircd/gpt/task/gate.h b/include/ircd/gpt/gate.h similarity index 100% rename from include/ircd/gpt/task/gate.h rename to include/ircd/gpt/gate.h diff --git a/include/ircd/gpt/gpt.h b/include/ircd/gpt/gpt.h index f8e2d26bb..a1fcf3b77 100644 --- a/include/ircd/gpt/gpt.h +++ b/include/ircd/gpt/gpt.h @@ -27,6 +27,9 @@ namespace ircd::gpt #include "vocab.h" #include "model.h" #include "token.h" -#include "task/task.h" +#include "gate.h" +#include "opts.h" +#include "ctrl.h" +#include "task.h" #include "pipe/pipe.h" #include "generate.h" diff --git a/include/ircd/gpt/task/opts.h b/include/ircd/gpt/opts.h similarity index 100% rename from include/ircd/gpt/task/opts.h rename to include/ircd/gpt/opts.h diff --git a/include/ircd/gpt/task/task.h b/include/ircd/gpt/task.h similarity index 93% rename from include/ircd/gpt/task/task.h rename to include/ircd/gpt/task.h index 525aed214..0521100a3 100644 --- a/include/ircd/gpt/task/task.h +++ b/include/ircd/gpt/task.h @@ -11,12 +11,6 @@ #pragma once #define HAVE_IRCD_GPT_TASK_H -#include "epic.h" -#include "tokens.h" -#include "gate.h" -#include "opts.h" -#include "ctrl.h" - #ifdef __cplusplus /// Task Context /// diff --git a/include/ircd/gpt/task/ctrl.h b/include/ircd/gpt/task/ctrl.h deleted file mode 100644 index 93a249c7b..000000000 --- a/include/ircd/gpt/task/ctrl.h +++ /dev/null @@ -1,65 +0,0 @@ -// Matrix Construct -// -// Copyright (C) Matrix Construct Developers, Authors & Contributors -// Copyright (C) 2016-2021 Jason Volk -// -// Permission to use, copy, modify, and/or distribute this software for any -// purpose with or without fee is hereby granted, provided that the above -// copyright notice and this permission notice is present in all copies. The -// full license for this software is available in the LICENSE file. - -#pragma once -#define HAVE_IRCD_GPT_TASK_CTRL_H - -/// Task Control Page -/// -/// The control block is shared with our device software. Execution state is -/// maintained in the task control block across cycles. The control block is -/// the mutable state component for an execution; for the immutable component -/// also shared with device software see opts.h. -/// -struct ircd_gpt_ctrl -{ - /// Epoch counting & interrupt control block. - struct ircd_gpt_task_epic epic; - - /// Token context control block. Contains state for the token context - /// buffer; the buffer with the tokens themselves is elsewhere. - struct ircd_gpt_task_tokens tokens; - - /// Logit softmax state - struct ircd_math_samax samax; - - /// Target label loss state - struct ircd_math_mean loss; - - /// Target label perplexity score state - struct ircd_math_mean perp; - - /// Target label certainty difference state - struct ircd_math_mean cert; - - /// PRNG xoshiro256 state. This is the de facto random seed which can be - /// set before cycle entry by the host. It is updated by device software - /// when used. - ulong rand[4]; - - /// Perform backprop - bool prop; - - /// Header magic 0xC7012C70 - uint magic; - - /// The token buffer starts at offset 2048 and continues to the end of - /// the page; options specify the size of the tokens buffer in tokens. - /// Additional pages must be attached for larger buffer sizes. - ushort token[] __attribute__((aligned(2048))); -} -__attribute__((aligned(4096))); - -#ifdef __cplusplus -namespace ircd::gpt -{ - using ctrl = struct ircd_gpt_ctrl; -} -#endif diff --git a/include/ircd/gpt/task/epic.h b/include/ircd/gpt/task/epic.h deleted file mode 100644 index 15d8988f5..000000000 --- a/include/ircd/gpt/task/epic.h +++ /dev/null @@ -1,38 +0,0 @@ -// Matrix Construct -// -// Copyright (C) Matrix Construct Developers, Authors & Contributors -// Copyright (C) 2016-2021 Jason Volk -// -// Permission to use, copy, modify, and/or distribute this software for any -// purpose with or without fee is hereby granted, provided that the above -// copyright notice and this permission notice is present in all copies. The -// full license for this software is available in the LICENSE file. - -#pragma once -#define HAVE_IRCD_GPT_TASK_EPIC_H - -/// Epoch Precision Interrupt Controller -/// -struct ircd_gpt_task_epic -{ - /// Accumulates the number of task cycles. The cycle counter is incremented - /// by device software after each repetition of the kernel pipeline to - /// produce one additional token. - ulong cycle; - - /// Accumulates the epoch count for the task. The counter is incremented - /// by one in device software before control returns back to the host. - /// Several cycles may occur during each epoch. - ulong epoch; - - /// Accumulates the training epoch count for the task. The counter is - /// incremented by one in device software for each backward propagation. - ulong step; - - /// Updated by the host with the value of the timestamp register as sampled - /// immediately before each transfer of control to the device. - ulong host_tsc; - - /// Accumulates time in microseconds elapsed for the task. - ulong elapsed; -}; diff --git a/include/ircd/gpt/task/tokens.h b/include/ircd/gpt/task/tokens.h deleted file mode 100644 index f22585194..000000000 --- a/include/ircd/gpt/task/tokens.h +++ /dev/null @@ -1,35 +0,0 @@ -// Matrix Construct -// -// Copyright (C) Matrix Construct Developers, Authors & Contributors -// Copyright (C) 2016-2021 Jason Volk -// -// Permission to use, copy, modify, and/or distribute this software for any -// purpose with or without fee is hereby granted, provided that the above -// copyright notice and this permission notice is present in all copies. The -// full license for this software is available in the LICENSE file. - -#pragma once -#define HAVE_IRCD_GPT_TASK_TOKENS_H - -/// Token Context Buffer (Control Block) -/// -struct ircd_gpt_task_tokens -{ - /// Token ring head. Tokens in the ring extend behind the head for - /// `tokens`. The `head` value is automatically modulated by device - /// software to wrap around the ring. - uint head; - - /// Token counter. The counter indicates the number of valid tokens in - /// the context buffer. This value must not exceed the buffer size. - uint count; - - /// Accumulates the number of tokens produced by the task. Several tokens - /// may be produced each epoch, but currently only one token is produced - /// each cycle. - ulong produced; - - /// Accumulates the number tokens witnessed by the task. The number of - /// tokens in the context for each cycle is counted as witnessed. - ulong witnessed; -};