Merge "Remove dead code." into main

3 files changed, 0 insertions, 390 deletions

diff --git a/crypto-perf/Android.bp b/crypto-perf/Android.bp
deleted file mode 100644
index 8f575ca9..00000000
--- a/crypto-perf/Android.bp
+++ /dev/null
@@ -1,35 +0,0 @@
-package {
-    default_applicable_licenses: ["system_extras_crypto-perf_license"],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
-    name: "system_extras_crypto-perf_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-    ],
-    license_text: [
-        "NOTICE",
-    ],
-}
-
-cc_binary {
-    name: "crypto",
-
-    cflags: [
-        "-O0",
-        "-march=armv8-a+crypto",
-        "-Wall",
-        "-Werror",
-    ],
-    srcs: ["crypto.cpp"],
-
-    enabled: false,
-    arch: {
-        arm64: {
-            enabled: true,
-        },
-    },
-}
diff --git a/crypto-perf/NOTICE b/crypto-perf/NOTICE
deleted file mode 100644
index c77f135e..00000000
--- a/crypto-perf/NOTICE
+++ /dev/null
@@ -1,190 +0,0 @@
-
-   Copyright (c) 2012, The Android Open Source Project
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
diff --git a/crypto-perf/crypto.cpp b/crypto-perf/crypto.cpp
deleted file mode 100644
index a7228324..00000000
--- a/crypto-perf/crypto.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-#include <ctype.h>
-#include <sched.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/resource.h>
-#include <sys/time.h>
-#include <unistd.h>
-#define USEC_PER_SEC 1000000ULL
-#define MAX_COUNT 1000000000ULL
-#define NUM_INSTS_GARBAGE 18
-
-// Contains information about benchmark options.
-typedef struct {
-    int cpu_to_lock;
-    int locked_freq;
-} command_data_t;
-
-void usage() {
-    printf("--------------------------------------------------------------------------------\n");
-    printf("Usage:");
-    printf("	crypto [--cpu_to_lock CPU] [--locked_freq FREQ_IN_KHZ]\n\n");
-    printf("!!!!!!Lock the desired core to a desired frequency before invoking this benchmark.\n");
-    printf("Hint: Set scaling_max_freq=scaling_min_freq=FREQ_IN_KHZ. FREQ_IN_KHZ "
-           "can be obtained from scaling_available_freq\n");
-    printf("--------------------------------------------------------------------------------\n");
-}
-
-int processOptions(int argc, char** argv, command_data_t* cmd_data) {
-    // Initialize the command_flags.
-    cmd_data->cpu_to_lock = 0;
-    cmd_data->locked_freq = 1;
-    for (int i = 1; i < argc; i++) {
-        if (argv[i][0] == '-') {
-            int* save_value = NULL;
-            if (strcmp(argv[i], "--cpu_to_lock") == 0) {
-                save_value = &cmd_data->cpu_to_lock;
-            } else if (strcmp(argv[i], "--locked_freq") == 0) {
-                save_value = &cmd_data->locked_freq;
-            } else {
-                printf("Unknown option %s\n", argv[i]);
-                return -1;
-            }
-            if (save_value) {
-                // Checking both characters without a strlen() call should be
-                // safe since as long as the argument exists, one character will
-                // be present (\0). And if the first character is '-', then
-                // there will always be a second character (\0 again).
-                if (i == argc - 1 || (argv[i + 1][0] == '-' && !isdigit(argv[i + 1][1]))) {
-                    printf("The option %s requires one argument.\n", argv[i]);
-                    return -1;
-                }
-                *save_value = (int)strtol(argv[++i], NULL, 0);
-            }
-        }
-    }
-    return 0;
-}
-/* Performs encryption on garbage values. In Cortex-A57 r0p1 and later
- * revisions, pairs of dependent AESE/AESMC and AESD/AESIMC instructions are
- * higher performance when adjacent, and in the described order below. */
-void garbage_encrypt() {
-    __asm__ __volatile__(
-            "aese  v0.16b, v4.16b ;"
-            "aesmc	v0.16b, v0.16b ;"
-            "aese  v1.16b, v4.16b ;"
-            "aesmc	v1.16b, v1.16b ;"
-            "aese  v2.16b, v4.16b ;"
-            "aesmc	v2.16b, v2.16b ;"
-            "aese  v0.16b, v5.16b ;"
-            "aesmc	v0.16b, v0.16b ;"
-            "aese  v1.16b, v5.16b ;"
-            "aesmc	v1.16b, v1.16b ;"
-            "aese  v2.16b, v5.16b ;"
-            "aesmc	v2.16b, v2.16b ;"
-            "aese  v0.16b, v6.16b ;"
-            "aesmc	v0.16b, v0.16b ;"
-            "aese  v1.16b, v6.16b ;"
-            "aesmc	v1.16b, v1.16b ;"
-            "aese  v2.16b, v6.16b ;"
-            "aesmc	v2.16b, v2.16b ;");
-}
-
-void garbage_decrypt() {
-    __asm__ __volatile__(
-            "aesd  v0.16b, v4.16b ;"
-            "aesimc	v0.16b, v0.16b ;"
-            "aesd  v1.16b, v4.16b ;"
-            "aesimc	v1.16b, v1.16b ;"
-            "aesd  v2.16b, v4.16b ;"
-            "aesimc	v2.16b, v2.16b ;"
-            "aesd  v0.16b, v5.16b ;"
-            "aesimc	v0.16b, v0.16b ;"
-            "aesd  v1.16b, v5.16b ;"
-            "aesimc	v1.16b, v1.16b ;"
-            "aesd  v2.16b, v5.16b ;"
-            "aesimc	v2.16b, v2.16b ;"
-            "aesd  v0.16b, v6.16b ;"
-            "aesimc	v0.16b, v0.16b ;"
-            "aesd  v1.16b, v6.16b ;"
-            "aesimc	v1.16b, v1.16b ;"
-            "aesd  v2.16b, v6.16b ;"
-            "aesimc	v2.16b, v2.16b ;");
-}
-
-int main(int argc, char** argv) {
-    usage();
-    command_data_t cmd_data;
-
-    if (processOptions(argc, argv, &cmd_data) == -1) {
-        usage();
-        return -1;
-    }
-    unsigned long long count = 0;
-    struct timeval begin_time, end_time, elapsed_time;
-    cpu_set_t cpuset;
-    CPU_ZERO(&cpuset);
-    CPU_SET(cmd_data.cpu_to_lock, &cpuset);
-    if (sched_setaffinity(0, sizeof(cpuset), &cpuset) != 0) {
-        perror("sched_setaffinity failed");
-        return 1;
-    }
-    gettimeofday(&begin_time, NULL);
-    while (count < MAX_COUNT) {
-        garbage_encrypt();
-        count++;
-    }
-    gettimeofday(&end_time, NULL);
-    timersub(&end_time, &begin_time, &elapsed_time);
-    fprintf(stderr, "encrypt: %llu us\n",
-            elapsed_time.tv_sec * USEC_PER_SEC + elapsed_time.tv_usec);
-    fprintf(stderr, "encrypt instructions: %llu\n", MAX_COUNT * NUM_INSTS_GARBAGE);
-    fprintf(stderr, "encrypt instructions per second: %f\n",
-            (float)(MAX_COUNT * NUM_INSTS_GARBAGE * USEC_PER_SEC) /
-                    (elapsed_time.tv_sec * USEC_PER_SEC + elapsed_time.tv_usec));
-    if (cmd_data.locked_freq != 0) {
-        fprintf(stderr, "encrypt instructions per cycle: %f\n",
-                (float)(MAX_COUNT * NUM_INSTS_GARBAGE * USEC_PER_SEC) /
-                        ((elapsed_time.tv_sec * USEC_PER_SEC + elapsed_time.tv_usec) * 1000 *
-                         cmd_data.locked_freq));
-    }
-    printf("--------------------------------------------------------------------------------\n");
-
-    count = 0;
-    gettimeofday(&begin_time, NULL);
-    while (count < MAX_COUNT) {
-        garbage_decrypt();
-        count++;
-    }
-    gettimeofday(&end_time, NULL);
-    timersub(&end_time, &begin_time, &elapsed_time);
-    fprintf(stderr, "decrypt: %llu us\n",
-            elapsed_time.tv_sec * USEC_PER_SEC + elapsed_time.tv_usec);
-    fprintf(stderr, "decrypt instructions: %llu\n", MAX_COUNT * NUM_INSTS_GARBAGE);
-    fprintf(stderr, "decrypt instructions per second: %f\n",
-            (float)(MAX_COUNT * NUM_INSTS_GARBAGE * USEC_PER_SEC) /
-                    (elapsed_time.tv_sec * USEC_PER_SEC + elapsed_time.tv_usec));
-    if (cmd_data.locked_freq != 0) {
-        fprintf(stderr, "decrypt instructions per cycle: %f\n",
-                (float)(MAX_COUNT * NUM_INSTS_GARBAGE * USEC_PER_SEC) /
-                        ((elapsed_time.tv_sec * USEC_PER_SEC + elapsed_time.tv_usec) * 1000 *
-                         cmd_data.locked_freq));
-    }
-    return 0;
-}